ARM: tegra: nexus7: Use common LVDS display device-tree

Make Nexus 7 device-tree to use common LVDS bridge description. This makes
device-trees more consistent.

[digetx@gmail.com: factored Nexus7 change into separate patch and wrote commit message]

Signed-off-by: Maxim Schwalm <maxim.schwalm@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index ab33ceb63fffb644364a6dd72cccbc69eb0a4d2c..d79a99470ac2082a3322c2935d94f6580633406d 100644 (file)
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -8,6 +8,7 @@
 #include "tegra30.dtsi"
 #include "tegra30-cpu-opp.dtsi"
 #include "tegra30-cpu-opp-microvolt.dtsi"
+#include "tegra30-asus-lvds-display.dtsi"
 
 / {
        aliases {
@@ -59,21 +60,6 @@
                };
        };
 
-       host1x@50000000 {
-               dc@54200000 {
-                       rgb {
-                               status = "okay";
-
-                               port@0 {
-                                       lcd_output: endpoint {
-                                               remote-endpoint = <&lvds_encoder_input>;
-                                               bus-width = <24>;
-                                       };
-                               };
-                       };
-               };
-       };
-
        gpio@6000d000 {
                init-mode-hog {
                        gpio-hog;
@@ -1116,20 +1102,14 @@
                 */
                compatible = "panel-lvds";
 
-               power-supply = <&vdd_pnl>;
-               backlight = <&backlight>;
-
                width-mm = <94>;
                height-mm = <150>;
                rotation = <180>;
 
                data-mapping = "jeida-24";
 
-               port {
-                       panel_input: endpoint {
-                               remote-endpoint = <&lvds_encoder_output>;
-                       };
-               };
+               /* DDC unconnected on Nexus 7 */
+               /delete-property/ ddc-i2c-bus;
        };
 
        firmware {
@@ -1181,34 +1161,6 @@
                };
        };
 
-       lvds-encoder {
-               compatible = "ti,sn75lvds83", "lvds-encoder";
-
-               powerdown-gpios = <&gpio TEGRA_GPIO(N, 6) GPIO_ACTIVE_LOW>;
-               power-supply = <&vdd_3v3_sys>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-
-                               lvds_encoder_input: endpoint {
-                                       remote-endpoint = <&lcd_output>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-
-                               lvds_encoder_output: endpoint {
-                                       remote-endpoint = <&panel_input>;
-                               };
-                       };
-               };
-       };
-
        vdd_5v0_sys: regulator-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "vdd_5v0";