Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ste-ux500-samsung-skomer.dts

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index d6f6ac0..b50634c 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -108,15 +108,12 @@
                };
        };
 
-       /*
-        * FIXME: this is not quite GPIO backlight. This is a
-        * KTD253 one-wire GPIO-controlled backlight. It can
-        * work as a GPIO backlight.
-        */
-       gpio_bl: backlight {
-               compatible = "gpio-backlight";
+       ktd253: backlight {
+               compatible = "kinetic,ktd253";
                /* GPIO 69 */
-               gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+               /* Default to 13/32 brightness */
+               default-brightness = <13>;
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_backlight_default_mode>;
        };
@@ -396,7 +393,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&dsi_default_mode>;
 
-                       dsi-controller@a0351000 {
+                       dsi@a0351000 {
                                panel {
                                        /* NT35510-based Hydis HVA40WV1 */
                                        compatible = "hydis,hva40wv1", "novatek,nt35510";
@@ -409,7 +406,7 @@
                                        reset-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&display_default_mode>;
-                                       backlight = <&gpio_bl>;
+                                       backlight = <&ktd253>;
                                };
                        };
                };
@@ -436,6 +433,16 @@
                };
        };
 
+       /* The unused FBCLK needs to be pulled down on this machine */
+       sdi2 {
+               mc2_a_1_default {
+                       default_cfg2 {
+                               pins = "GPIO130_C8"; /* FBCLK */
+                               ste,config = <&in_pd>;
+                       };
+               };
+       };
+
        mcde {
                dsi_default_mode: dsi_default {
                        default_mux1 {