41ba4b04c8
add fixes for * ethernet * cpufreq * nand * a7-timer Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 49098
87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From 3ed29e95facfd50427721f8e9093dc36c2304e42 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Tue, 22 Mar 2016 03:52:07 +0100
|
|
Subject: [PATCH 56/78] mtd: add get/set of_node/flash_node helpers
|
|
|
|
We are going to begin using the mtd->dev.of_node field for MTD device
|
|
nodes, so let's add helpers for it. Also, we'll be making some
|
|
conversions on spi_nor (and nand_chip eventually) too, so get that ready
|
|
with their own helpers.
|
|
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
---
|
|
include/linux/mtd/mtd.h | 11 +++++++++++
|
|
include/linux/mtd/nand.h | 11 +++++++++++
|
|
include/linux/mtd/spi-nor.h | 11 +++++++++++
|
|
3 files changed, 33 insertions(+)
|
|
|
|
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
|
|
index f17fa75..cc84923 100644
|
|
--- a/include/linux/mtd/mtd.h
|
|
+++ b/include/linux/mtd/mtd.h
|
|
@@ -254,6 +254,17 @@ struct mtd_info {
|
|
int usecount;
|
|
};
|
|
|
|
+static inline void mtd_set_of_node(struct mtd_info *mtd,
|
|
+ struct device_node *np)
|
|
+{
|
|
+ mtd->dev.of_node = np;
|
|
+}
|
|
+
|
|
+static inline struct device_node *mtd_get_of_node(struct mtd_info *mtd)
|
|
+{
|
|
+ return mtd->dev.of_node;
|
|
+}
|
|
+
|
|
int mtd_erase(struct mtd_info *mtd, struct erase_info *instr);
|
|
int mtd_point(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen,
|
|
void **virt, resource_size_t *phys);
|
|
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
|
|
index 1ded588..3c34ca4 100644
|
|
--- a/include/linux/mtd/nand.h
|
|
+++ b/include/linux/mtd/nand.h
|
|
@@ -741,6 +741,17 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv)
|
|
chip->priv = priv;
|
|
}
|
|
|
|
+static inline void nand_set_flash_node(struct nand_chip *chip,
|
|
+ struct device_node *np)
|
|
+{
|
|
+ chip->flash_node = np;
|
|
+}
|
|
+
|
|
+static inline struct device_node *nand_get_flash_node(struct nand_chip *chip)
|
|
+{
|
|
+ return chip->flash_node;
|
|
+}
|
|
+
|
|
/*
|
|
* NAND Flash Manufacturer ID Codes
|
|
*/
|
|
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
|
|
index c8723b6..6d991df 100644
|
|
--- a/include/linux/mtd/spi-nor.h
|
|
+++ b/include/linux/mtd/spi-nor.h
|
|
@@ -185,6 +185,17 @@ struct spi_nor {
|
|
void *priv;
|
|
};
|
|
|
|
+static inline void spi_nor_set_flash_node(struct spi_nor *nor,
|
|
+ struct device_node *np)
|
|
+{
|
|
+ nor->flash_node = np;
|
|
+}
|
|
+
|
|
+static inline struct device_node *spi_nor_get_flash_node(struct spi_nor *nor)
|
|
+{
|
|
+ return nor->flash_node;
|
|
+}
|
|
+
|
|
/**
|
|
* spi_nor_scan() - scan the SPI NOR
|
|
* @nor: the spi_nor structure
|
|
--
|
|
1.7.10.4
|
|
|