aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2013-11-22 08:49:52 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-12-09 05:10:12 -0500
commit0645b93f6c223b594c0dca348e2ae0a23bccf6e3 (patch)
tree5e9468ca749346b19f950a9d70e68e70b9d85129
parentc1463f68bf2b2a723d715898f89fd654865ab000 (diff)
ARM: at91: at91sam9g45: set default mmc pinctrl-names
pinctrl-names property was missing from mmc nodes. Cc: <stable@vger.kernel.org> #3.11+ Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index c2021d1f588c..4e20b447f3d9 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -654,6 +654,7 @@
654 compatible = "atmel,hsmci"; 654 compatible = "atmel,hsmci";
655 reg = <0xfff80000 0x600>; 655 reg = <0xfff80000 0x600>;
656 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>; 656 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
657 pinctrl-names = "default";
657 dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>; 658 dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
658 dma-names = "rxtx"; 659 dma-names = "rxtx";
659 #address-cells = <1>; 660 #address-cells = <1>;
@@ -665,6 +666,7 @@
665 compatible = "atmel,hsmci"; 666 compatible = "atmel,hsmci";
666 reg = <0xfffd0000 0x600>; 667 reg = <0xfffd0000 0x600>;
667 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>; 668 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
669 pinctrl-names = "default";
668 dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>; 670 dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
669 dma-names = "rxtx"; 671 dma-names = "rxtx";
670 #address-cells = <1>; 672 #address-cells = <1>;