[alsa-devel] [PATCH] ASoC: atmel-ssc: change disable to disable in dts node
Change the value of status to disabled to keep the consistent
Signed-off-by: Bo Shen voice.shen@atmel.com --- arch/arm/boot/dts/at91sam9260.dtsi | 2 +- arch/arm/boot/dts/at91sam9263.dtsi | 4 ++-- arch/arm/boot/dts/at91sam9g45.dtsi | 4 ++-- 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 aaa42d8..03c56cb 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 3b721ee..15f12dd 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 acfa207..44a38d0 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 69667d0..0beff72 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 {
On Thu, Dec 13, 2012 at 10:05:07AM +0800, Bo Shen wrote:
Change the value of status to disabled to keep the consistent
Signed-off-by: Bo Shen voice.shen@atmel.com
Applied, thanks.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On 12/15/2012 03:51 PM, Mark Brown :
On Thu, Dec 13, 2012 at 10:05:07AM +0800, Bo Shen wrote:
Change the value of status to disabled to keep the consistent
Signed-off-by: Bo Shen voice.shen@atmel.com
Applied, thanks.
Hi Mark,
While rebasing this patch (for the other open question that we have about ssc pinctrl), I discovered that the subject of this patch is nonsense (same with the message, BTW).
So I rewrote the subject and comment and will submit a new patch series soon with this content included. So it will be good if you can replace this patch with the one in the series that I have just prepared.
As said in the other message, the new series is based on top of current Linus' git tree. In fact, the pinctrl related material is better merged now that the pinctrl tree for 3.8 is included in mainline.
I hope that it makes sense for you ;-)
Thanks for your patience Mark, bye, - -- Nicolas Ferre
participants (3)
-
Bo Shen -
Mark Brown -
Nicolas Ferre