cvbs: cvbsoutput support for tl1 [1/1]

PD#172587

Problem:
no cvbsoutput

Solution:
add cvbsoutput

Verify:
test pass on x301

Change-Id: I92f70d26e32f95de7c63ddbac9fe6664063c1902
Signed-off-by: Nian Jing <nian.jing@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
index 1aec5f120876500d6563ae5a825e8331f88ad912..b85fb747a9fe056dc678d8fced4444323e9a21bd 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
@@ -520,7 +520,6 @@
        tvafe {
                compatible = "amlogic, tvafe-tl1";
                /*memory-region = <&tvafe_cma_reserved>;*/
-               dev_name = "tvafe";
                status = "okay";
                flag_cma = <1>;/*1:share with codec_mm;0:cma alone*/
                cma_size = <5>;/*MByte*/
@@ -542,12 +541,51 @@
        vbi {
                compatible = "amlogic, vbi";
                memory-region = <&vbi_reserved>;
-               dev_name = "vbi";
                status = "okay";
                interrupts = <0 83 1>;
                reserve-iomap = "true";
        };
 
+       cvbsout {
+               compatible = "amlogic, cvbsout-tl1";
+               status = "disabled";
+               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";
+               /* clk path */
+               /* 0:vid_pll vid2_clk */
+               /* 1:gp0_pll vid2_clk */
+               /* 2:vid_pll vid1_clk */
+               /* 3:gp0_pll vid1_clk */
+               clk_path = <0>;
+
+               /* performance: reg_address, reg_value */
+               /* tl1 */
+               performance = <0x1bf0  0x9
+                       0x1b56  0x333
+                       0x1b12  0x8080
+                       0x1b05  0xfd
+                       0x1c59  0xf850
+                       0xffff  0x0>; /* ending flag */
+               performance_sarft = <0x1bf0  0x9
+                       0x1b56  0x333
+                       0x1b12  0x0
+                       0x1b05  0x9
+                       0x1c59  0xfc48
+                       0xffff  0x0>; /* ending flag */
+               performance_revB_telecom = <0x1bf0  0x9
+                       0x1b56  0x546
+                       0x1b12  0x8080
+                       0x1b05  0x9
+                       0x1c59  0xf850
+                       0xffff  0x0>; /* ending flag */
+       };
+
        unifykey {
                compatible = "amlogic, unifykey";
                status = "okay";

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
index 2d1d6163f798c379aba7ec4e3b99bf06cf9928a0..9eddb40622bc8b87175523af0cbe7bd7e114d205 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
@@ -524,7 +524,6 @@
        tvafe {
                compatible = "amlogic, tvafe-tl1";
                /*memory-region = <&tvafe_cma_reserved>;*/
-               dev_name = "tvafe";
                status = "okay";
                flag_cma = <1>;/*1:share with codec_mm;0:cma alone*/
                cma_size = <5>;/*MByte*/
@@ -546,12 +545,51 @@
        vbi {
                compatible = "amlogic, vbi";
                memory-region = <&vbi_reserved>;
-               dev_name = "vbi";
                status = "okay";
                interrupts = <0 83 1>;
                reserve-iomap = "true";
        };
 
+       cvbsout {
+               compatible = "amlogic, cvbsout-tl1";
+               status = "disabled";
+               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";
+               /* clk path */
+               /* 0:vid_pll vid2_clk */
+               /* 1:gp0_pll vid2_clk */
+               /* 2:vid_pll vid1_clk */
+               /* 3:gp0_pll vid1_clk */
+               clk_path = <0>;
+
+               /* performance: reg_address, reg_value */
+               /* tl1 */
+               performance = <0x1bf0  0x9
+                       0x1b56  0x333
+                       0x1b12  0x8080
+                       0x1b05  0xfd
+                       0x1c59  0xf850
+                       0xffff  0x0>; /* ending flag */
+               performance_sarft = <0x1bf0  0x9
+                       0x1b56  0x333
+                       0x1b12  0x0
+                       0x1b05  0x9
+                       0x1c59  0xfc48
+                       0xffff  0x0>; /* ending flag */
+               performance_revB_telecom = <0x1bf0  0x9
+                       0x1b56  0x546
+                       0x1b12  0x8080
+                       0x1b05  0x9
+                       0x1c59  0xf850
+                       0xffff  0x0>; /* ending flag */
+       };
+
        unifykey {
                compatible = "amlogic, unifykey";
                status = "okay";

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out.c b/drivers/amlogic/media/vout/cvbs/cvbs_out.c
index 49cf5a57ffb0403984be96e93e9223d4e093ac20..b43981b31b97e56f3dcbf3dc6483fbbeb4684e54 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_out.c
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_out.c
@@ -899,14 +899,16 @@ static void cvbs_performance_regs_dump(void)
                        cvbs_out_reg_read(performance_regs_enci[i]));
        }
        if (cvbs_cpu_type() == CVBS_CPU_TYPE_G12A ||
-               cvbs_cpu_type() == CVBS_CPU_TYPE_G12B)
+               cvbs_cpu_type() == CVBS_CPU_TYPE_G12B ||
+               cvbs_cpu_type() == CVBS_CPU_TYPE_TL1)
                size = sizeof(performance_regs_vdac_g12a)/sizeof(unsigned int);
        else
                size = sizeof(performance_regs_vdac)/sizeof(unsigned int);
        pr_info("------------------------\n");
        for (i = 0; i < size; i++) {
                if (cvbs_cpu_type() == CVBS_CPU_TYPE_G12A ||
-                       cvbs_cpu_type() == CVBS_CPU_TYPE_G12B)
+                       cvbs_cpu_type() == CVBS_CPU_TYPE_G12B ||
+                       cvbs_cpu_type() == CVBS_CPU_TYPE_TL1)
                        pr_info("hiu [0x%x] = 0x%x\n",
                        performance_regs_vdac_g12a[i],
                        cvbs_out_hiu_read(performance_regs_vdac_g12a[i]));
@@ -1204,8 +1206,9 @@ static void cvbs_debug_store(char *buf)
                break;
        case CMD_VP_SET_PLLPATH:
                if (cvbs_cpu_type() != CVBS_CPU_TYPE_G12A &&
-                       cvbs_cpu_type() != CVBS_CPU_TYPE_G12B) {
-                       print_info("ERR:Only g12a/b chip supported\n");
+                       cvbs_cpu_type() != CVBS_CPU_TYPE_G12B &&
+                       cvbs_cpu_type() != CVBS_CPU_TYPE_TL1) {
+                       print_info("ERR:Only after g12a/b chip supported\n");
                        break;
                }
                if (argc != 2) {
@@ -1444,6 +1447,12 @@ struct meson_cvbsout_data meson_g12b_cvbsout_data = {
        .name = "meson-g12b-cvbsout",
 };
 
+struct meson_cvbsout_data meson_tl1_cvbsout_data = {
+       .cntl0_val = 0x906001,
+       .cpu_id = CVBS_CPU_TYPE_TL1,
+       .name = "meson-tl1-cvbsout",
+};
+
 static const struct of_device_id meson_cvbsout_dt_match[] = {
        {
                .compatible = "amlogic, cvbsout-gxl",
@@ -1460,6 +1469,9 @@ static const struct of_device_id meson_cvbsout_dt_match[] = {
        }, {
                .compatible = "amlogic, cvbsout-g12b",
                .data           = &meson_g12b_cvbsout_data,
+       }, {
+               .compatible = "amlogic, cvbsout-tl1",
+               .data           = &meson_tl1_cvbsout_data,
        },
        {},
 };

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out.h b/drivers/amlogic/media/vout/cvbs/cvbs_out.h
index a73701b60fb13b92e59a74347c07ec33549bb00d..c931f952903d2c9dd8f8daf126ab1632ec80a5de 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_out.h
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_out.h
@@ -51,6 +51,7 @@ enum cvbs_cpu_type {
        CVBS_CPU_TYPE_TXLX   = 3,
        CVBS_CPU_TYPE_G12A   = 4,
        CVBS_CPU_TYPE_G12B   = 5,
+       CVBS_CPU_TYPE_TL1    = 6,
 };
 
 struct meson_cvbsout_data {

diff --git a/drivers/amlogic/media/vout/cvbs/cvbs_out_reg.h b/drivers/amlogic/media/vout/cvbs/cvbs_out_reg.h
index be66ef438f37dcd9e90630fc8e3f5ea11eb5124f..268d7dcaaeaf940e3b16f3a52ce1d3bd8e55f23d 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/cvbs_out_reg.h
+++ b/drivers/amlogic/media/vout/cvbs/cvbs_out_reg.h
@@ -126,6 +126,13 @@
 /*G12A*/
 #define HHI_HDMI_PLL_CNTL7                         0xce
 
+/* TL1 */
+#define HHI_TCON_PLL_CNTL0                         0x020
+#define HHI_TCON_PLL_CNTL1                         0x021
+#define HHI_TCON_PLL_CNTL2                         0x022
+#define HHI_TCON_PLL_CNTL3                         0x023
+#define HHI_TCON_PLL_CNTL4                         0x0df
+
 #define HHI_GP0_PLL_CNTL0                                                 0x10
 #define HHI_GP0_PLL_CNTL1                                                 0x11
 #define HHI_GP0_PLL_CNTL2                                                 0x12

diff --git a/drivers/amlogic/media/vout/cvbs/enc_clk_config.c b/drivers/amlogic/media/vout/cvbs/enc_clk_config.c
index 28b6fc871f5102d2f3de06333ad1cdb034e31560..297e24eaec30a71c85011ff58f7ba96bb07ee948 100644 (file)
--- a/drivers/amlogic/media/vout/cvbs/enc_clk_config.c
+++ b/drivers/amlogic/media/vout/cvbs/enc_clk_config.c
@@ -213,6 +213,27 @@ void set_vmode_clk(void)
                }
                if (ret)
                        pr_info("[error]:hdmi_pll lock failed\n");
+       } else if (cvbs_cpu_type() == CVBS_CPU_TYPE_TL1) {
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL0,  0x202f04f7);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL0,  0x302f04f7);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL1,  0x10110000);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL2,  0x00001108);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL3,  0x10051400);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL4,  0x010100c0);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL4,  0x038300c0);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL0,  0x342f04f7);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL0,  0x142f04f7);
+               udelay(100);
+               cvbs_out_hiu_write(HHI_TCON_PLL_CNTL2,  0x00003008);
+               udelay(100);
+               ret = pll_wait_lock(HHI_TCON_PLL_CNTL0, 31);
+               if (ret)
+                       pr_info("[error]:tl1 tcon_pll lock failed\n");
        } else {
                pr_info("config eqafter gxl hdmi pll\n");
                cvbs_out_hiu_write(HHI_HDMI_PLL_CNTL, 0x4000027b);
@@ -234,6 +255,11 @@ void set_vmode_clk(void)
                        cvbs_set_vid1_clk(cvbs_clk_path & 0x1);
                else
                        cvbs_set_vid2_clk(cvbs_clk_path & 0x1);
+       } else if (cvbs_cpu_type() == CVBS_CPU_TYPE_TL1) {
+               if (cvbs_clk_path & 0x2)
+                       cvbs_set_vid1_clk(0);
+               else
+                       cvbs_set_vid2_clk(0);
        } else {
                cvbs_set_vid2_clk(0);
        }