aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoachim Eastwood <manabian@gmail.com>2013-02-07 20:25:54 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-03-21 11:07:13 -0400
commit2d25210ddd116e8fa4afc45529db6b5cb1f3538b (patch)
treef7c542f098cf2cae94513d9a23973eb60bd75824 /arch
parent463c9c7bf1f3ef508c8526a49763fb64cdf9ef95 (diff)
ARM: at91: add TWI bindings to RM9200 DT
Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/at91rm9200.dtsi20
-rw-r--r--arch/arm/mach-at91/at91rm9200.c1
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index b0268a5f4b4e..a7031c6b8603 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -29,6 +29,7 @@
29 gpio3 = &pioD; 29 gpio3 = &pioD;
30 tcb0 = &tcb0; 30 tcb0 = &tcb0;
31 tcb1 = &tcb1; 31 tcb1 = &tcb1;
32 i2c0 = &i2c0;
32 ssc0 = &ssc0; 33 ssc0 = &ssc0;
33 ssc1 = &ssc1; 34 ssc1 = &ssc1;
34 ssc2 = &ssc2; 35 ssc2 = &ssc2;
@@ -91,6 +92,17 @@
91 interrupts = <20 4 0 21 4 0 22 4 0>; 92 interrupts = <20 4 0 21 4 0 22 4 0>;
92 }; 93 };
93 94
95 i2c0: i2c@fffb8000 {
96 compatible = "atmel,at91rm9200-i2c";
97 reg = <0xfffb8000 0x4000>;
98 interrupts = <12 4 6>;
99 pinctrl-names = "default";
100 pinctrl-0 = <&pinctrl_twi>;
101 #address-cells = <1>;
102 #size-cells = <0>;
103 status = "disabled";
104 };
105
94 mmc0: mmc@fffb4000 { 106 mmc0: mmc@fffb4000 {
95 compatible = "atmel,hsmci"; 107 compatible = "atmel,hsmci";
96 reg = <0xfffb4000 0x4000>; 108 reg = <0xfffb4000 0x4000>;
@@ -365,6 +377,14 @@
365 }; 377 };
366 }; 378 };
367 379
380 twi {
381 pinctrl_twi: twi-0 {
382 atmel,pins =
383 <0 25 0x1 0x2 /* PA25 periph A with multi drive */
384 0 26 0x1 0x2>; /* PA26 periph A with multi drive */
385 };
386 };
387
368 pioA: gpio@fffff400 { 388 pioA: gpio@fffff400 {
369 compatible = "atmel,at91rm9200-gpio"; 389 compatible = "atmel,at91rm9200-gpio";
370 reg = <0xfffff400 0x200>; 390 reg = <0xfffff400 0x200>;
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 9706c000f294..36b05fc28816 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -212,6 +212,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
212 CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk), 212 CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk),
213 CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk), 213 CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk),
214 CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", &ether_clk), 214 CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", &ether_clk),
215 CLKDEV_CON_DEV_ID(NULL, "fffb8000.i2c", &twi_clk),
215 CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk), 216 CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk),
216 CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), 217 CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk),
217 CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), 218 CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk),