ARM: u300: register I2C bus drivers from device tree

This adds the two I2C busses to the device tree so these
probe properly.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 9e423eb5aa0a943678ea9136d474251bdd5244eb..67a1b52401f4044cb9320e4c3d7cc3c4b88c08d8 100644 (file)
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -49,6 +49,24 @@
                reg = <0xc0011000 0x1000>;
        };
 
+       i2c0: i2c@c0004000 {
+               compatible = "st,ddci2c";
+               reg = <0xc0004000 0x1000>;
+               interrupt-parent = <&vicb>;
+               interrupts = <8>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+
+       i2c1: i2c@c0005000 {
+               compatible = "st,ddci2c";
+               reg = <0xc0005000 0x1000>;
+               interrupt-parent = <&vicb>;
+               interrupts = <9>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+
        amba {
                compatible = "arm,amba-bus";
                #address-cells = <1>;

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index a210b1c4ccf48c445e501563567f85aecbcf47ba..abe97041128a6030df50fba81654804867cbe530 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -714,6 +714,10 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = {
                "uart0", &uart0_plat_data),
        OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,
                "uart1", &uart1_plat_data),
+       OF_DEV_AUXDATA("st,ddci2c", U300_I2C0_BASE,
+               "stu300.0", NULL),
+       OF_DEV_AUXDATA("st,ddci2c", U300_I2C1_BASE,
+               "stu300.1", NULL),
        OF_DEV_AUXDATA("arm,primecell", U300_MMCSD_BASE,
                "mmci", &mmcsd_platform_data),
        { /* sentinel */ },