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

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

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index edca66c..b1068cc 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;
@@ -648,7 +662,7 @@
 };
 
 &shutdown_controller {
-       atmel,shdwc-debouncer = <976>;
+       debounce-delay-us = <976>;
        status = "okay";
 
        input@0 {