dt: omap: dt binding with omap_device and support for i2c1

The omap devices will use HWMOD for fetching device information hence it needs to be handled seperately during platform bus creation during dt build.

Signed-off-by G, Manjunath Kondaiah <[email protected]>

---
 drivers/of/platform.c |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

drivers/of/platform.c +4 -0

index e50ffcb..bd2c089 100644
@@ -24,6 +24,10 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
+#ifdef CONFIG_ARCH_OMAP2PLUS
+#include <plat/omap_device.h>
+#endif
+
 const struct of_device_id of_default_bus_match_table[] = {
 	{ .compatible = "simple-bus", },
 #ifdef CONFIG_ARM_AMBA

drivers/of/platform.c +19 -0

+static struct omap_device_pm_latency omap_device_latency[] = {
+	[0] = {
+		.deactivate_func	= omap_device_idle_hwmods,
+		.activate_func		= omap_device_enable_hwmods,
+		.flags			= OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+	},
+};
+
+int of_omap_device_create(struct device_node *np, const char *name, int id,
+							void *platform_data,
+							int pd_size)
+{
+	struct omap_hwmod *oh;
+	struct platform_device *pdev;
+
+	oh = omap_hwmod_lookup(name);
+	if (!oh) {
+		pr_err("Could not look up %s\n", name);
+		return -EEXIST;

drivers/of/platform.c +7 -1

+
 /**
  * of_platform_bus_create() - Create a device for a node and its children.
  * @bus: device node of the bus to instantiate

@@ -565,7 +599,7 @@ static int of_platform_bus_create(struct device_node *bus,
 	struct platform_device *dev;
 	const char *bus_id = NULL;
 	void *platform_data = NULL;
-	int pd_size;
+	int pd_size = 0;
 	int id = -1;
 	int rc = 0;
 

@@ -597,6 +631,11 @@ static int of_platform_bus_create(struct device_node *bus,
 		return 0;
 	}
 
+	if (of_device_is_compatible(bus, "ti,omap-device")) {
+		of_omap_device_create(bus, bus_id, id, platform_data, pd_size);
+		return 0;
+	}
+
 	dev = of_platform_device_create_pdata(bus, bus_id, platform_data, parent);
 
 	/* override the id if auxdata gives an id */

Signature · 6 lines

1.7.4.1

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Hi,

This creates a build failure for non-omap platforms as they don't know about struct omap_device_pm_latency, struct omap_hwmod etc.

An empty of_omap_device_create() as inline should do the trick.

Jamie

Quoted 26 lines · Manjunath Kondaiah

The omap devices will use HWMOD for fetching device information hence it needs to be handled seperately during platform bus creation during dt build.

Signed-off-by G, Manjunath Kondaiah <[email protected]>

---
 drivers/of/platform.c |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

drivers/of/platform.c +4 -0

index e50ffcb..bd2c089 100644
@@ -24,6 +24,10 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 
+#ifdef CONFIG_ARCH_OMAP2PLUS
+#include <plat/omap_device.h>
+#endif
+
 const struct of_device_id of_default_bus_match_table[] = {
 	{ .compatible = "simple-bus", },
 #ifdef CONFIG_ARM_AMBA

drivers/of/platform.c static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l · line 549

Quoted 2 lines

drivers/of/platform.c +0 -0

@@ -544,6 +548,36 @@ static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l
 	return NULL;
 }

#ifdef ARCH_OMAP

Quoted 19 lines

drivers/of/platform.c +19 -0

+static struct omap_device_pm_latency omap_device_latency[] = {
+	[0] = {
+		.deactivate_func	= omap_device_idle_hwmods,
+		.activate_func		= omap_device_enable_hwmods,
+		.flags			= OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+	},
+};
+
+int of_omap_device_create(struct device_node *np, const char *name, int id,
+							void *platform_data,
+							int pd_size)
+{
+	struct omap_hwmod *oh;
+	struct platform_device *pdev;
+
+	oh = omap_hwmod_lookup(name);
+	if (!oh) {
+		pr_err("Could not look up %s\n", name);
+		return -EEXIST;

drivers/of/platform.c static const struct of_dev_auxdata *of_dev_lookup(const struct of_dev_auxdata *l · line 579

Quoted 10 lines

drivers/of/platform.c +10 -0

+	}
+
+	pdev = omap_device_build_dt(np, name, id, oh, platform_data,
+				sizeof(platform_data), omap_device_latency,
+				ARRAY_SIZE(omap_device_latency), 0);
+	WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
+
+	pr_info("DT: omap_device build for %s is successful\n", name);
+	return PTR_ERR(pdev);
+}

#else /* ARCH_OMAP */
static inline int of_omap_device_create(struct device_node *np,
const char *name, int id, void *platform_data, int pd_size)

{
	return -ENODEV;
}

#endif /* ARCH_OMAP */

Quoted 32 lines

drivers/of/platform.c +7 -1

+
 /**
  * of_platform_bus_create() - Create a device for a node and its children.
  * @bus: device node of the bus to instantiate

@@ -565,7 +599,7 @@ static int of_platform_bus_create(struct device_node *bus,
 	struct platform_device *dev;
 	const char *bus_id = NULL;
 	void *platform_data = NULL;
-	int pd_size;
+	int pd_size = 0;
 	int id = -1;
 	int rc = 0;
 

@@ -597,6 +631,11 @@ static int of_platform_bus_create(struct device_node *bus,
 		return 0;
 	}
 
+	if (of_device_is_compatible(bus, "ti,omap-device")) {
+		of_omap_device_create(bus, bus_id, id, platform_data, pd_size);
+		return 0;
+	}
+
 	dev = of_platform_device_create_pdata(bus, bus_id, platform_data, parent);
 
 	/* override the id if auxdata gives an id */

Signature · 6 lines

1.7.4.1

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

The device tree support has been added to i2c1 controller and corresponding i2c initilization in generic board file is cleaned up so that platfom device is registered through dt and omap device and not through board i2c initilization.

These changes will not affect non dt builds and existing functionality is retained.

Tested with dt and non dt builds and boot tested on beagle board.

Signed-off-by G, Manjunath Kondaiah <[email protected]>

---
 arch/arm/mach-omap2/board-omap3-dt.c |   14 +++++++-------
 drivers/i2c/busses/i2c-omap.c        |   23 ++++++++++++++++++++---
 2 files changed, 27 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/board-omap3-dt.c +7 -7

index 72c59a4..cd11224 100644
@@ -35,11 +35,11 @@ static struct twl4030_platform_data beagle_twldata = {
 	/* platform_data for children goes here */
 };
 
-static int __init omap3_beagle_i2c_init(void)
-{
-	omap3_pmic_init("twl4030", &beagle_twldata);
-	return 0;
-}
+struct of_dev_auxdata omap3_auxdata_lookup[] __initdata = {
+	OF_DEV_AUXDATA_ID_PDSIZE("ti,omap-i2c", 0x48070000, "i2c1", 1,\
+				&beagle_twldata, sizeof(beagle_twldata)),
+	{}
+};
 
 static void __init omap3_init_early(void)
 {

@@ -61,11 +61,11 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
 
 static void __init omap3_init(void)
 {
-	omap3_beagle_i2c_init();
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap_serial_init();
 
-	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
+	of_platform_populate(NULL, omap_dt_match_table, omap3_auxdata_lookup,
+									 NULL);
 }
 
 static const char *omap3_dt_match[] __initdata = {

drivers/i2c/busses/i2c-omap.c +12 -0

index 2a072ff..9e98014 100644
@@ -38,6 +38,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/of_i2c.h>
+#include <linux/of_device.h>
 #include <linux/slab.h>
 #include <linux/i2c-omap.h>
 #include <linux/pm_runtime.h>

@@ -972,6 +973,16 @@ static const struct i2c_algorithm omap_i2c_algo = {
 	.functionality	= omap_i2c_func,
 };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id omap_i2c_of_match[] = {
+	{.compatible = "ti,omap-i2c", },
+	{},
+}
+MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
+#else
+#define omap_i2c_of_match NULL
+#endif
+
 static int __devinit
 omap_i2c_probe(struct platform_device *pdev)
 {

@@ -1008,12 +1019,17 @@ omap_i2c_probe(struct platform_device *pdev)
 		goto err_release_region;
 	}
 
+	speed = 100;	/* Default speed */
 	if (pdata != NULL) {
 		speed = pdata->clkrate;
 		dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;

drivers/i2c/busses/i2c-omap.c +1 -0

 	}
 
 	dev->speed = speed;

@@ -1178,6 +1194,7 @@ static struct platform_driver omap_i2c_driver = {
 		.name	= "omap_i2c",
 		.owner	= THIS_MODULE,
 		.pm	= OMAP_I2C_PM_OPS,
+		.of_match_table = omap_i2c_of_match,
 	},
 };
 

Signature · 6 lines

1.7.4.1

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Hi Grant,

This function calls of_i2c_register_devices which attaches all the required parameters reg, irq, archdata etc into i2c adapter. But it will not attach platform_data which results empty pdata pointer in i2c child devices.

Is this done purposefully?

Hi Manju,

Quoted 1 line · Manjunath Kondaiah

Hi Grant,

[...]

Quoted 4 lines

This function calls of_i2c_register_devices which attaches all the required parameters reg, irq, archdata etc into i2c adapter. But it will not attach platform_data which results empty pdata pointer in i2c child devices.

Quoted 1 line

Is this done purposefully?

I think so, but anyway, we'd rather spend some time on doing a proper DT implementation than hacking more the AUXDATA temporary solution.

I've just sent a reworked version of that series with a pure dt-no-auxdata-hack approach.

The device tree support has been added to i2c1 controller and corresponding i2c initilization in generic board file is cleaned up so that platfom device is registered through dt and omap device and not through board i2c initilization.

These changes will not affect non dt builds and existing functionality is retained.

Tested with dt and non dt builds and boot tested on beagle board.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
   arch/arm/mach-omap2/board-omap3-dt.c |   14 +++++++-------
   drivers/i2c/busses/i2c-omap.c        |   23 ++++++++++++++++++++---
   2 files changed, 27 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/board-omap3-dt.c +7 -7

index 72c59a4..cd11224 100644
@@ -35,11 +35,11 @@ static struct twl4030_platform_data beagle_twldata = {
   	/* platform_data for children goes here */
   };
 
-static int __init omap3_beagle_i2c_init(void)
-{
-	omap3_pmic_init("twl4030",&beagle_twldata);
-	return 0;
-}
+struct of_dev_auxdata omap3_auxdata_lookup[] __initdata = {
+	OF_DEV_AUXDATA_ID_PDSIZE("ti,omap-i2c", 0x48070000, "i2c1", 1,\
+				&beagle_twldata, sizeof(beagle_twldata)),
+	{}
+};
 
   static void __init omap3_init_early(void)
   {

@@ -61,11 +61,11 @@ static struct of_device_id omap_dt_match_table[]
 __initdata = {
 
   static void __init omap3_init(void)
   {
-	omap3_beagle_i2c_init();
   	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
   	omap_serial_init();
 
-	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
+	of_platform_populate(NULL, omap_dt_match_table, omap3_auxdata_lookup,
+									 NULL);
   }
 

   static const char *omap3_dt_match[] __initdata = {

drivers/i2c/busses/i2c-omap.c +12 -0

index 2a072ff..9e98014 100644
@@ -38,6 +38,7 @@
   #include<linux/clk.h>
   #include<linux/io.h>
   #include<linux/of_i2c.h>
+#include<linux/of_device.h>
   #include<linux/slab.h>
   #include<linux/i2c-omap.h>
   #include<linux/pm_runtime.h>

@@ -972,6 +973,16 @@ static const struct i2c_algorithm omap_i2c_algo = {
   	.functionality	= omap_i2c_func,
   };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id omap_i2c_of_match[] = {
+	{.compatible = "ti,omap-i2c", },
+	{},
+}
+MODULE_DEVICE_TABLE(of, omap_i2c_of_match);
+#else
+#define omap_i2c_of_match NULL
+#endif
+
   static int __devinit
   omap_i2c_probe(struct platform_device *pdev)
   {

@@ -1008,12 +1019,17 @@ omap_i2c_probe(struct platform_device *pdev)
   		goto err_release_region;
   	}
 
+	speed = 100;	/* Default speed */
   	if (pdata != NULL) {
   		speed = pdata->clkrate;

drivers/i2c/busses/i2c-omap.c +2 -0

+#endif
   	}
 
   	dev->speed = speed;

@@ -1178,6 +1194,7 @@ static struct platform_driver omap_i2c_driver = {
   		.name	= "omap_i2c",
   		.owner	= THIS_MODULE,
   		.pm	= OMAP_I2C_PM_OPS,
+		.of_match_table = omap_i2c_of_match,
   	},
   };
 

Add omap4 soc dts file for handling omap4 soc i2c
controllers existing on l4-core bus.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
  arch/arm/boot/dts/omap4-panda.dts |    7 +---
  arch/arm/boot/dts/omap4.dtsi      |   68 +++++++++++++++++++++++++++++++++++++
  2 files changed, 69 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/boot/dts/omap4.dtsi

arch/arm/boot/dts/omap4-panda.dts +1 -6

index 58909e9..c28aa95 100644
@@ -1,9 +1,4 @@
-/dts-v1/;
-
-/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
-/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
-
-/include/ "skeleton.dtsi"
+/include/ "omap4.dtsi"
 
  / {
  	model = "TI OMAP4 PandaBoard";

arch/arm/boot/dts/omap4.dtsi new file +28 -0

new file mode 100644
index 0000000..cb055f5
@@ -0,0 +1,68 @@
+/*
+ * Device Tree Source for OMAP4 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
+/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
+
+/include/ "skeleton.dtsi"
+
+/ {
+	#address-cells =<1>;
+	#size-cells =<1>;
+	model = "ti,omap4";
+
+	aliases {
+		i2c1 =&i2c1;
+		i2c2 =&i2c2;
+		i2c3 =&i2c3;
+		i2c4 =&i2c4;
+	};

arch/arm/boot/dts/omap4.dtsi new file +30 -0

+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x70000 0x100>;
+			interrupts =<  88>;
+		};
+
+		i2c2: i2c at 72000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x72000 0x100>;
+			interrupts =<  89>;
+		};
+
+		i2c3: i2c at 60000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x60000 0x100>;
+			interrupts =<  93>;
+		};
+
+		i2c4: i2c at 350000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x350000 0x100>;
+			interrupts =<  94>;
+		};
+	};
+};

Quoted 65 lines · Manjunath Kondaiah

Add omap4 soc dts file for handling omap4 soc i2c
controllers existing on l4-core bus.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
 arch/arm/boot/dts/omap4-panda.dts |    7 +---
 arch/arm/boot/dts/omap4.dtsi      |   68 +++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4.dtsi

arch/arm/boot/dts/omap4-panda.dts +1 -6

index 58909e9..c28aa95 100644
@@ -1,9 +1,4 @@
-/dts-v1/;
-
-/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
-/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
-
-/include/ "skeleton.dtsi"
+/include/ "omap4.dtsi"
 
 / {
 	model = "TI OMAP4 PandaBoard";

arch/arm/boot/dts/omap4.dtsi new file +33 -0

new file mode 100644
index 0000000..cb055f5
@@ -0,0 +1,68 @@
+/*
+ * Device Tree Source for OMAP4 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
+/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
+
+/include/ "skeleton.dtsi"
+
+/ {
+	#address-cells =<1>;
+	#size-cells =<1>;
+	model = "ti,omap4";
+
+	aliases {
+		i2c1 =&i2c1;
+		i2c2 =&i2c2;
+		i2c3 =&i2c3;
+		i2c4 =&i2c4;
+	};
+
+	l4-core {
+		compatible = "ti,omap4-l4-core", "sonics,s3220";
+		#address-cells =<1>;
+		#size-cells =<1>;

arch/arm/boot/dts/omap4.dtsi line 38

Quoted 5 lines

arch/arm/boot/dts/omap4.dtsi new file +5 -0

+		ranges =<0 0x48000000 0x1000000>;
+
+		i2c1: i2c at 70000 {
+			#address-cells =<1>;
+			#size-cells =<0>;

Are these really needed, given there are no child nodes defined? Same with all other instances.

Quoted 31 lines

arch/arm/boot/dts/omap4.dtsi new file +30 -0

+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x70000 0x100>;
+			interrupts =<  88>;
+		};
+
+		i2c2: i2c at 72000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x72000 0x100>;
+			interrupts =<  89>;
+		};
+
+		i2c3: i2c at 60000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x60000 0x100>;
+			interrupts =<  93>;
+		};
+
+		i2c4: i2c at 350000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x350000 0x100>;
+			interrupts =<  94>;
+		};
+	};
+};

To: devicetree-discuss at lists.ozlabs.org
CC: linux-omap at vger.kernel.org, linux-arm-kernel at lists.infradead.org

Add omap4 soc dts file for handling omap4 soc i2c
controllers existing on l4-core bus.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
   arch/arm/boot/dts/omap4-panda.dts |    7 +---
   arch/arm/boot/dts/omap4.dtsi      |   68
+++++++++++++++++++++++++++++++++++++
   2 files changed, 69 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/boot/dts/omap4.dtsi

arch/arm/boot/dts/omap4-panda.dts +1 -6

index 58909e9..c28aa95 100644
@@ -1,9 +1,4 @@
-/dts-v1/;
-
-/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
-/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
-
-/include/ "skeleton.dtsi"
+/include/ "omap4.dtsi"
 
   / {
   	model = "TI OMAP4 PandaBoard";

arch/arm/boot/dts/omap4.dtsi new file +4 -0

new file mode 100644
index 0000000..cb055f5
@@ -0,0 +1,68 @@
+/*
+ * Device Tree Source for OMAP4 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/

arch/arm/boot/dts/omap4.dtsi new file +54 -0

+
+/include/ "skeleton.dtsi"
+
+/ {
+	#address-cells =<1>;
+	#size-cells =<1>;
+	model = "ti,omap4";
+
+	aliases {
+		i2c1 =&i2c1;
+		i2c2 =&i2c2;
+		i2c3 =&i2c3;
+		i2c4 =&i2c4;
+	};
+
+	l4-core {
+		compatible = "ti,omap4-l4-core", "sonics,s3220";
+		#address-cells =<1>;
+		#size-cells =<1>;
+		ranges =<0 0x48000000 0x1000000>;
+
+		i2c1: i2c at 70000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x70000 0x100>;
+			interrupts =<  88>;
+		};
+
+		i2c2: i2c at 72000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x72000 0x100>;
+			interrupts =<  89>;
+		};
+
+		i2c3: i2c at 60000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x60000 0x100>;
+			interrupts =<  93>;
+		};
+
+		i2c4: i2c at 350000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x350000 0x100>;
+			interrupts =<  94>;
+		};
+	};
+};

From: G, Manjunath Kondaiah<[email protected]>

Quoted 6 lines

To: devicetree-discuss at lists.ozlabs.org
CC: linux-omap at vger.kernel.org, linux-arm-kernel at lists.infradead.org

Add omap4 soc dts file for handling omap4 soc i2c
controllers existing on l4-core bus.

The subject and changelog is not accurate. You are doing at least 3 things:
Moving the OMAP4 SoC data from panda board file to a SoC specific omap4.dtsi file.
Including the omap4.dtsi into panda.
Adding some i2c nodes.

You should use at least two or three separated patches to avoid in-accurate subject.

Benoit

Quoted 41 lines

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
  arch/arm/boot/dts/omap4-panda.dts |    7 +---
  arch/arm/boot/dts/omap4.dtsi      |   68
+++++++++++++++++++++++++++++++++++++
  2 files changed, 69 insertions(+), 6 deletions(-)

create mode 100644 arch/arm/boot/dts/omap4.dtsi

arch/arm/boot/dts/omap4-panda.dts +1 -6

index 58909e9..c28aa95 100644
@@ -1,9 +1,4 @@
-/dts-v1/;
-
-/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
-/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */
-
-/include/ "skeleton.dtsi"
+/include/ "omap4.dtsi"
 
  / {
  	model = "TI OMAP4 PandaBoard";

arch/arm/boot/dts/omap4.dtsi new file +10 -0

new file mode 100644
index 0000000..cb055f5
@@ -0,0 +1,68 @@
+/*
+ * Device Tree Source for OMAP4 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+

arch/arm/boot/dts/omap4.dtsi line 14

Quoted 4 lines

arch/arm/boot/dts/omap4.dtsi new file +4 -0

+/dts-v1/;
+
+/memreserve/ 0x9D000000 0x03000000; /* Frame buffer */
+/memreserve/ 0xB0000000 0x10000000; /* Top 256MB is unaccessable */

That information was already there previously but where does it come from? 48 MB is clearly not for the FB, and the top 256 MB should be accessible with highmem.

Benoit

Quoted 54 lines

arch/arm/boot/dts/omap4.dtsi new file +54 -0

+
+/include/ "skeleton.dtsi"
+
+/ {
+	#address-cells =<1>;
+	#size-cells =<1>;
+	model = "ti,omap4";
+
+	aliases {
+		i2c1 =&i2c1;
+		i2c2 =&i2c2;
+		i2c3 =&i2c3;
+		i2c4 =&i2c4;
+	};
+
+	l4-core {
+		compatible = "ti,omap4-l4-core", "sonics,s3220";
+		#address-cells =<1>;
+		#size-cells =<1>;
+		ranges =<0 0x48000000 0x1000000>;
+
+		i2c1: i2c at 70000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x70000 0x100>;
+			interrupts =<  88>;
+		};
+
+		i2c2: i2c at 72000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x72000 0x100>;
+			interrupts =<  89>;
+		};
+
+		i2c3: i2c at 60000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x60000 0x100>;
+			interrupts =<  93>;
+		};
+
+		i2c4: i2c at 350000 {
+			#address-cells =<1>;
+			#size-cells =<0>;
+			compatible = "ti,omap-i2c", "ti,omap-device";
+			reg =<0x350000 0x100>;
+			interrupts =<  94>;
+		};
+	};
+};

Quoted 14 lines · Benoit

From: G, Manjunath Kondaiah<[email protected]>

Quoted 6 lines

To: devicetree-discuss at lists.ozlabs.org
CC: linux-omap at vger.kernel.org, linux-arm-kernel at lists.infradead.org

Add omap4 soc dts file for handling omap4 soc i2c
controllers existing on l4-core bus.

The subject and changelog is not accurate. You are doing at least 3 things:
Moving the OMAP4 SoC data from panda board file to a SoC specific omap4.dtsi file.
Including the omap4.dtsi into panda.
Adding some i2c nodes.

Quoted 2 lines

You should use at least two or three separated patches to avoid in-accurate subject.

As these changes are straight forward, I can update patch description with the required information instead of create too many patches.

If you are too specific on splitting the patches, I am ok with that too.

The generic board file is created and derived from omap4 panda board file.

The changes here focus on minimal configuration to boot panda board with dt enabled which provides basic platform for converting device drivers for using dt.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
   arch/arm/boot/dts/omap4-panda.dts      |    2 +-
   arch/arm/mach-omap2/Kconfig            |   11 +++++
   arch/arm/mach-omap2/Makefile           |    1 +
   arch/arm/mach-omap2/board-omap4-dt.c   |   66
++++++++++++++++++++++++++++++++
   arch/arm/mach-omap2/board-omap4panda.c |    6 ---
   5 files changed, 79 insertions(+), 7 deletions(-)

create mode 100644 arch/arm/mach-omap2/board-omap4-dt.c

arch/arm/boot/dts/omap4-panda.dts +0 -0

index 6b831ca..9d1b17c 100644

arch/arm/boot/dts/omap4-panda.dts +0 -0

   	i2c1 {
   		clock-frequency =<400000>;

arch/arm/mach-omap2/Kconfig +0 -0

index 4fbb54d..853b14c 100644

arch/arm/mach-omap2/Kconfig +2 -0

+	  More information at Documentation/devicetree
+
   config OMAP3_EMU
   	bool "OMAP3 debugging peripherals"
   	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile +0 -0

index e702e47..8b8c29c 100644

arch/arm/mach-omap2/board-omap4-dt.c new file +33 -0

+#include<asm/mach/arch.h>
+#include<asm/mach/map.h>
+
+#include<plat/common.h>
+
+#include "common-board-devices.h"
+
+static void __init omap4_init_early(void)
+{
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(NULL, NULL);
+}
+
+static struct twl4030_platform_data omap4_twldata = {
+	.irq_base	= TWL6030_IRQ_BASE,
+	.irq_end	= TWL6030_IRQ_END,
+};
+
+static int __init omap4_i2c_init(void)
+{
+	omap4_pmic_init("twl6030",&omap4_twldata);
+	return 0;
+}
+
+static void __init omap4_init(void)
+{
+	omap4_i2c_init();
+	omap_serial_init();
+}
+
+static void __init omap4_map_io(void)
+{
+	omap2_set_globals_443x();

From: G, Manjunath Kondaiah<[email protected]>

Quoted 24 lines

The generic board file is created and derived from omap4 panda board file.

The changes here focus on minimal configuration to boot panda board with dt enabled which provides basic platform for converting device drivers for using dt.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
  arch/arm/boot/dts/omap4-panda.dts      |    2 +-
  arch/arm/mach-omap2/Kconfig            |   11 +++++
  arch/arm/mach-omap2/Makefile           |    1 +
  arch/arm/mach-omap2/board-omap4-dt.c   |   66
++++++++++++++++++++++++++++++++
  arch/arm/mach-omap2/board-omap4panda.c |    6 ---
  5 files changed, 79 insertions(+), 7 deletions(-)

create mode 100644 arch/arm/mach-omap2/board-omap4-dt.c

arch/arm/boot/dts/omap4-panda.dts +0 -0

index 6b831ca..9d1b17c 100644
@@ -2,7 +2,7 @@
 

arch/arm/boot/dts/omap4-panda.dts line 5

Quoted 4 lines

arch/arm/boot/dts/omap4-panda.dts +1 -1

  / {
  	model = "TI OMAP4 PandaBoard";
-	compatible = "ti,omap4-panda", "ti,omap4430";
+	compatible = "ti,omap4-panda", "ti,omap4";

That change does not belong here, or at least should be listed in the changelog. Potentially you should keep the ti,omap4430 and just add the ti,omap4 to have the most generic compatible value.

Quoted 9 lines

arch/arm/boot/dts/omap4-panda.dts +0 -0

  	i2c1 {
  		clock-frequency =<400000>;

arch/arm/mach-omap2/Kconfig +0 -0

index 4fbb54d..853b14c 100644

arch/arm/mach-omap2/Kconfig config MACH_OMAP4_PANDA · line 343

Quoted 7 lines

arch/arm/mach-omap2/Kconfig +4 -0

@@ -337,6 +337,17 @@ config MACH_OMAP4_PANDA
  	select OMAP_PACKAGE_CBS
  	select REGULATOR_FIXED_VOLTAGE
 
+config MACH_OMAP4_DT
+	bool "Generic OMAP4 board(FDT support)"
+	depends on ARCH_OMAP4
+	select OMAP_PACKAGE_CBB

Wrong package... it looks like some OMAP3 copy/paste.

arch/arm/mach-omap2/Kconfig config MACH_OMAP4_PANDA · line 348

Quoted 5 lines

arch/arm/mach-omap2/Kconfig +5 -0

+	select USE_OF
+
+	help
+	  Support for generic TI OMAP4 boards using Flattened Device Tree.
+	  Say Y here to enable OMAP3 device tree support

Some more copy/paste evidence:-)

Quoted 11 lines

arch/arm/mach-omap2/Kconfig +2 -0

+	  More information at Documentation/devicetree
+
  config OMAP3_EMU
  	bool "OMAP3 debugging peripherals"
  	depends on ARCH_OMAP3

arch/arm/mach-omap2/Makefile +0 -0

index e702e47..8b8c29c 100644

arch/arm/mach-omap2/Makefile obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o · line 201

Quoted 4 lines

arch/arm/mach-omap2/Makefile +1 -0

@@ -198,6 +198,7 @@ obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o
  obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o
  obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o
  obj-$(CONFIG_MACH_OMAP3_DT)		+= board-omap3-dt.o
+obj-$(CONFIG_MACH_OMAP4_DT)		+= board-omap4-dt.o

Boards are grouped by SoC version.

arch/arm/mach-omap2/board-omap4-dt.c line 2

Quoted 13 lines

arch/arm/mach-omap2/Makefile +0 -0

  obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o
  obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o \
  					   sdram-nokia.o

arch/arm/mach-omap2/board-omap4-dt.c new file +2 -0

new file mode 100644
index 0000000..a4d296c
@@ -0,0 +1,66 @@
+/*
+ * TI OMAP3 device tree board support

One more C&P.

arch/arm/mach-omap2/board-omap4-dt.c

Quoted 13 lines

arch/arm/mach-omap2/board-omap4-dt.c new file +13 -0

+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include<linux/kernel.h>
+#include<linux/init.h>
+#include<linux/i2c/twl.h>
+
+#include<mach/omap4-common.h>

nitpicking, but it should go after <plat/common.h>.

Quoted 38 lines

arch/arm/mach-omap2/board-omap4-dt.c new file +37 -0

+#include<asm/mach/arch.h>
+#include<asm/mach/map.h>
+
+#include<plat/common.h>
+
+#include "common-board-devices.h"
+
+static void __init omap4_init_early(void)
+{
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(NULL, NULL);
+}
+
+static struct twl4030_platform_data omap4_twldata = {
+	.irq_base	= TWL6030_IRQ_BASE,
+	.irq_end	= TWL6030_IRQ_END,
+};
+
+static int __init omap4_i2c_init(void)
+{
+	omap4_pmic_init("twl6030",&omap4_twldata);
+	return 0;
+}
+
+static void __init omap4_init(void)
+{
+	omap4_i2c_init();
+	omap_serial_init();
+}
+
+static void __init omap4_map_io(void)
+{
+	omap2_set_globals_443x();
+	omap44xx_map_common_io();
+}
+
+static const char *omap4_match[] __initdata = {

arch/arm/mach-omap2/board-omap4-dt.c line 58

Quoted 6 lines

arch/arm/mach-omap2/board-omap4-dt.c new file +6 -0

+	"ti,omap4",
+	NULL,
+};
+
+DT_MACHINE_START(OMAP4_DT, "TI OMAP4 (Flattened Device Tree)")
+	.boot_params	= 0x80000100,

Not needed anymore with DT.

Quoted 11 lines

arch/arm/mach-omap2/board-omap4-dt.c new file +8 -0

+	.reserve	= omap_reserve,
+	.map_io		= omap4_map_io,
+	.init_early	= omap4_init_early,
+	.init_irq	= gic_init_irq,
+	.init_machine	= omap4_init,
+	.timer		=&omap4_timer,
+	.dt_compat	= omap4_match,
+MACHINE_END

arch/arm/mach-omap2/board-omap4panda.c +0 -0

arch/arm/mach-omap2/board-omap4panda.c

Quoted 3 lines

index 1c583c7..9aaa960 100644

arch/arm/mach-omap2/board-omap4panda.c +0 -0

That change does not really belong here or the changelog is not correct. You can potentially do it in an other patch before. It will not really introduce any regression if you do it before adding any information into panda DT.

From: G, Manjunath Kondaiah<[email protected]>
To: devicetree-discuss at lists.ozlabs.org
CC: linux-omap at vger.kernel.org, linux-arm-kernel at lists.infradead.org

Update omap4 panda dts file with required clock frequencies for the i2c client devices existing on panda board.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
   arch/arm/boot/dts/omap4-panda.dts |   16 ++++++++++++++++
   1 files changed, 16 insertions(+), 0 deletions(-)

arch/arm/boot/dts/omap4-panda.dts +7 -0

index c28aa95..6b831ca 100644
@@ -3,4 +3,20 @@
   / {
   	model = "TI OMAP4 PandaBoard";
   	compatible = "ti,omap4-panda", "ti,omap4430";
+
+	i2c1 {
+		clock-frequency =<400000>;
+	};
+
+	i2c2 {
+		clock-frequency =<400000>;

Quoted 29 lines

From: G, Manjunath Kondaiah<[email protected]>
To: devicetree-discuss at lists.ozlabs.org
CC: linux-omap at vger.kernel.org, linux-arm-kernel at lists.infradead.org

Update omap4 panda dts file with required clock frequencies for the i2c client devices existing on panda board.

Signed-off-by G, Manjunath Kondaiah<[email protected]>

---
? arch/arm/boot/dts/omap4-panda.dts | ? 16 ++++++++++++++++ ? 1 files changed, 16 insertions(+), 0 deletions(-)

arch/arm/boot/dts/omap4-panda.dts +7 -0

index c28aa95..6b831ca 100644
@@ -3,4 +3,20 @@
 ? / {
 ? ? ? ?model = "TI OMAP4 PandaBoard";
 ? ? ? ?compatible = "ti,omap4-panda", "ti,omap4430";
+
+ ? ? ? i2c1 {
+ ? ? ? ? ? ? ? clock-frequency =<400000>;
+ ? ? ? };
+
+ ? ? ? i2c2 {
+ ? ? ? ? ? ? ? clock-frequency =<400000>;

arch/arm/boot/dts/omap4-panda.dts line 22

Quoted 10 lines

arch/arm/boot/dts/omap4-panda.dts +9 -0

+ ? ? ? };
+
+ ? ? ? i2c3 {
+ ? ? ? ? ? ? ? clock-frequency =<400000>;
+ ? ? ? };
+
+ ? ? ? i2c4 {
+ ? ? ? ? ? ? ? clock-frequency =<400000>;
+ ? ? ? };
 ? };

Are you sure that this patch is setting the expected frequency? I see 100kHz in the boot log even with that patch.

I took me some time to find the proper syntax, but in order to reference an existing node, you have to use &i2c1 at the top level of the file. If you check the output of the DTC compiler, you will see the property at the proper node.

Patch series reworked from:
http://permalink.gmane.org/gmane.linux.ports.arm.omap/61674
Also added support for i2c1 controller on omap4 based panda board.

Baseline:
=========
git://git.secretlab.ca/git/linux-2.6.git
Branch: devicetree/test
The above branch is rebased with v3.1-rc2 mainline.
+
pdev decoupling patches from kevin hilman
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg53534.html

The patch series is also available at:
https://gitorious.org/devicetree/dt_omap/commits/devicetree/dt_rfcv2

Testing:
========
Build : dt and not dt build for omap2plus_defconfig
Boot: OMAP3530 Beagle Board and OMAP4430 Panda board

Limitation:
===========
The current implementation of omap-device build through device tree supports only single instance of hwmod and multiple instances are not supported.

G, Manjunath Kondaiah (13):
OMAP: omap_device: Add device tree node pointer
dt: Add pd_size to AUXDATA structure
dt: omap3: add soc file for handling i2c controllers
dt: omap3: beagle board: set clock freq for i2c devices
dt: omap3: add generic board file for dt support
dt: omap3: add omap-device compatible property
dt: omap: create platform bus for omap devices
dt: omap: i2c: add dt support for i2c1 controller
dt: omap4: add soc file for handling i2c controllers
dt: omap4: panda board: set clock freq for i2c devices
dt: omap4: add generic board file for dt support
dt: omap4: enable dt support for i2c1 controller
dt: omap: i2c: dt usage model documentation

Patch series reworked from:
http://permalink.gmane.org/gmane.linux.ports.arm.omap/61674
Also added support for i2c1 controller on omap4 based panda board.

Baseline:
=========
git://git.secretlab.ca/git/linux-2.6.git
Branch: devicetree/test
The above branch is rebased with v3.1-rc2 mainline.
+
pdev decoupling patches from kevin hilman
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg53534.html

The patch series is also available at:
https://gitorious.org/devicetree/dt_omap/commits/devicetree/dt_rfcv2

Testing:
========
Build : dt and not dt build for omap2plus_defconfig
Boot: OMAP3530 Beagle Board and OMAP4430 Panda board

Limitation:
===========
The current implementation of omap-device build through device tree supports only single instance of hwmod and multiple instances are not supported.

G, Manjunath Kondaiah (13):
OMAP: omap_device: Add device tree node pointer
dt: Add pd_size to AUXDATA structure
dt: omap3: add soc file for handling i2c controllers
dt: omap3: beagle board: set clock freq for i2c devices
dt: omap3: add generic board file for dt support
dt: omap3: add omap-device compatible property
dt: omap: create platform bus for omap devices
dt: omap: i2c: add dt support for i2c1 controller
dt: omap4: add soc file for handling i2c controllers
dt: omap4: panda board: set clock freq for i2c devices
dt: omap4: add generic board file for dt support
dt: omap4: enable dt support for i2c1 controller
dt: omap: i2c: dt usage model documentation

 Documentation/devicetree/bindings/i2c/omap-i2c.txt |   57 +++++++++++++
 arch/arm/boot/dts/omap3-beagle-nunchuck.dts        |   13 +---
 arch/arm/boot/dts/omap3-beagle.dts                 |   18 ++++-
 arch/arm/boot/dts/omap3.dtsi                       |   62 ++++++++++++++
 arch/arm/boot/dts/omap4-panda.dts                  |   25 ++++--
 arch/arm/boot/dts/omap4.dtsi                       |   68 ++++++++++++++++
 arch/arm/mach-omap2/Kconfig                        |   22 +++++
 arch/arm/mach-omap2/Makefile                       |    2 +
 arch/arm/mach-omap2/board-omap3-dt.c               |   84 ++++++++++++++++++++
 arch/arm/mach-omap2/board-omap3beagle.c            |   13 ---
 arch/arm/mach-omap2/board-omap4-dt.c               |   75 +++++++++++++++++
 arch/arm/mach-omap2/board-omap4panda.c             |    6 --
 arch/arm/mach-omap2/devices.c                      |    2 +-
 arch/arm/mach-omap2/mcbsp.c                        |    2 +-
 arch/arm/plat-omap/include/plat/omap_device.h      |   11 +++-
 arch/arm/plat-omap/omap_device.c                   |   46 ++++++++++-
 drivers/i2c/busses/i2c-omap.c                      |   23 +++++-
 drivers/of/platform.c                              |   41 ++++++++++
 include/linux/of_platform.h                        |    5 +
 19 files changed, 526 insertions(+), 49 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/i2c/omap-i2c.txt
 create mode 100644 arch/arm/boot/dts/omap3.dtsi
 create mode 100644 arch/arm/boot/dts/omap4.dtsi
 create mode 100644 arch/arm/mach-omap2/board-omap3-dt.c
 create mode 100644 arch/arm/mach-omap2/board-omap4-dt.c

Signature · 6 lines

1.7.4.1

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

Quoted 18 lines · Manjunath Kondaiah

Patch series reworked from:
http://permalink.gmane.org/gmane.linux.ports.arm.omap/61674
Also added support for i2c1 controller on omap4 based panda board.

Baseline:
=========
git://git.secretlab.ca/git/linux-2.6.git
Branch: devicetree/test
The above branch is rebased with v3.1-rc2 mainline.
+
pdev decoupling patches from kevin hilman
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg53534.html

The patch series is also available at:
https://gitorious.org/devicetree/dt_omap/commits/devicetree/dt_rfcv2

Quoted 4 lines

Testing:
========
Build : dt and not dt build for omap2plus_defconfig
Boot: OMAP3530 Beagle Board and OMAP4430 Panda board

Correction: This series will support only i2c1 controller and it will not handle i2c1 child devices such as twlxxxx pmic. Due to which, twl read/write's might fail during boot.

I am facing issues in getting platform_data in i2c child device probe function. The issue is reported to grant in patch 08/13 of this series.

-M

Quoted 21 lines

Limitation:
===========
The current implementation of omap-device build through device tree supports only single instance of hwmod and multiple instances are not supported.

G, Manjunath Kondaiah (13):
OMAP: omap_device: Add device tree node pointer
dt: Add pd_size to AUXDATA structure
dt: omap3: add soc file for handling i2c controllers
dt: omap3: beagle board: set clock freq for i2c devices
dt: omap3: add generic board file for dt support
dt: omap3: add omap-device compatible property
dt: omap: create platform bus for omap devices
dt: omap: i2c: add dt support for i2c1 controller
dt: omap4: add soc file for handling i2c controllers
dt: omap4: panda board: set clock freq for i2c devices
dt: omap4: add generic board file for dt support
dt: omap4: enable dt support for i2c1 controller
dt: omap: i2c: dt usage model documentation