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

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

diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index a9e6fee..614999d 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -138,7 +138,7 @@
                        };
 
                        shdwc@f8048010 {
-                               atmel,shdwc-debouncer = <976>;
+                               debounce-delay-us = <976>;
                                atmel,wakeup-rtc-timer;
 
                                input@0 {
@@ -224,8 +224,10 @@
                        adc: adc@fc030000 {
                                vddana-supply = <&vddana>;
                                vref-supply = <&advref>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_mikrobus1_an &pinctrl_mikrobus2_an>;
 
-                               status = "disabled";
+                               status = "okay";
                        };
 
                        pinctrl@fc038000 {