Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[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 27722c4..b50634c 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -393,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";
@@ -433,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 {