Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index a3a5c82..b6256a2 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@70000000 {
                reg = <0x70000000 0x4000000>;
        };
 
@@ -99,6 +99,7 @@
                                        &pinctrl_board_mmc0
                                        &pinctrl_mmc0_slot0_clk_cmd_dat0
                                        &pinctrl_mmc0_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -112,6 +113,7 @@
                                        &pinctrl_board_mmc1
                                        &pinctrl_mmc1_slot0_clk_cmd_dat0
                                        &pinctrl_mmc1_slot0_dat1_3>;
+                               pinctrl-names = "default";
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -313,27 +315,27 @@
                };
        };
 
-       leds {
+       led-controller-1 {
                compatible = "gpio-leds";
 
-               d8 {
+               led-1 {
                        label = "d8";
                        gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };
 
-       pwmleds {
+       led-controller-2 {
                compatible = "pwm-leds";
 
-               d6 {
+               led-2 {
                        label = "d6";
                        pwms = <&pwm0 3 5000 PWM_POLARITY_INVERTED>;
                        max-brightness = <255>;
                        linux,default-trigger = "nand-disk";
                };
 
-               d7 {
+               led-3 {
                        label = "d7";
                        pwms = <&pwm0 1 5000 PWM_POLARITY_INVERTED>;
                        max-brightness = <255>;