shinys000114/kernel_common_drivers
1
0
Fork 0
mirror of https://github.com/hardkernel/kernel_common_drivers.git synced 2026-06-25 12:03:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

dtv_demod: support dtmb 6M BW (V3.5.026) [1/2]

Browse Source 
PD#SWPL-148081

Problem:
support dtmb 6M BW.

Solution:
support dtmb 6M BW.
AMLDTVDEMOD_VER "V3.5.026".

Verify:
T3 AR321.

Change-Id: I68e4d8c4976fad797affc204d15fea9cf5d3f06a
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
This commit is contained in:
nengwen.chen
2023-11-30 19:07:16 +08:00
committed by gerrit autosubmit
parent b530e1011c
commit b9be92e09f
4 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/dtv_demod/dtmb/dtmb_frontend.c
+2
View File
@@ -420,6 +420,8 @@ int gxtv_demod_dtmb_set_frontend(struct dvb_frontend *fe)
pr_err("wrong spectrum val get from tuner\n");
}
demod->demod_status.ch_bw = c->bandwidth_hz / 1000;
dtmb_set_ch(demod, &param);
return 0;
drivers/media/dtv_demod/dtmb/dtmb_func.c
+47 -7
View File
@@ -278,6 +278,7 @@ int check_dtmb_fec_lock(void)
status = 1;
else
status = 0;
return status;
}
@@ -452,6 +453,7 @@ int dtmb_bch_check(struct dvb_frontend *fe)
}
}
}
return 0;
}
@@ -487,6 +489,7 @@ int dtmb_check_fsm(void)
has_signal = 1;
}
}
return has_signal;
}
@@ -586,8 +589,10 @@ int dtmb_check_status_gxtv(struct dvb_frontend *fe)
dtmb_check_cci();
dtmb_bch_check(fe);
}
if (check_dtmb_fec_lock() == 1)
dtmb_write_reg(DTMB_TOP_CTRL_LOOP, 0xf);
return 0;
}
@@ -693,12 +698,10 @@ int dtmb_set_ch(struct aml_dtvdemod *demod,
struct aml_demod_dtmb *demod_dtmb)
{
int ret = 0;
u8 demod_mode;
u8 bw, sr, ifreq, agc_mode;
u32 ch_freq;
u8 demod_mode = 0;
u8 ifreq = 0, agc_mode = 0;
u32 ch_freq = 0;
bw = demod_dtmb->bw;
sr = demod_dtmb->sr;
ifreq = demod_dtmb->ifreq;
agc_mode = demod_dtmb->agc_mode;
ch_freq = demod_dtmb->ch_freq;
@@ -706,9 +709,47 @@ int dtmb_set_ch(struct aml_dtvdemod *demod,
demod->demod_status.ch_mode = demod_dtmb->mode; /* TODO */
demod->demod_status.agc_mode = agc_mode;
demod->demod_status.ch_freq = ch_freq;
demod->demod_status.ch_bw = (8 - bw) * 1000;
dtmb_initial(demod);
if (demod->demod_status.ch_bw == 6000) { // 6M BW
dtmb_write_reg(DTMB_FRONT_DDC_BYPASS, 0x006aaaab); //(0x25)
dtmb_write_reg(DTMB_FRONT_ACF_BYPASS, 0x1e81bc); //(0x2a)
dtmb_write_reg(DTMB_FRONT_COEF_SET1, 0x1450a9); //(0x2b)
dtmb_write_reg(DTMB_FRONT_COEF_SET2, 0x18); //(0x2c)
dtmb_write_reg(DTMB_FRONT_COEF_SET3, 0x3b7379); //(0x2d)
dtmb_write_reg(DTMB_FRONT_COEF_SET4, 0x1b0); //(0x2e)
dtmb_write_reg(DTMB_FRONT_COEF_SET5, 0x1e901f); //(0x2f)
dtmb_write_reg(DTMB_FRONT_COEF_SET6, 0x3c3617); //(0x30)
dtmb_write_reg(DTMB_FRONT_COEF_SET7, 0x71); //(0x31)
dtmb_write_reg(DTMB_FRONT_COEF_SET8, 0x59586a06); //(0x32)
dtmb_write_reg(DTMB_FRONT_COEF_SET9, 0x1b201400); //(0x33)
dtmb_write_reg(DTMB_FRONT_COEF_SET10, 0x2e272d); //(0x34)
dtmb_write_reg(DTMB_FRONT_COEF_SET11, 0x3d0c1411); //(0x35)
dtmb_write_reg(DTMB_FRONT_COEF_SET12, 0x06383031); //(0x36)
dtmb_write_reg(DTMB_FRONT_COEF_SET13, 0x39040d0e); //(0x37)
dtmb_write_reg(DTMB_FRONT_COEF_SET14, 0x81e17); //(0x38)
dtmb_write_reg(DTMB_FRONT_COEF_SET15, 0x14180007); //(0x39)
dtmb_write_reg(DTMB_FRONT_COEF_SET16, 0xa08021b); //(0x3a)
dtmb_write_reg(DTMB_FRONT_COEF_SET17, 0x18191d03); //(0x3b)
dtmb_write_reg(DTMB_FRONT_COEF_SET18, 0x663fcbc); //(0x3c)
dtmb_write_reg(DTMB_FRONT_COEF_SET19, 0x03442fee); //(0x3d)
dtmb_write_reg(DTMB_FRONT_SRC_CONFIG1, 0x1321dcc8); //(0x3e)
dtmb_write_reg(0x57, 0x0275025c); //(0x57)
dtmb_write_reg(0x58, 0x022f008c); //(0x58)
dtmb_write_reg(0x59, 0x0f2e00e2); //(0x59)
dtmb_write_reg(0x5a, 0x07935023); //(0x5a)
dtmb_write_reg(0x5b, 0x3c7b0a25); //(0x5b)
dtmb_write_reg(0x5c, 0x10ee0a32); //(0x5c)
dtmb_write_reg(0x5e, 0x042103b0); //(0x5e)
dtmb_write_reg(0x5f, 0x07ed038a); //(0x5f)
dtmb_write_reg(0x60, 0x07570347); //(0x60)
}
PR_DTMB("DTMB mode\n");
return ret;
}
@@ -833,7 +874,6 @@ unsigned int dtmb_detect_first(void)
//timeout = 1; /*FE_TIMEDOUT;*/
timeout = 0; /*FE_TIMEDOUT;*/
PR_DTMB("\t timeout\n");
} else {
/*timeout = 2; *//*have signal*/
PR_DTMB("\thave signal\n");
drivers/media/dtv_demod/include/amlfrontend.h
+3 -2
View File
@@ -150,6 +150,7 @@
/* V3.5.023 fix no timeout when dvbc signal is abnormal */
/* V3.5.024 fix dvbs diseqc timing */
/* V3.5.025 fix dvbc blind scan init issue */
/* V3.5.026 support dtmb 6M BW */
/****************************************************/
/****************************************************************/
/* AMLDTVDEMOD_VER Description: */
@@ -166,8 +167,8 @@
/*->The last four digits indicate the release time */
/****************************************************************/
#define KERNEL_4_9_EN 1
#define AMLDTVDEMOD_VER "V3.5.25"
#define DTVDEMOD_VER "2023/11/27: fix dvbc blind scan init issue"
#define AMLDTVDEMOD_VER "V3.5.26"
#define DTVDEMOD_VER "2023/11/30: support dtmb 6M BW"
#define AMLDTVDEMOD_T2_FW_VER "20231019_141000"
#define DEMOD_DEVICE_NAME "dtvdemod"
drivers/media/dtv_demod/include/demod_func.h
+1 -4
View File
@@ -748,13 +748,10 @@ int dvbc_blind_scan_process(struct aml_dtvdemod *demod);
#endif
/* dtmb */
#ifdef AML_DEMOD_SUPPORT_DTMB
int dtmb_set_ch(struct aml_dtvdemod *demod,
struct aml_demod_dtmb *demod_atsc);
struct aml_demod_dtmb *demod_dtmb);
void dtmb_reset(void);
int dtmb_check_status_gxtv(struct dvb_frontend *fe);
int dtmb_check_status_txl(struct dvb_frontend *fe);
int dtmb_bch_check(struct dvb_frontend *fe);