Skip to contentSkip to conversation

mtd: omap-onenand: pass device_node in platform data

PATCH New Ezequiel Garcia 4 participants 7 messages Jan 25, 2013 – Feb 1, 2013

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 mtd: omap-onenand: pass device_node in platform data

Pass an optional device_node pointer in the platform data, which in turn will be put into a mtd_part_parser_data. This way, code that sets up the platform devices can pass along the node from DT so that the partitions can be parsed.

For non-DT boards, this change has no effect.

---
 drivers/mtd/onenand/omap2.c                     |    4 +++-
 include/linux/platform_data/mtd-onenand-omap2.h |    3 +++
 2 files changed, 6 insertions(+), 1 deletions(-)
drivers/mtd/onenand/omap2.c +3 -1
index 065f3fe..eec2aed 100644
@@ -637,6 +637,7 @@ static int omap2_onenand_probe(struct platform_device *pdev)
 	struct onenand_chip *this;
 	int r;
 	struct resource *res;
+	struct mtd_part_parser_data ppdata = {};
 
 	pdata = pdev->dev.platform_data;
 	if (pdata == NULL) {
@@ -767,7 +768,8 @@ static int omap2_onenand_probe(struct platform_device *pdev)
 	if ((r = onenand_scan(&c->mtd, 1)) < 0)
 		goto err_release_regulator;
 
-	r = mtd_device_parse_register(&c->mtd, NULL, NULL,
+	ppdata.of_node = pdata->of_node;
+	r = mtd_device_parse_register(&c->mtd, NULL, &ppdata,
 				      pdata ? pdata->parts : NULL,
 				      pdata ? pdata->nr_parts : 0);
 	if (r)
include/linux/platform_data/mtd-onenand-omap2.h +3 -0
index 685af7e..e9a9fb1 100644
@@ -29,5 +29,8 @@ struct omap_onenand_platform_data {
 	u8			flags;
 	u8			regulator_can_sleep;
 	u8			skip_initial_unlocking;
+
+	/* for passing the partitions */
+	struct device_node	*of_node;
 };
 #endif
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH v3 2/3 arm: omap2: gpmc-onenand: drop __init annotation

gpmc_onenand_init() will be called from another driver's probe() function, so drop the __init annotation, in order to prevent section mismatches.

---
 arch/arm/mach-omap2/gpmc-onenand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/gpmc-onenand.c +1 -1
index 94a349e..fadd8743 100644
@@ -356,7 +356,7 @@ static int gpmc_onenand_setup(void __iomem *onenand_base, int *freq_ptr)
 	return ret;
 }
 
-void __init gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
+void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
 {
 	int err;
 
Signature · 1 line
1.7.8.6
#2 lore raw

PATCH v3 3/3 arm: omap2: gpmc: add DT bindings for OneNAND

In reply to Ezequiel Garcia

This patch adds device tree bindings for OMAP OneNAND devices. Tested on an OMAP3 3430 IGEPv2 board.

---
Changes from v2:
* Remove unneeded of_node_put() as reported by Mark Rutland

Changes from v1:
* Fix typo in Documentation/devicetree/bindings/mtd/gpmc-onenand.txt

 .../devicetree/bindings/mtd/gpmc-onenand.txt       |   43 +++++++++++++++++++
 arch/arm/mach-omap2/gpmc.c                         |   45 ++++++++++++++++++++
 2 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +43 -0
new file mode 100644
index 0000000..deec9da
@@ -0,0 +1,43 @@
+Device tree bindings for GPMC connected OneNANDs
+
+GPMC connected OneNAND (found on OMAP boards) are represented as child nodes of
+the GPMC controller with a name of "onenand".
+
+All timing relevant properties as well as generic gpmc child properties are
+explained in a separate documents - please refer to
+Documentation/devicetree/bindings/bus/ti-gpmc.txt
+
+Required properties:
+
+ - reg:			The CS line the peripheral is connected to
+
+Optional properties:
+
+ - dma-channel:		DMA Channel index
+
+For inline partiton table parsing (optional):
+
+ - #address-cells: should be set to 1
+ - #size-cells: should be set to 1
+
+Example for an OMAP3430 board:
+
+	gpmc: gpmc at 6e000000 {
+		compatible = "ti,omap3430-gpmc";
+		ti,hwmods = "gpmc";
+		reg = <0x6e000000 0x1000000>;
+		interrupts = <20>;
+		gpmc,num-cs = <8>;
+		gpmc,num-waitpins = <4>;
+		#address-cells = <2>;
+		#size-cells = <1>;
+
+		onenand at 0 {
+			reg = <0 0 0>; /* CS0, offset 0 */
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			/* partitions go here */
+		};
+	};
arch/arm/mach-omap2/gpmc.c +45 -0

63 lines not on this page · raw message

Signature · 1 line
1.7.8.6
#3 lore raw

PATCH v3 3/3 arm: omap2: gpmc: add DT bindings for OneNAND

Hi,

I have a couple more comments after looking though this a bit more thoroughly.

Quoted 22 lines · Ezequiel Garcia

This patch adds device tree bindings for OMAP OneNAND devices. Tested on an OMAP3 3430 IGEPv2 board.

---
Changes from v2:
* Remove unneeded of_node_put() as reported by Mark Rutland

Changes from v1:
* Fix typo in Documentation/devicetree/bindings/mtd/gpmc-onenand.txt

 .../devicetree/bindings/mtd/gpmc-onenand.txt       |   43 +++++++++++++++++++
 arch/arm/mach-omap2/gpmc.c                         |   45 ++++++++++++++++++++
 2 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +0 -0
new file mode 100644
index 0000000..deec9da

Documentation/devicetree/bindings/mtd/gpmc-onenand.txt line 8

Quoted 8 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +8 -0
@@ -0,0 +1,43 @@
+Device tree bindings for GPMC connected OneNANDs
+
+GPMC connected OneNAND (found on OMAP boards) are represented as child nodes of
+the GPMC controller with a name of "onenand".
+
+All timing relevant properties as well as generic gpmc child properties are
+explained in a separate documents - please refer to
+Documentation/devicetree/bindings/bus/ti-gpmc.txt

Which tree can I find this in?

Quoted 53 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +35 -0
+
+Required properties:
+
+ - reg:			The CS line the peripheral is connected to
+
+Optional properties:
+
+ - dma-channel:		DMA Channel index
+
+For inline partiton table parsing (optional):
+
+ - #address-cells: should be set to 1
+ - #size-cells: should be set to 1
+
+Example for an OMAP3430 board:
+
+	gpmc: gpmc at 6e000000 {
+		compatible = "ti,omap3430-gpmc";
+		ti,hwmods = "gpmc";
+		reg = <0x6e000000 0x1000000>;
+		interrupts = <20>;
+		gpmc,num-cs = <8>;
+		gpmc,num-waitpins = <4>;
+		#address-cells = <2>;
+		#size-cells = <1>;
+
+		onenand at 0 {
+			reg = <0 0 0>; /* CS0, offset 0 */
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			/* partitions go here */
+		};
+	};
arch/arm/mach-omap2/gpmc.c +3 -0
index c6255f7..0636d0a 100644
@@ -39,6 +39,7 @@
 #include "omap_device.h"
 #include "gpmc.h"
 #include "gpmc-nand.h"
+#include "gpmc-onenand.h"
 
 #define	DEVICE_NAME		"omap-gpmc"
 
@@ -1259,6 +1260,43 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
 }
 #endif
 
+#ifdef CONFIG_MTD_ONENAND
+static int gpmc_probe_onenand_child(struct platform_device *pdev,

arch/arm/mach-omap2/gpmc.c static int gpmc_probe_nand_child(struct platform_device *pdev, · line 1274

Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10 -0
+				 struct device_node *child)
+{
+	u32 val;
+	struct omap_onenand_platform_data *gpmc_onenand_data;
+
+	if (of_property_read_u32(child, "reg", &val) < 0) {
+		dev_err(&pdev->dev, "%s has no 'reg' property\n",
+			child->full_name);
+		return -ENODEV;
+	}

I don't understand the format of the reg property, but it seems odd that you only need to read one cell from it. Are the remaining address cell and size cell used anywhere?

Quoted 7 lines
arch/arm/mach-omap2/gpmc.c +7 -0
+
+	gpmc_onenand_data = devm_kzalloc(&pdev->dev, sizeof(*gpmc_onenand_data),
+					 GFP_KERNEL);
+	if (!gpmc_onenand_data)
+		return -ENOMEM;
+
+	gpmc_onenand_data->cs = val;

arch/arm/mach-omap2/gpmc.c static int gpmc_probe_nand_child(struct platform_device *pdev, · line 1291

Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10 -0
+	gpmc_onenand_data->of_node = child;
+	gpmc_onenand_data->dma_channel = -1;
+
+	if (!of_property_read_u32(child, "dma-channel", &val))
+		gpmc_onenand_data->dma_channel = val;
+
+	gpmc_onenand_init(gpmc_onenand_data);
+
+	return 0;
+}

[...]

Otherwise looks good.

Thanks,
Mark.

#4 lore raw

PATCH v3 3/3 arm: omap2: gpmc: add DT bindings for OneNAND

Hi Mark,

First of all: thanks for reviewing.

Quoted 21 lines · Mark Rutland

Hi,

I have a couple more comments after looking though this a bit more thoroughly.

Quoted 16 lines · Ezequiel Garcia

This patch adds device tree bindings for OMAP OneNAND devices. Tested on an OMAP3 3430 IGEPv2 board.

---
Changes from v2:
* Remove unneeded of_node_put() as reported by Mark Rutland

Changes from v1:
* Fix typo in Documentation/devicetree/bindings/mtd/gpmc-onenand.txt

 .../devicetree/bindings/mtd/gpmc-onenand.txt       |   43 +++++++++++++++++++
 arch/arm/mach-omap2/gpmc.c                         |   45 ++++++++++++++++++++
 2 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
Quoted 17 lines
Quoted 6 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +0 -0
new file mode 100644
index 0000000..deec9da

Documentation/devicetree/bindings/mtd/gpmc-onenand.txt line 8

Quoted 8 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +8 -0
@@ -0,0 +1,43 @@
+Device tree bindings for GPMC connected OneNANDs
+
+GPMC connected OneNAND (found on OMAP boards) are represented as child nodes of
+the GPMC controller with a name of "onenand".
+
+All timing relevant properties as well as generic gpmc child properties are
+explained in a separate documents - please refer to
+Documentation/devicetree/bindings/bus/ti-gpmc.txt

Which tree can I find this in?

GPMC binding was posted by Daniel Mack a while ago. Tony has recently pushed it to his master branch here:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git

Quoted 51 lines
Quoted 51 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +35 -0
+
+Required properties:
+
+ - reg:                      The CS line the peripheral is connected to
+
+Optional properties:
+
+ - dma-channel:              DMA Channel index
+
+For inline partiton table parsing (optional):
+
+ - #address-cells: should be set to 1
+ - #size-cells: should be set to 1
+
+Example for an OMAP3430 board:
+
+     gpmc: gpmc at 6e000000 {
+             compatible = "ti,omap3430-gpmc";
+             ti,hwmods = "gpmc";
+             reg = <0x6e000000 0x1000000>;
+             interrupts = <20>;
+             gpmc,num-cs = <8>;
+             gpmc,num-waitpins = <4>;
+             #address-cells = <2>;
+             #size-cells = <1>;
+
+             onenand at 0 {
+                     reg = <0 0 0>; /* CS0, offset 0 */
+
+                     #address-cells = <1>;
+                     #size-cells = <1>;
+
+                     /* partitions go here */
+             };
+     };
arch/arm/mach-omap2/gpmc.c +1 -0
index c6255f7..0636d0a 100644
@@ -39,6 +39,7 @@
 #include "omap_device.h"
 #include "gpmc.h"
 #include "gpmc-nand.h"
+#include "gpmc-onenand.h"
 
 #define      DEVICE_NAME             "omap-gpmc"
 
@@ -1259,6 +1260,43 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
 }
 #endif
 
Quoted 17 lines

arch/arm/mach-omap2/gpmc.c static int gpmc_probe_nand_child(struct platform_device *pdev, · line 1274

Quoted 12 lines
arch/arm/mach-omap2/gpmc.c +12 -0
+#ifdef CONFIG_MTD_ONENAND
+static int gpmc_probe_onenand_child(struct platform_device *pdev,
+                              struct device_node *child)
+{
+     u32 val;
+     struct omap_onenand_platform_data *gpmc_onenand_data;
+
+     if (of_property_read_u32(child, "reg", &val) < 0) {
+             dev_err(&pdev->dev, "%s has no 'reg' property\n",
+                     child->full_name);
+             return -ENODEV;
+     }

I don't understand the format of the reg property, but it seems odd that you only need to read one cell from it. Are the remaining address cell and size cell used anywhere?

Okey, I'll give a shot and try to explain this myself:

As you can see by Daniel's first patch [1]
the reg property originally contained the chip select only, and after some discussion in that same thread, and in this one [2] It was decided to use a reg property that would also describe the base address and size of the gpmc sub-device,
and use ranges for the address translation.
This was reflected in Daniel's changelog when he submitted the v2 patch series [3].

[1] http://www.spinics.net/lists/arm-kernel/msg202169.html
[2] http://web.archiveorange.com/archive/v/vEQ2yFI0tmpQJdigvAog
[3] http://lists.infradead.org/pipermail/linux-arm-kernel/2012-November/129426.html

Quoted 20 lines
Quoted 17 lines
arch/arm/mach-omap2/gpmc.c +17 -0
+
+     gpmc_onenand_data = devm_kzalloc(&pdev->dev, sizeof(*gpmc_onenand_data),
+                                      GFP_KERNEL);
+     if (!gpmc_onenand_data)
+             return -ENOMEM;
+
+     gpmc_onenand_data->cs = val;
+     gpmc_onenand_data->of_node = child;
+     gpmc_onenand_data->dma_channel = -1;
+
+     if (!of_property_read_u32(child, "dma-channel", &val))
+             gpmc_onenand_data->dma_channel = val;
+
+     gpmc_onenand_init(gpmc_onenand_data);
+
+     return 0;
+}

[...]

Quoted 2 lines

Otherwise looks good.

Thanks,

Signature · 1 line
    Ezequiel
#5 lore raw

PATCH v3 3/3 arm: omap2: gpmc: add DT bindings for OneNAND

Quoted 44 lines · Ezequiel Garcia

Hi Mark,

First of all: thanks for reviewing.

Quoted 21 lines · Mark Rutland

Hi,

I have a couple more comments after looking though this a bit more thoroughly.

Quoted 16 lines · Ezequiel Garcia

This patch adds device tree bindings for OMAP OneNAND devices. Tested on an OMAP3 3430 IGEPv2 board.

---
Changes from v2:
* Remove unneeded of_node_put() as reported by Mark Rutland

Changes from v1:
* Fix typo in Documentation/devicetree/bindings/mtd/gpmc-onenand.txt

 .../devicetree/bindings/mtd/gpmc-onenand.txt       |   43 +++++++++++++++++++
 arch/arm/mach-omap2/gpmc.c                         |   45 ++++++++++++++++++++
 2 files changed, 88 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
Quoted 17 lines
Quoted 6 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +0 -0
new file mode 100644
index 0000000..deec9da

Documentation/devicetree/bindings/mtd/gpmc-onenand.txt line 8

Quoted 8 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +8 -0
@@ -0,0 +1,43 @@
+Device tree bindings for GPMC connected OneNANDs
+
+GPMC connected OneNAND (found on OMAP boards) are represented as child nodes of
+the GPMC controller with a name of "onenand".
+
+All timing relevant properties as well as generic gpmc child properties are
+explained in a separate documents - please refer to
+Documentation/devicetree/bindings/bus/ti-gpmc.txt

Which tree can I find this in?

Quoted 3 lines

GPMC binding was posted by Daniel Mack a while ago. Tony has recently pushed it to his master branch here:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git

Aha. Thanks, it's far easier to understand with the gpmc doc!

Quoted 81 lines
Quoted 52 lines
Quoted 52 lines
Documentation/devicetree/bindings/mtd/gpmc-onenand.txt new file +35 -0
+
+Required properties:
+
+ - reg:                      The CS line the peripheral is connected to
+
+Optional properties:
+
+ - dma-channel:              DMA Channel index
+
+For inline partiton table parsing (optional):
+
+ - #address-cells: should be set to 1
+ - #size-cells: should be set to 1
+
+Example for an OMAP3430 board:
+
+     gpmc: gpmc at 6e000000 {
+             compatible = "ti,omap3430-gpmc";
+             ti,hwmods = "gpmc";
+             reg = <0x6e000000 0x1000000>;
+             interrupts = <20>;
+             gpmc,num-cs = <8>;
+             gpmc,num-waitpins = <4>;
+             #address-cells = <2>;
+             #size-cells = <1>;
+
+             onenand at 0 {
+                     reg = <0 0 0>; /* CS0, offset 0 */
+
+                     #address-cells = <1>;
+                     #size-cells = <1>;
+
+                     /* partitions go here */
+             };
+     };
arch/arm/mach-omap2/gpmc.c +1 -0
index c6255f7..0636d0a 100644
@@ -39,6 +39,7 @@
 #include "omap_device.h"
 #include "gpmc.h"
 #include "gpmc-nand.h"
+#include "gpmc-onenand.h"
 
 #define      DEVICE_NAME             "omap-gpmc"
 
@@ -1259,6 +1260,43 @@ static int gpmc_probe_nand_child(struct platform_device *pdev,
 }
 #endif
 
Quoted 17 lines

arch/arm/mach-omap2/gpmc.c static int gpmc_probe_nand_child(struct platform_device *pdev, · line 1274

Quoted 12 lines
arch/arm/mach-omap2/gpmc.c +12 -0
+#ifdef CONFIG_MTD_ONENAND
+static int gpmc_probe_onenand_child(struct platform_device *pdev,
+                              struct device_node *child)
+{
+     u32 val;
+     struct omap_onenand_platform_data *gpmc_onenand_data;
+
+     if (of_property_read_u32(child, "reg", &val) < 0) {
+             dev_err(&pdev->dev, "%s has no 'reg' property\n",
+                     child->full_name);
+             return -ENODEV;
+     }

I don't understand the format of the reg property, but it seems odd that you only need to read one cell from it. Are the remaining address cell and size cell used anywhere?

Okey, I'll give a shot and try to explain this myself:

As you can see by Daniel's first patch [1]
the reg property originally contained the chip select only, and after some discussion in that same thread, and in this one [2] It was decided to use a reg property that would also describe the base address and size of the gpmc sub-device,
and use ranges for the address translation.
This was reflected in Daniel's changelog when he submitted the v2 patch series [3].

Quoted 3 lines

[1] http://www.spinics.net/lists/arm-kernel/msg202169.html
[2] http://web.archiveorange.com/archive/v/vEQ2yFI0tmpQJdigvAog
[3] http://lists.infradead.org/pipermail/linux-arm-kernel/2012-November/129426.html

So if I've understood correctly, the first address cell is the CS, and the second the offset within this (as the comment in the onenand at 0 node hints)?

If so, the code now makes sense to me :)

I was having difficulty seeing where the base address of the child got translated via ranges, but I see in [3] that this doesn't currently happen. That answers my question about the remaining cells.

Might it be worth sanity checking the runtime calculated address with the one translated from dt? That way we can print a warning if the two don't match, which would help to discover broken dts (or invalid runtime calculation if future hardware breaks it somewhow).

Thanks,
Mark.

maintainer
#6 lore raw

PATCH v3 3/3 arm: omap2: gpmc: add DT bindings for OneNAND

Quoted 5 lines · Mark Rutland

So if I've understood correctly, the first address cell is the CS, and the second the offset within this (as the comment in the onenand at 0 node hints)?

If so, the code now makes sense to me :)

Sounds like further checking can be added as needed, so applying this series into omap-for-v3.9/gpmc.

Regards,

Tony