projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c6f2253)
tvafe: meson: add support for txl
authorNian Jing <nian.jing@amlogic.com>
Wed, 27 Jun 2018 08:18:02 +0000 (16:18 +0800)
committerYixun Lan <yixun.lan@amlogic.com>
Wed, 18 Jul 2018 09:50:01 +0000 (02:50 -0700)
PD#168480:tvafe: meson: add support for txl

Add atv/avin function for txl.

Change-Id: I1e9727b2578a19a31436ae5cbe924b4311deae9d
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
drivers/amlogic/media/vout/vdac/vdac_dev.c patch | blob | blame | history

diff --git a/drivers/amlogic/media/vout/vdac/vdac_dev.c b/drivers/amlogic/media/vout/vdac/vdac_dev.c
index fbb202decff55f64438372b749606341e7c6e691..38f346fa34379bef5bd232f18a431684bff99442 100644 (file)
--- a/drivers/amlogic/media/vout/vdac/vdac_dev.c
+++ b/drivers/amlogic/media/vout/vdac/vdac_dev.c
@@ -152,7 +152,7 @@ void ana_ref_cntl0_bit9(bool on, unsigned int module_sel)
                        vdac_cntl0_bit9 &= ~VDAC_MODULE_CVBS_OUT;
                break;
        case VDAC_MODULE_AUDIO_OUT: /* audio out ctrl*/
-               if (is_meson_txlx_cpu()) {
+               if (is_meson_txl_cpu() || is_meson_txlx_cpu()) {
                        if (on)
                                vdac_cntl0_bit9 |= VDAC_MODULE_AUDIO_OUT;
                        else
@@ -170,7 +170,7 @@ void ana_ref_cntl0_bit9(bool on, unsigned int module_sel)
        else
                enable = 1;
 
-       if (is_meson_txlx_cpu())
+       if (is_meson_txl_cpu() || is_meson_txlx_cpu())
                vdac_hiu_reg_setb(HHI_VDAC_CNTL0, enable, 9, 1);
        else if (is_meson_g12a_cpu() ||
                        is_meson_g12b_cpu())
@@ -324,7 +324,7 @@ void vdac_out_cntl1_bit3(bool on, unsigned int module_sel)
        else
                enable = 1;
 
-       if (is_meson_txlx_cpu())
+       if (is_meson_txl_cpu() || is_meson_txlx_cpu())
                vdac_hiu_reg_setb(HHI_VDAC_CNTL1, enable, 3, 1);
        else
                vdac_hiu_reg_setb(HHI_VDAC_CNTL1, ~enable, 3, 1);
@@ -466,7 +466,7 @@ void vdac_enable(bool on, unsigned int module_sel)
                }
                break;
        case VDAC_MODULE_AUDIO_OUT: /* audio demod */
-               if (is_meson_txlx_cpu()) {
+               if (is_meson_txl_cpu() || is_meson_txlx_cpu()) {
                        if (on)
                                ana_ref_cntl0_bit9(1, VDAC_MODULE_AUDIO_OUT);
                        else