diff options
| author | Linus Walleij | 2013-04-11 15:13:39 +0200 |
|---|---|---|
| committer | Linus Walleij | 2013-05-31 11:25:52 +0200 |
| commit | c023b8b295ff71df223746e6d9fd0e56cfe72846 (patch) | |
| tree | 46639a082a24f684acecb68ad2f4bbe49585c2a2 | |
| parent | i2c: stu300: device tree support (diff) | |
| download | kernel-qcow2-linux-c023b8b295ff71df223746e6d9fd0e56cfe72846.tar.gz kernel-qcow2-linux-c023b8b295ff71df223746e6d9fd0e56cfe72846.tar.xz kernel-qcow2-linux-c023b8b295ff71df223746e6d9fd0e56cfe72846.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/ste-u300.dts | 18 | ||||
| -rw-r--r-- | arch/arm/mach-u300/core.c | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts index 9e423eb5aa0a..67a1b52401f4 100644 --- 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 a210b1c4ccf4..abe97041128a 100644 --- 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 */ }, |