diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 23:56:42 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 23:56:42 +0900 |
| commit | 92b2e81d6f95bcee386abac4c4389f5b950f7bb9 (patch) | |
| tree | 9fe28b750189bd2386f2eb05381bfe18da4e4881 /arch | |
| parent | 82441fffc8d9c28e168df3bcd9f9c95bfae1ebbc (diff) | |
| parent | 315656bc3bf5b24e560ab1d9e2d49a5e987b49b4 (diff) | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'arch')
| -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 @@ compatible = "atmel,at91rm9200-ssc"; reg = <0xfffbc000 0x4000>; interrupts = <14 4 5>; - status = "disable"; + status = "disabled"; }; 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 @@ compatible = "atmel,at91rm9200-ssc"; reg = <0xfff98000 0x4000>; interrupts = <16 4 5>; - status = "disable"; + status = "disabled"; }; ssc1: ssc@fff9c000 { compatible = "atmel,at91rm9200-ssc"; reg = <0xfff9c000 0x4000>; interrupts = <17 4 5>; - status = "disable"; + status = "disabled"; }; 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 @@ compatible = "atmel,at91sam9g45-ssc"; reg = <0xfff9c000 0x4000>; interrupts = <16 4 5>; - status = "disable"; + status = "disabled"; }; ssc1: ssc@fffa0000 { compatible = "atmel,at91sam9g45-ssc"; reg = <0xfffa0000 0x4000>; interrupts = <17 4 5>; - status = "disable"; + status = "disabled"; }; 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 @@ compatible = "atmel,at91sam9g45-ssc"; reg = <0xf0010000 0x4000>; interrupts = <28 4 5>; - status = "disable"; + status = "disabled"; }; tcb0: timer@f8008000 { |