ARM: dts: at91: add pinctrl-{names, 0} for all gpios

Add pinctrl-names and pinctrl-0 properties on controllers that claims to
use pins to avoid failures due to
commit 2ab73c6d8323 ("gpio: Support GPIO controllers without pin-ranges")
and also to avoid using pins that may be claimed my other IPs.

Fixes: b7c2b6157079 ("ARM: at91: add Atmel's SAMA5D3 Xplained board")
Fixes: 1e5f532c2737 ("ARM: dts: at91: sam9x60: add device tree for soc and board")
Fixes: 38153a017896 ("ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210727074006.1609989-1-claudiu.beznea@microchip.com
Cc: <stable@vger.kernel.org> # v5.7+

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index edca66c..ebbc9b2 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -92,6 +92,8 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
                status = "okay"; /* Conflict with pwm0. */
 
                red {
@@ -537,6 +539,10 @@
                                 AT91_PIOA 19 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA19 DAT2 periph A with pullup */
                                 AT91_PIOA 20 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;   /* PA20 DAT3 periph A with pullup */
                };
+               pinctrl_sdmmc0_cd: sdmmc0_cd {
+                       atmel,pins =
+                               <AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
        };
 
        sdmmc1 {
@@ -569,6 +575,14 @@
                                      AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
                };
        };
+
+       leds {
+               pinctrl_gpio_leds: gpio_leds {
+                       atmel,pins = <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                     AT91_PIOB 12 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                     AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
 }; /* pinctrl */
 
 &pwm0 {
@@ -580,7 +594,7 @@
 &sdmmc0 {
        bus-width = <4>;
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sdmmc0_default>;
+       pinctrl-0 = <&pinctrl_sdmmc0_default &pinctrl_sdmmc0_cd>;
        status = "okay";
        cd-gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
        disable-wp;

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 9c55a92..cc55d16 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -57,6 +57,8 @@
                        };
 
                        spi0: spi@f0004000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi0_cs>;
                                cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
                                status = "okay";
                        };
@@ -169,6 +171,8 @@
                        };
 
                        spi1: spi@f8008000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi1_cs>;
                                cs-gpios = <&pioC 25 0>;
                                status = "okay";
                        };
@@ -248,6 +252,26 @@
                                                        <AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
                                                         AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
                                        };
+
+                                       pinctrl_gpio_leds: gpio_leds_default {
+                                               atmel,pins =
+                                                       <AT91_PIOE 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                                        AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
+
+                                       pinctrl_spi0_cs: spi0_cs_default {
+                                               atmel,pins =
+                                                       <AT91_PIOD 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                                        AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
+
+                                       pinctrl_spi1_cs: spi1_cs_default {
+                                               atmel,pins = <AT91_PIOC 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
+
+                                       pinctrl_vcc_mmc0_reg_gpio: vcc_mmc0_reg_gpio_default {
+                                               atmel,pins = <AT91_PIOE 2 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
                                };
                        };
                };
@@ -339,6 +363,8 @@
 
        vcc_mmc0_reg: fixedregulator_mmc0 {
                compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_vcc_mmc0_reg_gpio>;
                gpio = <&pioE 2 GPIO_ACTIVE_LOW>;
                regulator-name = "mmc0-card-supply";
                regulator-min-microvolt = <3300000>;
@@ -362,6 +388,9 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
+               status = "okay";
 
                d2 {
                        label = "d2";

diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 046796c..541779a 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -80,6 +80,8 @@
                        };
 
                        spi1: spi@fc018000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi0_cs>;
                                cs-gpios = <&pioB 21 0>;
                                status = "okay";
                        };
@@ -137,6 +139,19 @@
                                                atmel,pins =
                                                        <AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
                                        };
+                                       pinctrl_spi0_cs: spi0_cs_default {
+                                               atmel,pins =
+                                                       <AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
+                                       pinctrl_gpio_leds: gpio_leds_default {
+                                               atmel,pins =
+                                                       <AT91_PIOD 30 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                                        AT91_PIOE 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
+                                       pinctrl_vcc_mmc1_reg: vcc_mmc1_reg {
+                                               atmel,pins =
+                                                       <AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+                                       };
                                };
                        };
                };
@@ -242,6 +257,8 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
                status = "okay";
 
                d8 {
@@ -268,6 +285,8 @@
 
        vcc_mmc1_reg: fixedregulator_mmc1 {
                compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_vcc_mmc1_reg>;
                gpio = <&pioE 4 GPIO_ACTIVE_LOW>;
                regulator-name = "VDD MCI1";
                regulator-min-microvolt = <3300000>;