Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / motorola-mapphone-common.dtsi

diff --git a/arch/arm/boot/dts/motorola-mapphone-common.dtsi b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
index 70fc71cbb9457aa525ce898586a8fc6655776af4..5f8f77cfbe59f7b1a020d3d7b2eda2accb511942 100644 (file)
--- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
@@ -207,8 +207,9 @@
                };
        };
 
-       lcd0: display {
-               compatible = "panel-dsi-cm";
+       lcd0: panel@0 {
+               compatible = "motorola,droid4-panel", "panel-dsi-cm";
+               reg = <0>;
                label = "lcd0";
                vddi-supply = <&lcd_regulator>;
                reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;      /* gpio101 */
@@ -217,6 +218,7 @@
 
                width-mm = <50>;
                height-mm = <89>;
+               rotation = <90>;
 
                panel-timing {
                        clock-frequency = <0>;          /* Calculated by dsi */