Merge tag 'docs-5.15' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91-sama5d3_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 9c55a92..d72c042 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";
@@ -370,7 +399,7 @@
                };
 
                d3 {
-                       label = "d3";
+                       label = "d3"; /* Conflict with EBI CS0, USART2 CTS. */
                        gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
                };
        };