Skip to content

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

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

parents 82441fff 315656bc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
arch/arm/boot/dts/at91sam9260.dtsi
View file @ 92b2e81d
...@@ -217,7 +217,7 @@ ssc0: ssc@fffbc000 { ...@@ -217,7 +217,7 @@ ssc0: ssc@fffbc000 {
compatible = "atmel,at91rm9200-ssc"; compatible = "atmel,at91rm9200-ssc";
reg = <0xfffbc000 0x4000>; reg = <0xfffbc000 0x4000>;
interrupts = <14 4 5>; interrupts = <14 4 5>;
status = "disable"; status = "disabled";
}; };
adc0: adc@fffe0000 { adc0: adc@fffe0000 {
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ 92b2e81d
...@@ -179,14 +179,14 @@ ssc0: ssc@fff98000 { ...@@ -179,14 +179,14 @@ ssc0: ssc@fff98000 {
compatible = "atmel,at91rm9200-ssc"; compatible = "atmel,at91rm9200-ssc";
reg = <0xfff98000 0x4000>; reg = <0xfff98000 0x4000>;
interrupts = <16 4 5>; interrupts = <16 4 5>;
status = "disable"; status = "disabled";
}; };
ssc1: ssc@fff9c000 { ssc1: ssc@fff9c000 {
compatible = "atmel,at91rm9200-ssc"; compatible = "atmel,at91rm9200-ssc";
reg = <0xfff9c000 0x4000>; reg = <0xfff9c000 0x4000>;
interrupts = <17 4 5>; interrupts = <17 4 5>;
status = "disable"; status = "disabled";
}; };
macb0: ethernet@fffbc000 { macb0: ethernet@fffbc000 {
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ 92b2e81d
...@@ -232,14 +232,14 @@ ssc0: ssc@fff9c000 { ...@@ -232,14 +232,14 @@ ssc0: ssc@fff9c000 {
compatible = "atmel,at91sam9g45-ssc"; compatible = "atmel,at91sam9g45-ssc";
reg = <0xfff9c000 0x4000>; reg = <0xfff9c000 0x4000>;
interrupts = <16 4 5>; interrupts = <16 4 5>;
status = "disable"; status = "disabled";
}; };
ssc1: ssc@fffa0000 { ssc1: ssc@fffa0000 {
compatible = "atmel,at91sam9g45-ssc"; compatible = "atmel,at91sam9g45-ssc";
reg = <0xfffa0000 0x4000>; reg = <0xfffa0000 0x4000>;
interrupts = <17 4 5>; interrupts = <17 4 5>;
status = "disable"; status = "disabled";
}; };
adc0: adc@fffb0000 { adc0: adc@fffb0000 {
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ 92b2e81d
...@@ -92,7 +92,7 @@ ssc0: ssc@f0010000 { ...@@ -92,7 +92,7 @@ ssc0: ssc@f0010000 {
compatible = "atmel,at91sam9g45-ssc"; compatible = "atmel,at91sam9g45-ssc";
reg = <0xf0010000 0x4000>; reg = <0xf0010000 0x4000>;
interrupts = <28 4 5>; interrupts = <28 4 5>;
status = "disable"; status = "disabled";
}; };
tcb0: timer@f8008000 { tcb0: timer@f8008000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7