evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2012-12-15 23:56:42 +09:00
commit 92b2e81d6f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/at91sam9260.dtsi
View file

@ -217,7 +217,7 @@
compatible = "atmel,at91rm9200-ssc";
reg = <0xfffbc000 0x4000>;
interrupts = <14 4 5>;
status = "disable";
status = "disabled";
};
adc0: adc@fffe0000 {

4
arch/arm/boot/dts/at91sam9263.dtsi
View file

@ -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 {

4
arch/arm/boot/dts/at91sam9g45.dtsi
View file

@ -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 {

2
arch/arm/boot/dts/at91sam9x5.dtsi
View file

@ -92,7 +92,7 @@
compatible = "atmel,at91sam9g45-ssc";
reg = <0xf0010000 0x4000>;
interrupts = <28 4 5>;
status = "disable";
status = "disabled";
};
tcb0: timer@f8008000 {