dtv_demod: modified dtv demod

PD#165971: dtv_demod: modified dtv demod 1. change folder name(amldemod ->dtv_demod); 2. set status 0 when not support; Change-Id: I96c23b0b333ee0967d5013ebc8915fdffa097433 Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
2026-06-08 20:07:46 +09:00 · 2018-05-10 19:18:01 +08:00
parent be86cef171
commit ad89d594a7
29 changed files with 37 additions and 44 deletions
--- a/10
+++ b/10
@@ -14444,8 +14444,10 @@ F:	drivers/amlogic/media/vout/backlight/aml_ldim/iw7027_bl.h
 AMLOGIC DTV DEMOD DRIVER
 M:      Jihong Sui <jihong.sui@amlogic.com>
 F:      include/uapi/linux/dvb/aml_demod.h
-F:      drivers/amlogic/media/aml_demod/*
+F:      drivers/amlogic/media/amldemod/*
+
+AMLOGIC DTV DEMOD DRIVER
+M:      Jihong Sui <jihong.sui@amlogic.com>
+F:      drivers/amlogic/media/amldemod/*
+F:      drivers/amlogic/media/dtv_demod/*

-AMLOGIC DEBUG
-M: Jianxin Pan <jianxin.pan@amlogic.com>
-F:  drivers/amlogic/debug/
--- a/drivers/amlogic/media/Kconfig
+++ b/drivers/amlogic/media/Kconfig
@@ -53,5 +53,5 @@ source "drivers/amlogic/media/vin/Kconfig"
 source "drivers/amlogic/media/video_processor/Kconfig"
 source "drivers/amlogic/media/enhancement/Kconfig"
 endif
-source "drivers/amlogic/media/amldemod/Kconfig"
+source "drivers/amlogic/media/dtv_demod/Kconfig"
 endmenu
--- a/drivers/amlogic/media/Makefile
+++ b/drivers/amlogic/media/Makefile
@@ -8,4 +8,4 @@ obj-$(CONFIG_AMLOGIC_MEDIA_DEINTERLACE)	+=	deinterlace/
 obj-$(CONFIG_AMLOGIC_MEDIA_VIN)		+=	vin/
 obj-$(CONFIG_AMLOGIC_MEDIA_VIDEO_PROCESSOR)	+=	video_processor/
 obj-$(CONFIG_AMLOGIC_MEDIA_ENHANCEMENT) += enhancement/
-obj-$(CONFIG_AMLOGIC_DTV_DEMOD) += amldemod/
+obj-$(CONFIG_AMLOGIC_DTV_DEMOD) += dtv_demod/
--- a/drivers/amlogic/media/dtv_demod/Kconfig
+++ b/drivers/amlogic/media/dtv_demod/Kconfig
--- a/drivers/amlogic/media/dtv_demod/Makefile
+++ b/drivers/amlogic/media/dtv_demod/Makefile
@@ -12,7 +12,7 @@ dtvdemod-objs	+= aml_demod.o

 ccflags-y += -I.
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -Idrivers/amlogic/media/amldemod/include
+ccflags-y += -Idrivers/amlogic/media/dtv_demod/include
 #ccflags-y += -I./include
 #ccflags-y += -Idrivers/amlogic/dvb_tv/
 ccflags-y += -DDVB_CORE_ORI=1 -DDVB_49=1 -DDEBUG
--- a/drivers/amlogic/media/dtv_demod/aml_demod.c
+++ b/drivers/amlogic/media/dtv_demod/aml_demod.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/aml_demod.c
+ * drivers/amlogic/media/dtv_demod/aml_demod.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/amlfrontend.c
+++ b/drivers/amlogic/media/dtv_demod/amlfrontend.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/amlfrontend.c
+ * drivers/amlogic/media/dtv_demod/amlfrontend.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
@@ -1425,18 +1425,7 @@ static int gxtv_demod_atsc_read_status
 	if (aml_demod_debug & DBG_ATSC) {
 		if ((dbg_lst_status != s) || (last_lock != ilock)) {
 			/* check tuner */
