Merge remote-tracking branch 'asoc/fix/pxa' into tmp

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / at91sam9g45.dtsi

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index fa1ae0c5479c0480022fac86fe576806154da73e..231858ffd850fec57eee5a91f06aee53f4c22f7f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -425,14 +425,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 {