ARM: dts: at91: move mmc pinctrl-names property to board dts

Having the pinctrl-names property in the dtsi leads to dtbs_check warnings
when the board dts doesn't define pinctrl-0. Instead, move the property to
the board dts actually using the mmc node.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20200831171129.3886857-5-alexandre.belloni@bootlin.com

diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index c36d28c..6d7fc9c 100644 (file)
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -81,6 +81,7 @@
                                pinctrl-0 = <&pinctrl_mmc0_clk
                                             &pinctrl_mmc0_slot1_cmd_dat0
                                             &pinctrl_mmc0_slot1_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
 
                                slot@1 {

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index dbfefef..2ef39ec 100644 (file)
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -93,6 +93,7 @@
        pinctrl-0 = <
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {

diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
index 0267e72..2eb494f 100644 (file)
--- a/arch/arm/boot/dts/at91-ariettag25.dts
+++ b/arch/arm/boot/dts/at91-ariettag25.dts
@@ -48,6 +48,7 @@
        pinctrl-0 = <
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {

diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index feebd54..91e386d 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -112,6 +112,7 @@
                &pinctrl_board_mmc0
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {

diff --git a/arch/arm/boot/dts/at91-cosino_mega2560.dts b/arch/arm/boot/dts/at91-cosino_mega2560.dts
index 73e88d1..04cb7be 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino_mega2560.dts
+++ b/arch/arm/boot/dts/at91-cosino_mega2560.dts
@@ -34,6 +34,7 @@
        pinctrl-0 = <
                &pinctrl_mmc1_slot0_clk_cmd_dat0
                &pinctrl_mmc1_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {

diff --git a/arch/arm/boot/dts/at91-foxg20.dts b/arch/arm/boot/dts/at91-foxg20.dts
index 683b9e3..c0509c4 100644 (file)
--- a/arch/arm/boot/dts/at91-foxg20.dts
+++ b/arch/arm/boot/dts/at91-foxg20.dts
@@ -55,6 +55,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot1_cmd_dat0
                                        &pinctrl_mmc0_slot1_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
 
                                slot@1 {

diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
index a50b7fd..ee8525d 100644 (file)
--- a/arch/arm/boot/dts/at91-qil_a9260.dts
+++ b/arch/arm/boot/dts/at91-qil_a9260.dts
@@ -52,6 +52,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot0_cmd_dat0
                                        &pinctrl_mmc0_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91-sam9_l9260.dts b/arch/arm/boot/dts/at91-sam9_l9260.dts
index 954404e..f475c0b 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9_l9260.dts
+++ b/arch/arm/boot/dts/at91-sam9_l9260.dts
@@ -49,6 +49,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot1_cmd_dat0
                                        &pinctrl_mmc0_slot1_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
 
                                slot@1 {

diff --git a/arch/arm/boot/dts/at91-wb45n.dtsi b/arch/arm/boot/dts/at91-wb45n.dtsi
index ebe61a2..e3d9830 100644 (file)
--- a/arch/arm/boot/dts/at91-wb45n.dtsi
+++ b/arch/arm/boot/dts/at91-wb45n.dtsi
@@ -145,6 +145,7 @@
 };
 
 &mmc0 {
+       pinctrl-names = "default";
        pinctrl-0 = <
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 1724e14..0ea0aff 100644 (file)
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -173,7 +173,6 @@
                                clock-names = "mci_clk";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               pinctrl-names = "default";
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f6ac534..b07578f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -654,7 +654,6 @@
                                interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               pinctrl-names = "default";
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
                                clock-names = "mci_clk";
                                status = "disabled";

diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts
index 81f808a..657dc3a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/at91sam9260ek.dts
@@ -55,6 +55,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot1_cmd_dat0
                                        &pinctrl_mmc0_slot1_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@1 {
                                        reg = <1>;

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index a321c68..aea70a3 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -654,7 +654,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
                                interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
@@ -666,7 +665,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfff84000 0x600>;
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 62d2185..bf89cb2 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -72,6 +72,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot0_cmd_dat0
                                        &pinctrl_mmc0_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index bda2270..c656515 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -93,6 +93,7 @@
                                        &pinctrl_mmc0_clk
                                        &pinctrl_mmc0_slot1_cmd_dat0
                                        &pinctrl_mmc0_slot1_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@1 {
                                        reg = <1>;

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 984b529..1e1b749 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -875,7 +875,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
@@ -889,7 +888,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfffd0000 0x600>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index a3a5c82..09b2912 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -99,6 +99,7 @@
                                        &pinctrl_board_mmc0
                                        &pinctrl_mmc0_slot0_clk_cmd_dat0
                                        &pinctrl_mmc0_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -112,6 +113,7 @@
                                        &pinctrl_board_mmc1
                                        &pinctrl_mmc1_slot0_clk_cmd_dat0
                                        &pinctrl_mmc1_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index a5a1838..79076e4 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -651,7 +651,6 @@
                                interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
-                               pinctrl-names = "default";
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 12>;
                                clock-names = "mci_clk";
                                #address-cells = <1>;
@@ -665,7 +664,6 @@
                                interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
-                               pinctrl-names = "default";
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 26>;
                                clock-names = "mci_clk";
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index c934928..6d1264d 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -56,6 +56,7 @@
                &pinctrl_board_mmc0
                &pinctrl_mmc0_slot0_clk_cmd_dat0
                &pinctrl_mmc0_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {
@@ -70,6 +71,7 @@
                &pinctrl_board_mmc1
                &pinctrl_mmc1_slot0_clk_cmd_dat0
                &pinctrl_mmc1_slot0_dat1_3>;
+       pinctrl-names = "default";
        status = "okay";
 
        slot@0 {

diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index 4dfe0f1..f52f5ee 100644 (file)
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -68,6 +68,7 @@
                                        &pinctrl_board_mmc
                                        &pinctrl_mmc0_slot0_clk_cmd_dat0
                                        &pinctrl_mmc0_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;