aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-09-12 02:42:16 -0400
committerWolfram Sang <w.sang@pengutronix.de>2012-09-12 08:49:16 -0400
commit05dcd361a2785c3fcb9c43a621da4434cf1519b4 (patch)
tree834effd6c5b8c6274f3065b057a48d6055622a83
parentf7d19b9065569268dd13307213c40d168fb0be82 (diff)
ARM: dts: add twi nodes for atmel SoCs
Add TWI nodes for atmel SoCs but keep i2c-gpio ones in order to let the choice to the user in dts files. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi10
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi10
-rw-r--r--arch/arm/boot/dts/at91sam9g20.dtsi4
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi20
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi20
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi30
6 files changed, 94 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 66389c1c6f62..edef4521cef4 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -28,6 +28,7 @@
28 gpio2 = &pioC; 28 gpio2 = &pioC;
29 tcb0 = &tcb0; 29 tcb0 = &tcb0;
30 tcb1 = &tcb1; 30 tcb1 = &tcb1;
31 i2c0 = &i2c0;
31 }; 32 };
32 cpus { 33 cpus {
33 cpu@0 { 34 cpu@0 {
@@ -199,6 +200,15 @@
199 status = "disabled"; 200 status = "disabled";
200 }; 201 };
201 202
203 i2c0: i2c@fffac000 {
204 compatible = "atmel,at91sam9260-i2c";
205 reg = <0xfffac000 0x100>;
206 interrupts = <11 4 6>;
207 #address-cells = <1>;
208 #size-cells = <0>;
209 status = "disabled";
210 };
211
202 adc0: adc@fffe0000 { 212 adc0: adc@fffe0000 {
203 compatible = "atmel,at91sam9260-adc"; 213 compatible = "atmel,at91sam9260-adc";
204 reg = <0xfffe0000 0x100>; 214 reg = <0xfffe0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index b460d6ce9eb5..e7942c7e3f67 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -24,6 +24,7 @@
24 gpio3 = &pioD; 24 gpio3 = &pioD;
25 gpio4 = &pioE; 25 gpio4 = &pioE;
26 tcb0 = &tcb0; 26 tcb0 = &tcb0;
27 i2c0 = &i2c0;
27 }; 28 };
28 cpus { 29 cpus {
29 cpu@0 { 30 cpu@0 {
@@ -180,6 +181,15 @@
180 interrupts = <24 4 2>; 181 interrupts = <24 4 2>;
181 status = "disabled"; 182 status = "disabled";
182 }; 183 };
184
185 i2c0: i2c@fff88000 {
186 compatible = "atmel,at91sam9263-i2c";
187 reg = <0xfff88000 0x100>;
188 interrupts = <13 4 6>;
189 #address-cells = <1>;
190 #size-cells = <0>;
191 status = "disabled";
192 };
183 }; 193 };
184 194
185 nand0: nand@40000000 { 195 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 2a1d1ca8bd86..75ce6e760016 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -18,6 +18,10 @@
18 18
19 ahb { 19 ahb {
20 apb { 20 apb {
21 i2c0: i2c@fffac000 {
22 compatible = "atmel,at91sam9g20-i2c";
23 };
24
21 adc0: adc@fffe0000 { 25 adc0: adc@fffe0000 {
22 atmel,adc-startup-time = <40>; 26 atmel,adc-startup-time = <40>;
23 }; 27 };
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index bafa8806fc17..ae4bb6da2878 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -29,6 +29,8 @@
29 gpio4 = &pioE; 29 gpio4 = &pioE;
30 tcb0 = &tcb0; 30 tcb0 = &tcb0;
31 tcb1 = &tcb1; 31 tcb1 = &tcb1;
32 i2c0 = &i2c0;
33 i2c1 = &i2c1;
32 }; 34 };
33 cpus { 35 cpus {
34 cpu@0 { 36 cpu@0 {
@@ -201,6 +203,24 @@
201 status = "disabled"; 203 status = "disabled";
202 }; 204 };
203 205
206 i2c0: i2c@fff84000 {
207 compatible = "atmel,at91sam9g10-i2c";
208 reg = <0xfff84000 0x100>;
209 interrupts = <12 4 6>;
210 #address-cells = <1>;
211 #size-cells = <0>;
212 status = "disabled";
213 };
214
215 i2c1: i2c@fff88000 {
216 compatible = "atmel,at91sam9g10-i2c";
217 reg = <0xfff88000 0x100>;
218 interrupts = <13 4 6>;
219 #address-cells = <1>;
220 #size-cells = <0>;
221 status = "disabled";
222 };
223
204 adc0: adc@fffb0000 { 224 adc0: adc@fffb0000 {
205 compatible = "atmel,at91sam9260-adc"; 225 compatible = "atmel,at91sam9260-adc";
206 reg = <0xfffb0000 0x100>; 226 reg = <0xfffb0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index bfac0dfc332c..42e9fba44237 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -26,6 +26,8 @@
26 gpio3 = &pioD; 26 gpio3 = &pioD;
27 tcb0 = &tcb0; 27 tcb0 = &tcb0;
28 tcb1 = &tcb1; 28 tcb1 = &tcb1;
29 i2c0 = &i2c0;
30 i2c1 = &i2c1;
29 }; 31 };
30 cpus { 32 cpus {
31 cpu@0 { 33 cpu@0 {
@@ -178,6 +180,24 @@
178 atmel,use-dma-tx; 180 atmel,use-dma-tx;
179 status = "disabled"; 181 status = "disabled";
180 }; 182 };
183
184 i2c0: i2c@f8010000 {
185 compatible = "atmel,at91sam9x5-i2c";
186 reg = <0xf8010000 0x100>;
187 interrupts = <9 4 6>;
188 #address-cells = <1>;
189 #size-cells = <0>;
190 status = "disabled";
191 };
192
193 i2c1: i2c@f8014000 {
194 compatible = "atmel,at91sam9x5-i2c";
195 reg = <0xf8014000 0x100>;
196 interrupts = <10 4 6>;
197 #address-cells = <1>;
198 #size-cells = <0>;
199 status = "disabled";
200 };
181 }; 201 };
182 202
183 nand0: nand@40000000 { 203 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 4a18c393b136..e05afbc3e047 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -27,6 +27,9 @@
27 gpio3 = &pioD; 27 gpio3 = &pioD;
28 tcb0 = &tcb0; 28 tcb0 = &tcb0;
29 tcb1 = &tcb1; 29 tcb1 = &tcb1;
30 i2c0 = &i2c0;
31 i2c1 = &i2c1;
32 i2c2 = &i2c2;
30 }; 33 };
31 cpus { 34 cpus {
32 cpu@0 { 35 cpu@0 {
@@ -192,6 +195,33 @@
192 status = "disabled"; 195 status = "disabled";
193 }; 196 };
194 197
198 i2c0: i2c@f8010000 {
199 compatible = "atmel,at91sam9x5-i2c";
200 reg = <0xf8010000 0x100>;
201 interrupts = <9 4 6>;
202 #address-cells = <1>;
203 #size-cells = <0>;
204 status = "disabled";
205 };
206
207 i2c1: i2c@f8014000 {
208 compatible = "atmel,at91sam9x5-i2c";
209 reg = <0xf8014000 0x100>;
210 interrupts = <10 4 6>;
211 #address-cells = <1>;
212 #size-cells = <0>;
213 status = "disabled";
214 };
215
216 i2c2: i2c@f8018000 {
217 compatible = "atmel,at91sam9x5-i2c";
218 reg = <0xf8018000 0x100>;
219 interrupts = <11 4 6>;
220 #address-cells = <1>;
221 #size-cells = <0>;
222 status = "disabled";
223 };
224
195 adc0: adc@f804c000 { 225 adc0: adc@f804c000 {
196 compatible = "atmel,at91sam9260-adc"; 226 compatible = "atmel,at91sam9260-adc";
197 reg = <0xf804c000 0x100>; 227 reg = <0xf804c000 0x100>;