diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:42 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:42 -0500 |
| commit | 92b2e81d6f95bcee386abac4c4389f5b950f7bb9 (patch) | |
| tree | 9fe28b750189bd2386f2eb05381bfe18da4e4881 | |
| parent | 82441fffc8d9c28e168df3bcd9f9c95bfae1ebbc (diff) | |
| parent | 315656bc3bf5b24e560ab1d9e2d49a5e987b49b4 (diff) | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
| -rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index aaa42d8d4f8..03c56cbd050 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
| @@ -217,7 +217,7 @@ | |||
| 217 | compatible = "atmel,at91rm9200-ssc"; | 217 | compatible = "atmel,at91rm9200-ssc"; |
| 218 | reg = <0xfffbc000 0x4000>; | 218 | reg = <0xfffbc000 0x4000>; |
| 219 | interrupts = <14 4 5>; | 219 | interrupts = <14 4 5>; |
| 220 | status = "disable"; | 220 | status = "disabled"; |
| 221 | }; | 221 | }; |
| 222 | 222 | ||
| 223 | adc0: adc@fffe0000 { | 223 | adc0: adc@fffe0000 { |
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 3b721ee59b1..15f12dd803e 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
| @@ -179,14 +179,14 @@ | |||
| 179 | compatible = "atmel,at91rm9200-ssc"; | 179 | compatible = "atmel,at91rm9200-ssc"; |
| 180 | reg = <0xfff98000 0x4000>; | 180 | reg = <0xfff98000 0x4000>; |
| 181 | interrupts = <16 4 5>; | 181 | interrupts = <16 4 5>; |
| 182 | status = "disable"; | 182 | status = "disabled"; |
| 183 | }; | 183 | }; |
| 184 | 184 | ||
| 185 | ssc1: ssc@fff9c000 { | 185 | ssc1: ssc@fff9c000 { |
| 186 | compatible = "atmel,at91rm9200-ssc"; | 186 | compatible = "atmel,at91rm9200-ssc"; |
| 187 | reg = <0xfff9c000 0x4000>; | 187 | reg = <0xfff9c000 0x4000>; |
| 188 | interrupts = <17 4 5>; | 188 | interrupts = <17 4 5>; |
| 189 | status = "disable"; | 189 | status = "disabled"; |
| 190 | }; | 190 | }; |
| 191 | 191 | ||
| 192 | macb0: ethernet@fffbc000 { | 192 | macb0: ethernet@fffbc000 { |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index acfa207162f..44a38d0fe59 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
| @@ -232,14 +232,14 @@ | |||
| 232 | compatible = "atmel,at91sam9g45-ssc"; | 232 | compatible = "atmel,at91sam9g45-ssc"; |
| 233 | reg = <0xfff9c000 0x4000>; | 233 | reg = <0xfff9c000 0x4000>; |
| 234 | interrupts = <16 4 5>; | 234 | interrupts = <16 4 5>; |
| 235 | status = "disable"; | 235 | status = "disabled"; |
| 236 | }; | 236 | }; |
| 237 | 237 | ||
| 238 | ssc1: ssc@fffa0000 { | 238 | ssc1: ssc@fffa0000 { |
| 239 | compatible = "atmel,at91sam9g45-ssc"; | 239 | compatible = "atmel,at91sam9g45-ssc"; |
| 240 | reg = <0xfffa0000 0x4000>; | 240 | reg = <0xfffa0000 0x4000>; |
| 241 | interrupts = <17 4 5>; | 241 | interrupts = <17 4 5>; |
| 242 | status = "disable"; | 242 | status = "disabled"; |
| 243 | }; | 243 | }; |
| 244 | 244 | ||
| 245 | adc0: adc@fffb0000 { | 245 | adc0: adc@fffb0000 { |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 69667d0ac34..0beff720caf 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
| @@ -92,7 +92,7 @@ | |||
| 92 | compatible = "atmel,at91sam9g45-ssc"; | 92 | compatible = "atmel,at91sam9g45-ssc"; |
| 93 | reg = <0xf0010000 0x4000>; | 93 | reg = <0xf0010000 0x4000>; |
| 94 | interrupts = <28 4 5>; | 94 | interrupts = <28 4 5>; |
| 95 | status = "disable"; | 95 | status = "disabled"; |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | tcb0: timer@f8008000 { | 98 | tcb0: timer@f8008000 { |