p241: dts: fix cvbsout & vdac config mistake

PD#161357: p241: dts: fix cvbsout & vdac config mistake

Change-Id: Iff6c1ec0aec505a0e93ba2302a3c9ee419b23de5
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
index 3b5705c..0e0f128 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts
@@ -637,14 +637,6 @@
                compatible = "amlogic, vdac";
                dev_name = "vdac";
                status = "okay";
-               clocks = <&clkc CLKID_DAC_CLK>;
-               clock-names = "vdac_clk";
-       };
-
-       vdac {
-               compatible = "amlogic, vdac";
-               dev_name = "vdac";
-               status = "okay";
        };
 
        cvbsout {

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
index 941676a..a6bef3e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts
@@ -635,10 +635,33 @@
                fr_auto_policy = <0>;
        };
 
+       vdac {
+               compatible = "amlogic, vdac";
+               dev_name = "vdac";
+               status = "okay";
+       };
+
        cvbsout {
-               compatible = "amlogic, cvbsout";
+               compatible = "amlogic, cvbsout-gxl";
                dev_name = "cvbsout";
                status = "okay";
+               clocks = <&clkc CLKID_VCLK2_ENCI
+                       &clkc CLKID_VCLK2_VENCI0
+                       &clkc CLKID_VCLK2_VENCI1
+                       &clkc CLKID_DAC_CLK>;
+               clock-names = "venci_top_gate",
+                       "venci_0_gate",
+                       "venci_1_gate",
+                       "vdac_clk_gate";
+
+               /* performance: reg_address, reg_value */
+               /* s805x */
+               performance = <0x1bf0  0x9
+                       0x1b56  0x343
+                       0x1b12  0x8080
+                       0x1b05  0xfd
+                       0x1c59  0xf752
+                       0xffff  0x0>; /* ending flag */
        };
 
        amhdmitx: amhdmitx{

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
index 5f83315..00cda74 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts
@@ -633,10 +633,33 @@
                fr_auto_policy = <0>;
        };
 
+       vdac {
+               compatible = "amlogic, vdac";
+               dev_name = "vdac";
+               status = "okay";
+       };
+
        cvbsout {
-               compatible = "amlogic, cvbsout";
+               compatible = "amlogic, cvbsout-gxl";
                dev_name = "cvbsout";
                status = "okay";
+               clocks = <&clkc CLKID_VCLK2_ENCI
+                       &clkc CLKID_VCLK2_VENCI0
+                       &clkc CLKID_VCLK2_VENCI1
+                       &clkc CLKID_DAC_CLK>;
+               clock-names = "venci_top_gate",
+                       "venci_0_gate",
+                       "venci_1_gate",
+                       "vdac_clk_gate";
+
+               /* performance: reg_address, reg_value */
+               /* s805x */
+               performance = <0x1bf0  0x9
+                       0x1b56  0x343
+                       0x1b12  0x8080
+                       0x1b05  0xfd
+                       0x1c59  0xf752
+                       0xffff  0x0>; /* ending flag */
        };
 
        amhdmitx: amhdmitx{