Merge tag 'xtensa-20210902' of git://github.com/jcmvbkbc/linux-xtensa

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp15xx-dhcom-pdk2.dtsi

diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
index c5ea08f..fbf3826 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
@@ -29,6 +29,7 @@
                brightness-levels = <0 16 22 30 40 55 75 102 138 188 255>;
                default-brightness-level = <8>;
                enable-gpios = <&gpioi 0 GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_panel_bl>;
                status = "okay";
        };
 
@@ -37,7 +38,7 @@
                poll-interval = <20>;
 
                /*
-                * The EXTi IRQ line 3 is shared with touchscreen and ethernet,
+                * The EXTi IRQ line 3 is shared with ethernet,
                 * so mark this as polled GPIO key.
                 */
                button-0 {
@@ -46,6 +47,16 @@
                        gpios = <&gpiof 3 GPIO_ACTIVE_LOW>;
                };
 
+               /*
+                * The EXTi IRQ line 6 is shared with touchscreen,
+                * so mark this as polled GPIO key.
+                */
+               button-1 {
+                       label = "TA2-GPIO-B";
+                       linux,code = <KEY_B>;
+                       gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
+               };
+
                /*
                 * The EXTi IRQ line 0 is shared with PMIC,
                 * so mark this as polled GPIO key.
@@ -60,13 +71,6 @@
        gpio-keys {
                compatible = "gpio-keys";
 
-               button-1 {
-                       label = "TA2-GPIO-B";
-                       linux,code = <KEY_B>;
-                       gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
-                       wakeup-source;
-               };
-
                button-3 {
                        label = "TA4-GPIO-D";
                        linux,code = <KEY_D>;
@@ -82,6 +86,7 @@
                        label = "green:led5";
                        gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
+                       status = "disabled";
                };
 
                led-1 {
@@ -106,6 +111,7 @@
        panel {
                compatible = "edt,etm0700g0edh6";
                backlight = <&display_bl>;
+               power-supply = <&reg_panel_bl>;
 
                port {
                        lcd_panel_in: endpoint {
@@ -114,6 +120,21 @@
                };
        };
 
+       reg_panel_bl: regulator-panel-bl {
+               compatible = "regulator-fixed";
+               regulator-name = "panel_backlight";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&reg_panel_supply>;
+       };
+
+       reg_panel_supply: regulator-panel-supply {
+               compatible = "regulator-fixed";
+               regulator-name = "panel_supply";
+               regulator-min-microvolt = <24000000>;
+               regulator-max-microvolt = <24000000>;
+       };
+
        sound {
                compatible = "audio-graph-card";
                routing =
@@ -168,15 +189,15 @@
                        sgtl5000_tx_endpoint: endpoint@0 {
                                reg = <0>;
                                remote-endpoint = <&sai2a_endpoint>;
-                               frame-master;
-                               bitclock-master;
+                               frame-master = <&sgtl5000_tx_endpoint>;
+                               bitclock-master = <&sgtl5000_tx_endpoint>;
                        };
 
                        sgtl5000_rx_endpoint: endpoint@1 {
                                reg = <1>;
                                remote-endpoint = <&sai2b_endpoint>;
-                               frame-master;
-                               bitclock-master;
+                               frame-master = <&sgtl5000_rx_endpoint>;
+                               bitclock-master = <&sgtl5000_rx_endpoint>;
                        };
                };
 
@@ -185,8 +206,8 @@
        touchscreen@38 {
                compatible = "edt,edt-ft5406";
                reg = <0x38>;
-               interrupt-parent = <&gpiog>;
-               interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
+               interrupt-parent = <&gpioc>;
+               interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
        };
 };