diff --git a/MAINTAINERS b/MAINTAINERS index a818a8a619b4..aade51050546 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14444,8 +14444,10 @@ F: drivers/amlogic/media/vout/backlight/aml_ldim/iw7027_bl.h AMLOGIC DTV DEMOD DRIVER M: Jihong Sui 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 +F: drivers/amlogic/media/amldemod/* +F: drivers/amlogic/media/dtv_demod/* -AMLOGIC DEBUG -M: Jianxin Pan -F: drivers/amlogic/debug/ diff --git a/drivers/amlogic/media/Kconfig b/drivers/amlogic/media/Kconfig index 1c7758f16726..5071b501dbd7 100644 --- 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 diff --git a/drivers/amlogic/media/Makefile b/drivers/amlogic/media/Makefile index e22a9330877a..9702f1b7a6f3 100644 --- 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/ diff --git a/drivers/amlogic/media/amldemod/Kconfig b/drivers/amlogic/media/dtv_demod/Kconfig similarity index 100% rename from drivers/amlogic/media/amldemod/Kconfig rename to drivers/amlogic/media/dtv_demod/Kconfig diff --git a/drivers/amlogic/media/amldemod/Makefile b/drivers/amlogic/media/dtv_demod/Makefile similarity index 89% rename from drivers/amlogic/media/amldemod/Makefile rename to drivers/amlogic/media/dtv_demod/Makefile index 272531f76ef1..4d75e206cb09 100644 --- a/drivers/amlogic/media/amldemod/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 diff --git a/drivers/amlogic/media/amldemod/aml_demod.c b/drivers/amlogic/media/dtv_demod/aml_demod.c similarity index 99% rename from drivers/amlogic/media/amldemod/aml_demod.c rename to drivers/amlogic/media/dtv_demod/aml_demod.c index c9cf7f1b764d..6f0e0e41d1f2 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/amlfrontend.c b/drivers/amlogic/media/dtv_demod/amlfrontend.c similarity index 99% rename from drivers/amlogic/media/amldemod/amlfrontend.c rename to drivers/amlogic/media/dtv_demod/amlfrontend.c index 238321b180d1..3566abd3ac74 100644 --- a/drivers/amlogic/media/amldemod/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; } diff --git a/drivers/amlogic/media/amldemod/atsc_func.c b/drivers/amlogic/media/dtv_demod/atsc_func.c similarity index 99% rename from drivers/amlogic/media/amldemod/atsc_func.c rename to drivers/amlogic/media/dtv_demod/atsc_func.c index e2d4fefa4cbe..e7d2762c51ea 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/demod_func.c b/drivers/amlogic/media/dtv_demod/demod_func.c similarity index 99% rename from drivers/amlogic/media/amldemod/demod_func.c rename to drivers/amlogic/media/dtv_demod/demod_func.c index fe0acc6e13c6..0e6249ff0385 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/dtmb_func.c b/drivers/amlogic/media/dtv_demod/dtmb_func.c similarity index 99% rename from drivers/amlogic/media/amldemod/dtmb_func.c rename to drivers/amlogic/media/dtv_demod/dtmb_func.c index efb0b7d8eb77..024f3b746ef6 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/dvbc_func.c b/drivers/amlogic/media/dtv_demod/dvbc_func.c similarity index 99% rename from drivers/amlogic/media/amldemod/dvbc_func.c rename to drivers/amlogic/media/dtv_demod/dvbc_func.c index 95fbda623362..a31725f41680 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/dvbc_v2.c b/drivers/amlogic/media/dtv_demod/dvbc_v2.c similarity index 99% rename from drivers/amlogic/media/amldemod/dvbc_v2.c rename to drivers/amlogic/media/dtv_demod/dvbc_v2.c index fb5cd7460e03..60b2b7f029ad 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/dvbc_v3.c b/drivers/amlogic/media/dtv_demod/dvbc_v3.c similarity index 99% rename from drivers/amlogic/media/amldemod/dvbc_v3.c rename to drivers/amlogic/media/dtv_demod/dvbc_v3.c index 74a8316df996..67b1cd556748 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/dvbt_v2.c b/drivers/amlogic/media/dtv_demod/dvbt_v2.c similarity index 99% rename from drivers/amlogic/media/amldemod/dvbt_v2.c rename to drivers/amlogic/media/dtv_demod/dvbt_v2.c index bfb1f3016207..4e88be1764f3 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/i2c_func.c b/drivers/amlogic/media/dtv_demod/i2c_func.c similarity index 95% rename from drivers/amlogic/media/amldemod/i2c_func.c rename to drivers/amlogic/media/dtv_demod/i2c_func.c index 2e7a49168d72..68020849bc82 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/acf_filter_coefficient.h b/drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/acf_filter_coefficient.h rename to drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h index 858386f8374e..2ac5b182cebb 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_che.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h similarity index 98% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_che.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h index 2e6af63d19ad..8e4eb182537a 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_che_bit.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_che_bit.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h index 54c9098513ee..3334eb771052 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_front.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h similarity index 98% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_front.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h index 0ee9482ceb31..c8b934659f91 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_front_bit.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_front_bit.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h index 327a188fe01d..6037db7424eb 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_sync.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h similarity index 97% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_sync.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h index 5ede8487ebed..5d52b00aa759 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_sync_bit.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h similarity index 98% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_sync_bit.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h index c29ee318ddac..cbe35db4a04e 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_top.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h similarity index 98% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_top.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h index 1ad8a34e555b..96d046d3eb36 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/addr_dtmb_top_bit.h b/drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/addr_dtmb_top_bit.h rename to drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h index ac26d921d2ff..d19f6767bcbc 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/amlfrontend.h b/drivers/amlogic/media/dtv_demod/include/amlfrontend.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/amlfrontend.h rename to drivers/amlogic/media/dtv_demod/include/amlfrontend.h index c00af73003a9..ea7dae3393c1 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/atsc_func.h b/drivers/amlogic/media/dtv_demod/include/atsc_func.h similarity index 96% rename from drivers/amlogic/media/amldemod/include/atsc_func.h rename to drivers/amlogic/media/dtv_demod/include/atsc_func.h index d0597d153664..c3f3e75f666b 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/demod_func.h b/drivers/amlogic/media/dtv_demod/include/demod_func.h similarity index 99% rename from drivers/amlogic/media/amldemod/include/demod_func.h rename to drivers/amlogic/media/dtv_demod/include/demod_func.h index 7fa60c72659f..564afa9b72c8 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/include/depend.h b/drivers/amlogic/media/dtv_demod/include/depend.h similarity index 96% rename from drivers/amlogic/media/amldemod/include/depend.h rename to drivers/amlogic/media/dtv_demod/include/depend.h index 680f72585476..b594c5b63bc6 100644 --- a/drivers/amlogic/media/amldemod/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. * diff --git a/drivers/amlogic/media/amldemod/tuner_func.c b/drivers/amlogic/media/dtv_demod/tuner_func.c similarity index 99% rename from drivers/amlogic/media/amldemod/tuner_func.c rename to drivers/amlogic/media/dtv_demod/tuner_func.c index 893e17ca3fbe..69a17bab5492 100644 --- a/drivers/amlogic/media/amldemod/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. *