Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / arch / arm / dts / stm32429i-eval.dts

diff --git a/arch/arm/dts/stm32429i-eval.dts b/arch/arm/dts/stm32429i-eval.dts
index 362ea42..592b182 100644 (file)
--- a/arch/arm/dts/stm32429i-eval.dts
+++ b/arch/arm/dts/stm32429i-eval.dts
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015, STMicroelectronics - All Rights Reserved
  * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -20,7 +19,8 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@00000000 {
+               device_type = "memory";
                reg = <0x00000000 0x2000000>;
        };
 
@@ -40,33 +40,40 @@
                dma-ranges = <0xc0000000 0x0 0x10000000>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
+       vdda: regulator-vdda {
+               compatible = "regulator-fixed";
+               regulator-name = "vdda";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
 
-               reg_vref: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vref";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-               };
+       vref: regulator-vref {
+               compatible = "regulator-fixed";
+               regulator-name = "vref";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
+       vdd_panel: vdd-panel {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_panel";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
        };
 
        leds {
                compatible = "gpio-leds";
-               green {
+               led-green {
                        gpios = <&gpiog 6 1>;
                        linux,default-trigger = "heartbeat";
                };
-               orange {
+               led-orange {
                        gpios = <&gpiog 7 1>;
                };
-               red {
+               led-red {
                        gpios = <&gpiog 10 1>;
                };
-               blue {
+               led-blue {
                        gpios = <&gpiog 12 1>;
                };
        };
@@ -97,6 +104,7 @@
 
        panel_rgb: panel-rgb {
                compatible = "ampire,am-480272h3tmqw-t01h";
+               power-supply = <&vdd_panel>;
                status = "okay";
                port {
                        panel_in_rgb: endpoint {
@@ -116,7 +124,8 @@
 &adc {
        pinctrl-names = "default";
        pinctrl-0 = <&adc3_in8_pin>;
-       vref-supply = <&reg_vref>;
+       vdda-supply = <&vdda>;
+       vref-supply = <&vref>;
        status = "okay";
        adc3: adc@200 {
                st,adc-channels = <8>;
@@ -190,9 +199,8 @@
 
 &ltdc {
        status = "okay";
-       pinctrl-0 = <&ltdc_pins>;
+       pinctrl-0 = <&ltdc_pins_a>;
        pinctrl-names = "default";
-       dma-ranges;
 
        port {
                ltdc_out_rgb: endpoint {
@@ -224,12 +232,12 @@
 &sdio {
        status = "okay";
        vmmc-supply = <&mmc_vcard>;
-       cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;
-       cd-inverted;
+       cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_LOW>;
        pinctrl-names = "default", "opendrain";
        pinctrl-0 = <&sdio_pins>;
        pinctrl-1 = <&sdio_pins_od>;
        bus-width = <4>;
+       max-frequency = <12500000>;
 };
 
 &timers1 {