Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92b2e81d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents 82441fff 315656bc

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfffbc000 0x4000>;

				interrupts = <14 4 5>;

				status = "disable";

				status = "disabled";

			};



			adc0: adc@fffe0000 {

arch/arm/boot/dts/at91sam9263.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/at91sam9g45.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xf0010000 0x4000>;

				interrupts = <28 4 5>;

				status = "disable";

				status = "disabled";

			};



			tcb0: timer@f8008000 {