Upgrade HTC One X device tree to comply possible upstream Linux device
tree. Once Linux catches up, HTC One X can be switched to OF_UPSTREAM.

Signed-off-by: Svyatoslav Ryhel <[email protected]>
---
 arch/arm/dts/tegra30-htc-endeavoru.dts | 17 ++++-------------
 configs/endeavoru_defconfig            |  1 +
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/arm/dts/tegra30-htc-endeavoru.dts 
b/arch/arm/dts/tegra30-htc-endeavoru.dts
index 8a0ba3c07cc..db8ac457880 100644
--- a/arch/arm/dts/tegra30-htc-endeavoru.dts
+++ b/arch/arm/dts/tegra30-htc-endeavoru.dts
@@ -33,13 +33,11 @@
 
        host1x@50000000 {
                dc@54200000 {
-                       clocks = <&tegra_car TEGRA30_CLK_DISP1>,
-                                <&tegra_car TEGRA30_CLK_PLL_D_OUT0>;
+                       backlight: backlight {
+                               compatible = "nvidia,tegra-pwm-backlight";
 
-                       rgb {
-                               status = "okay";
-
-                               nvidia,panel = <&dsia>;
+                               nvidia,pwm-source = <1>;
+                               nvidia,default-brightness = <0x8E>;
                        };
                };
 
@@ -1265,13 +1263,6 @@
                nvidia,xcvr-lsrslew = <2>;
        };
 
-       backlight: backlight {
-               compatible = "nvidia,tegra-pwm-backlight";
-
-               nvidia,pwm-source = <1>;
-               nvidia,default-brightness = <0x8E>;
-       };
-
        /* PMIC has a built-in 32KHz oscillator which is used by PMC */
        clk32k_in: clock-32k {
                compatible = "fixed-clock";
diff --git a/configs/endeavoru_defconfig b/configs/endeavoru_defconfig
index cc8777e4d83..a1c11c6435f 100644
--- a/configs/endeavoru_defconfig
+++ b/configs/endeavoru_defconfig
@@ -79,6 +79,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0bb4
 CONFIG_USB_GADGET_PRODUCT_NUM=0x0c02
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
+CONFIG_VIDEO_BRIDGE=y
 # CONFIG_VIDEO_LOGO is not set
 CONFIG_VIDEO_LCD_ENDEAVORU=y
 CONFIG_VIDEO_DSI_TEGRA30=y
-- 
2.43.0

Reply via email to