Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

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

diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
index dfd150e..8ed58af 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
@@ -93,12 +93,12 @@
                                                        reg = <0x40000 0xc0000>;
                                                };
 
-                                               bootloaderenvred@0x100000 {
+                                               bootloaderenvred@100000 {
                                                        label = "bootloader env redundant";
                                                        reg = <0x100000 0x40000>;
                                                };
 
-                                               bootloaderenv@0x140000 {
+                                               bootloaderenv@140000 {
                                                        label = "bootloader env";
                                                        reg = <0x140000 0x40000>;
                                                };
@@ -203,7 +203,7 @@
                        };
 
                        shdwc@f8048010 {
-                               atmel,shdwc-debouncer = <976>;
+                               debounce-delay-us = <976>;
 
                                input@0 {
                                        reg = <0>;