-			/*dvbfe = aml_get_fe();*//*get_si2177_tuner();*/
-			/*if (dvbfe != NULL) {*/
-#if 0
-				if (dvbfe->ops.tuner_ops.get_strength) {
-					strength =
-				dvbfe->ops.tuner_ops.get_strength(dvbfe);
-				}
-#else
-				strength = tuner_get_ch_power2();
-#endif
-			/*	strength -= 100;*/
-			/*}*/
+			strength = tuner_get_ch_power2();

 			PR_ATSC("s=%d(1 is lock),lock=%d\n", s, ilock);
 			PR_ATSC("[rsj_test]freq[%d] strength[%d]\n",
@@ -3847,10 +3836,12 @@ static int aml_dtvdm_tune(struct dvb_frontend *fe, bool re_tune,

 	if (nmode == AM_FE_UNKNOWN_N) {
 		*delay = HZ * 5;
+		*status = 0;
 		return 0;
 	}
 	if (is_not_active(fe)) {
-		PR_DBG("tune :not active\n");
+		*status = 0;
+		PR_DBGL("tune :not active\n");
 		return 0;
 	}

--- a/drivers/amlogic/media/dtv_demod/atsc_func.c
+++ b/drivers/amlogic/media/dtv_demod/atsc_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/atsc_func.c
+ * drivers/amlogic/media/dtv_demod/atsc_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/demod_func.c
+++ b/drivers/amlogic/media/dtv_demod/demod_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/demod_func.c
+ * drivers/amlogic/media/dtv_demod/demod_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/dtmb_func.c
+++ b/drivers/amlogic/media/dtv_demod/dtmb_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dtmb_func.c
+ * drivers/amlogic/media/dtv_demod/dtmb_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/dvbc_func.c
+++ b/drivers/amlogic/media/dtv_demod/dvbc_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_func.c
+ * drivers/amlogic/media/dtv_demod/dvbc_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/dvbc_v2.c
+++ b/drivers/amlogic/media/dtv_demod/dvbc_v2.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_v2.c
+ * drivers/amlogic/media/dtv_demod/dvbc_v2.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/dvbc_v3.c
+++ b/drivers/amlogic/media/dtv_demod/dvbc_v3.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_v3.c
+ * drivers/amlogic/media/dtv_demod/dvbc_v3.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/dvbt_v2.c
+++ b/drivers/amlogic/media/dtv_demod/dvbt_v2.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbt_v2.c
+ * drivers/amlogic/media/dtv_demod/dvbt_v2.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/i2c_func.c
+++ b/drivers/amlogic/media/dtv_demod/i2c_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/i2c_func.c
+ * drivers/amlogic/media/dtv_demod/i2c_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h
+++ b/drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/acf_filter_coefficient.h
+ * drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_che.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_che_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_front.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_front_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_sync.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_sync_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_top.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h
+++ b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_top_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/amlfrontend.h
+++ b/drivers/amlogic/media/dtv_demod/include/amlfrontend.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/amlfrontend.h
+ * drivers/amlogic/media/dtv_demod/include/amlfrontend.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/atsc_func.h
+++ b/drivers/amlogic/media/dtv_demod/include/atsc_func.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/atsc_func.h
+ * drivers/amlogic/media/dtv_demod/include/atsc_func.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/demod_func.h
+++ b/drivers/amlogic/media/dtv_demod/include/demod_func.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/demod_func.h
+ * drivers/amlogic/media/dtv_demod/include/demod_func.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/include/depend.h
+++ b/drivers/amlogic/media/dtv_demod/include/depend.h
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/depend.h
+ * drivers/amlogic/media/dtv_demod/include/depend.h
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *
--- a/drivers/amlogic/media/dtv_demod/tuner_func.c
+++ b/drivers/amlogic/media/dtv_demod/tuner_func.c
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/tuner_func.c
+ * drivers/amlogic/media/dtv_demod/tuner_func.c
 *
 * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
 *