Merge pull request #2021 from codesnake/wp2_update_kernel_config

[LE 8.2] projects/WeTek_Play_2: build media support drivers as modules

projects/WeTek_Play_2/filesystem/usr/lib/modules-load.d/amlvideodri.conf

@@ -0,0 +1 @@
+amlvideodri

projects/WeTek_Play_2/linux/linux.aarch64.conf

@@ -380,6 +380,7 @@ CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
 
 #
 # Power management options
@@ -768,7 +769,6 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_INTERNAL_REGDB=y
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
 CONFIG_CFG80211_WEXT=y
 # CONFIG_LIB80211 is not set
 CONFIG_MAC80211=m
@@ -1033,7 +1033,7 @@ CONFIG_BT_DEVICE=y
 #
 # V4L2 Video Support
 #
-CONFIG_V4L_AMLOGIC_VIDEO=y
+CONFIG_V4L_AMLOGIC_VIDEO=m
 # CONFIG_V4L_AMLOGIC_VIDEO2 is not set
 
 #
@@ -1075,7 +1075,7 @@ CONFIG_GXBB_SUSPEND=y
 #
 # WetekPlay driver
 #
-CONFIG_AM_DVB=y
+CONFIG_AM_DVB=m
 
 #
 # MESON MHU mailbox Support
@@ -2129,6 +2129,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
@@ -2193,7 +2194,7 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VEXPRESS is not set
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
@@ -2204,16 +2205,19 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 # CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_RESOURCE=y
+CONFIG_VIDEOBUF_RESOURCE=m
 CONFIG_VIDEOBUF_DVB=m
-CONFIG_DVB_CORE=y
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
@@ -2222,7 +2226,7 @@ CONFIG_DVB_MAX_ADAPTERS=8
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
+CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
@@ -2258,7 +2262,7 @@ CONFIG_MEDIA_USB_SUPPORT=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-# CONFIG_VIDEO_USBTV is not set
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -2270,7 +2274,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_HDPVR is not set
 # CONFIG_VIDEO_TLG2300 is not set
 # CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
+CONFIG_VIDEO_STK1160_COMMON=m
+# CONFIG_VIDEO_STK1160_AC97 is not set
+CONFIG_VIDEO_STK1160=m
 
 #
 # Analog/digital TV USB devices
@@ -2323,10 +2329,10 @@ CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
+# CONFIG_DVB_USB_GL861 is not set
+# CONFIG_DVB_USB_IT913X is not set
 CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
+# CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_SMS_USB_DRV=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
@@ -2367,7 +2373,7 @@ CONFIG_SMS_SIANO_RC=y
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
 # Audio decoders, processors and mixers
@@ -2417,25 +2423,25 @@ CONFIG_VIDEO_CX25840=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
-CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_FC0011=m
@@ -2517,7 +2523,6 @@ CONFIG_DVB_NXT200X=m
 CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_AU8522=m
 CONFIG_DVB_AU8522_DTV=m
@@ -2549,7 +2554,6 @@ CONFIG_DVB_A8293=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
 
@@ -2582,7 +2586,7 @@ CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 
 #
@@ -2661,6 +2665,7 @@ CONFIG_SND_VMASTER=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
 # CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
@@ -2687,6 +2692,7 @@ CONFIG_SND_SOC_AMLT9015=y
 CONFIG_SND_SOC_AMLT9015S=y
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
 
 #
 # HID support
@@ -3202,18 +3208,12 @@ CONFIG_VT6656=m
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
+# CONFIG_DVB_AS102 is not set
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_USB_MSI3101 is not set
 # CONFIG_VIDEO_TCM825X is not set
 # CONFIG_USB_SN9C102 is not set
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_IGORPLUGUSB=m
-# CONFIG_LIRC_IMON is not set
-# CONFIG_LIRC_SASEM is not set
-# CONFIG_LIRC_SERIAL is not set
-# CONFIG_LIRC_SIR is not set
-# CONFIG_LIRC_ZILOG is not set
+# CONFIG_LIRC_STAGING is not set
 
 #
 # Android

projects/WeTek_Play_2/patches/linux/wetek_dvb.patch

@@ -1,5 +1,5 @@
 diff --git a/drivers/amlogic/dvb_tv/Kconfig b/drivers/amlogic/dvb_tv/Kconfig
-index 10c45ff..7b59154 100644
+index 10c45ffc17f2..7b591548a507 100644
 --- a/drivers/amlogic/dvb_tv/Kconfig
 +++ b/drivers/amlogic/dvb_tv/Kconfig
 @@ -1,289 +1,14 @@
@@ -297,7 +297,7 @@ index 10c45ff..7b59154 100644
  endmenu
  
 diff --git a/drivers/amlogic/dvb_tv/Makefile b/drivers/amlogic/dvb_tv/Makefile
-index 14f0e74..cf5a0af 100644
+index 14f0e74d1177..cf5a0afc1736 100644
 --- a/drivers/amlogic/dvb_tv/Makefile
 +++ b/drivers/amlogic/dvb_tv/Makefile
 @@ -1,62 +1,10 @@
@@ -370,7 +370,7 @@ index 14f0e74..cf5a0af 100644
 +EXTRA_CFLAGS += -I.
 diff --git a/drivers/amlogic/dvb_tv/aml_dmx.c b/drivers/amlogic/dvb_tv/aml_dmx.c
 deleted file mode 100644
-index c6ee5d0..0000000
+index c6ee5d0c2efe..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_dmx.c
 +++ /dev/null
 @@ -1,4573 +0,0 @@
@@ -4949,7 +4949,7 @@ index c6ee5d0..0000000
 -EXPORT_SYMBOL(aml_dmx_stop_error_check);
 diff --git a/drivers/amlogic/dvb_tv/aml_dvb.c b/drivers/amlogic/dvb_tv/aml_dvb.c
 deleted file mode 100644
-index 0c21f6d..0000000
+index 0c21f6d27547..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_dvb.c
 +++ /dev/null
 @@ -1,1857 +0,0 @@
@@ -6812,7 +6812,7 @@ index 0c21f6d..0000000
 -MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/aml_dvb.h b/drivers/amlogic/dvb_tv/aml_dvb.h
 deleted file mode 100644
-index ef7b4e0..0000000
+index ef7b4e0a28c9..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_dvb.h
 +++ /dev/null
 @@ -1,339 +0,0 @@
@@ -7157,7 +7157,7 @@ index ef7b4e0..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/aml_dvb_reg.h b/drivers/amlogic/dvb_tv/aml_dvb_reg.h
 deleted file mode 100644
-index fdeffd3..0000000
+index fdeffd326bc7..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_dvb_reg.h
 +++ /dev/null
 @@ -1,46 +0,0 @@
@@ -7209,7 +7209,7 @@ index fdeffd3..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/aml_fe.c b/drivers/amlogic/dvb_tv/aml_fe.c
 deleted file mode 100644
-index 6a31fb5..0000000
+index 6a31fb537fec..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_fe.c
 +++ /dev/null
 @@ -1,2860 +0,0 @@
@@ -10075,7 +10075,7 @@ index 6a31fb5..0000000
 -MODULE_AUTHOR("L+#= +0=1");
 diff --git a/drivers/amlogic/dvb_tv/aml_fe.h b/drivers/amlogic/dvb_tv/aml_fe.h
 deleted file mode 100644
-index 62a06cd..0000000
+index 62a06cd8aedc..000000000000
 --- a/drivers/amlogic/dvb_tv/aml_fe.h
 +++ /dev/null
 @@ -1,206 +0,0 @@
@@ -10287,7 +10287,7 @@ index 62a06cd..0000000
 -#endif /*_AML_FE_H_*/
 diff --git a/drivers/amlogic/dvb_tv/amlatvdemod/Makefile b/drivers/amlogic/dvb_tv/amlatvdemod/Makefile
 deleted file mode 100644
-index 8a773c9..0000000
+index 8a773c951705..000000000000
 --- a/drivers/amlogic/dvb_tv/amlatvdemod/Makefile
 +++ /dev/null
 @@ -1,7 +0,0 @@
@@ -10300,7 +10300,7 @@ index 8a773c9..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_frontend.c b/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_frontend.c
 deleted file mode 100644
-index dd06e24..0000000
+index dd06e240e660..000000000000
 --- a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_frontend.c
 +++ /dev/null
 @@ -1,760 +0,0 @@
@@ -11066,7 +11066,7 @@ index dd06e24..0000000
 -module_exit(aml_atvdemod_exit);
 diff --git a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.c b/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.c
 deleted file mode 100644
-index a19d1cd..0000000
+index a19d1cd894fb..000000000000
 --- a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.c
 +++ /dev/null
 @@ -1,2073 +0,0 @@
@@ -13145,7 +13145,7 @@ index a19d1cd..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.h b/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.h
 deleted file mode 100644
-index 0c1c9d9..0000000
+index 0c1c9d9db842..000000000000
 --- a/drivers/amlogic/dvb_tv/amlatvdemod/atvdemod_func.h
 +++ /dev/null
 @@ -1,318 +0,0 @@
@@ -13469,7 +13469,7 @@ index 0c1c9d9..0000000
 -#endif /* __ATVDEMOD_FUN_H */
 diff --git a/drivers/amlogic/dvb_tv/amldemod/Makefile b/drivers/amlogic/dvb_tv/amldemod/Makefile
 deleted file mode 100644
-index 039a53b..0000000
+index 039a53b59545..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/Makefile
 +++ /dev/null
 @@ -1,29 +0,0 @@
@@ -13504,7 +13504,7 @@ index 039a53b..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/amldemod/aml_demod.c b/drivers/amlogic/dvb_tv/amldemod/aml_demod.c
 deleted file mode 100644
-index 1b9d4da..0000000
+index 1b9d4da0c7a9..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/aml_demod.c
 +++ /dev/null
 @@ -1,700 +0,0 @@
@@ -14210,7 +14210,7 @@ index 1b9d4da..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/amlfrontend.c b/drivers/amlogic/dvb_tv/amldemod/amlfrontend.c
 deleted file mode 100644
-index f58b2d4..0000000
+index f58b2d470398..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/amlfrontend.c
 +++ /dev/null
 @@ -1,1318 +0,0 @@
@@ -15534,7 +15534,7 @@ index f58b2d4..0000000
 -MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/amldemod/demod_func.c b/drivers/amlogic/dvb_tv/amldemod/demod_func.c
 deleted file mode 100644
-index 4058861..0000000
+index 405886109fef..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/demod_func.c
 +++ /dev/null
 @@ -1,2852 +0,0 @@
@@ -18392,7 +18392,7 @@ index 4058861..0000000
 -}
 diff --git a/drivers/amlogic/dvb_tv/amldemod/dvbc_func.c b/drivers/amlogic/dvb_tv/amldemod/dvbc_func.c
 deleted file mode 100644
-index 4db65c5..0000000
+index 4db65c5812f7..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/dvbc_func.c
 +++ /dev/null
 @@ -1,1238 +0,0 @@
@@ -19636,7 +19636,7 @@ index 4db65c5..0000000
 -}
 diff --git a/drivers/amlogic/dvb_tv/amldemod/dvbt_func.c b/drivers/amlogic/dvb_tv/amldemod/dvbt_func.c
 deleted file mode 100644
-index b407520..0000000
+index b40752091dfd..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/dvbt_func.c
 +++ /dev/null
 @@ -1,2160 +0,0 @@
@@ -21802,7 +21802,7 @@ index b407520..0000000
 -}
 diff --git a/drivers/amlogic/dvb_tv/amldemod/i2c_func.c b/drivers/amlogic/dvb_tv/amldemod/i2c_func.c
 deleted file mode 100644
-index b00d14b..0000000
+index b00d14b787fe..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/i2c_func.c
 +++ /dev/null
 @@ -1,22 +0,0 @@
@@ -21830,7 +21830,7 @@ index b00d14b..0000000
 -}
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/acf_filter_coefficient.h b/drivers/amlogic/dvb_tv/amldemod/include/acf_filter_coefficient.h
 deleted file mode 100644
-index b1437a2..0000000
+index b1437a2cdab2..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/acf_filter_coefficient.h
 +++ /dev/null
 @@ -1,395 +0,0 @@
@@ -22231,7 +22231,7 @@ index b1437a2..0000000
 -}
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che.h
 deleted file mode 100644
-index 01ff783..0000000
+index 01ff78361d2b..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che.h
 +++ /dev/null
 @@ -1,58 +0,0 @@
@@ -22295,7 +22295,7 @@ index 01ff783..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che_bit.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che_bit.h
 deleted file mode 100644
-index edb848c..0000000
+index edb848c9e676..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_che_bit.h
 +++ /dev/null
 @@ -1,247 +0,0 @@
@@ -22548,7 +22548,7 @@ index edb848c..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front.h
 deleted file mode 100644
-index aa404a5..0000000
+index aa404a5e594b..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front.h
 +++ /dev/null
 @@ -1,48 +0,0 @@
@@ -22602,7 +22602,7 @@ index aa404a5..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front_bit.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front_bit.h
 deleted file mode 100644
-index b6df7f6..0000000
+index b6df7f602041..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_front_bit.h
 +++ /dev/null
 @@ -1,312 +0,0 @@
@@ -22920,7 +22920,7 @@ index b6df7f6..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync.h
 deleted file mode 100644
-index 0455a4e..0000000
+index 0455a4e3e35f..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync.h
 +++ /dev/null
 @@ -1,34 +0,0 @@
@@ -22960,7 +22960,7 @@ index 0455a4e..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync_bit.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync_bit.h
 deleted file mode 100644
-index 51c2517..0000000
+index 51c2517d6eec..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_sync_bit.h
 +++ /dev/null
 @@ -1,91 +0,0 @@
@@ -23057,7 +23057,7 @@ index 51c2517..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top.h
 deleted file mode 100644
-index 827c87a..0000000
+index 827c87a75260..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top.h
 +++ /dev/null
 @@ -1,71 +0,0 @@
@@ -23134,7 +23134,7 @@ index 827c87a..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top_bit.h b/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top_bit.h
 deleted file mode 100644
-index 4a6df5d..0000000
+index 4a6df5d5e8b6..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/addr_dtmb_top_bit.h
 +++ /dev/null
 @@ -1,159 +0,0 @@
@@ -23299,7 +23299,7 @@ index 4a6df5d..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/aml_dtv_demod_reg.h b/drivers/amlogic/dvb_tv/amldemod/include/aml_dtv_demod_reg.h
 deleted file mode 100644
-index 9c318b1..0000000
+index 9c318b1524f3..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/aml_dtv_demod_reg.h
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -23314,7 +23314,7 @@ index 9c318b1..0000000
 -#endif	/* 
 */
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/amlfrontend.h b/drivers/amlogic/dvb_tv/amldemod/include/amlfrontend.h
 deleted file mode 100644
-index 0114306..0000000
+index 01143061a99b..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/amlfrontend.h
 +++ /dev/null
 @@ -1,64 +0,0 @@
@@ -23384,7 +23384,7 @@ index 0114306..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/include/demod_func.h b/drivers/amlogic/dvb_tv/amldemod/include/demod_func.h
 deleted file mode 100644
-index 4587b09..0000000
+index 4587b094c573..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/include/demod_func.h
 +++ /dev/null
 @@ -1,604 +0,0 @@
@@ -23994,7 +23994,7 @@ index 4587b09..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/amldemod/tuner_func.c b/drivers/amlogic/dvb_tv/amldemod/tuner_func.c
 deleted file mode 100644
-index 20df299..0000000
+index 20df2991d2b4..000000000000
 --- a/drivers/amlogic/dvb_tv/amldemod/tuner_func.c
 +++ /dev/null
 @@ -1,169 +0,0 @@
@@ -24169,7 +24169,7 @@ index 20df299..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/amsmc.h b/drivers/amlogic/dvb_tv/amsmc.h
 deleted file mode 100644
-index 53b9d29..0000000
+index 53b9d295cdc6..000000000000
 --- a/drivers/amlogic/dvb_tv/amsmc.h
 +++ /dev/null
 @@ -1,61 +0,0 @@
@@ -24236,7 +24236,7 @@ index 53b9d29..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/ascot3.c b/drivers/amlogic/dvb_tv/ascot3.c
 new file mode 100644
-index 0000000..0b424e8
+index 000000000000..0b424e888be7
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/ascot3.c
 @@ -0,0 +1,563 @@
@@ -24805,7 +24805,7 @@ index 0000000..0b424e8
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/ascot3.h b/drivers/amlogic/dvb_tv/ascot3.h
 new file mode 100644
-index 0000000..e245539
+index 000000000000..e245539bdc6f
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/ascot3.h
 @@ -0,0 +1,46 @@
@@ -24857,7 +24857,7 @@ index 0000000..e245539
 +#endif
 diff --git a/drivers/amlogic/dvb_tv/avl6211.c b/drivers/amlogic/dvb_tv/avl6211.c
 new file mode 100644
-index 0000000..278f026
+index 000000000000..278f0263e26c
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/avl6211.c
 @@ -0,0 +1,1979 @@
@@ -26842,7 +26842,7 @@ index 0000000..278f026
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/avl6211.h b/drivers/amlogic/dvb_tv/avl6211.h
 new file mode 100644
-index 0000000..75c68cf
+index 000000000000..75c68cfb631c
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/avl6211.h
 @@ -0,0 +1,156 @@
@@ -27005,7 +27005,7 @@ index 0000000..75c68cf
 \ No newline at end of file
 diff --git a/drivers/amlogic/dvb_tv/avl6211_reg.h b/drivers/amlogic/dvb_tv/avl6211_reg.h
 new file mode 100644
-index 0000000..b7a0fe5
+index 000000000000..b7a0fe574a42
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/avl6211_reg.h
 @@ -0,0 +1,101 @@
@@ -27112,7 +27112,7 @@ index 0000000..b7a0fe5
 +#endif
 diff --git a/drivers/amlogic/dvb_tv/c_stb_define.h b/drivers/amlogic/dvb_tv/c_stb_define.h
 deleted file mode 100644
-index 66e30f1..0000000
+index 66e30f17c50a..000000000000
 --- a/drivers/amlogic/dvb_tv/c_stb_define.h
 +++ /dev/null
 @@ -1,1162 +0,0 @@
@@ -28280,7 +28280,7 @@ index 66e30f1..0000000
 -#endif /* C_STB_DEFINE_H*/
 diff --git a/drivers/amlogic/dvb_tv/c_stb_regs_define.h b/drivers/amlogic/dvb_tv/c_stb_regs_define.h
 deleted file mode 100644
-index 2612fa6..0000000
+index 2612fa6efafd..000000000000
 --- a/drivers/amlogic/dvb_tv/c_stb_regs_define.h
 +++ /dev/null
 @@ -1,8889 +0,0 @@
@@ -37175,7 +37175,7 @@ index 2612fa6..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/cxd2841er.c b/drivers/amlogic/dvb_tv/cxd2841er.c
 new file mode 100644
-index 0000000..acbe977
+index 000000000000..acbe977c646c
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/cxd2841er.c
 @@ -0,0 +1,3812 @@
@@ -40993,7 +40993,7 @@ index 0000000..acbe977
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/cxd2841er.h b/drivers/amlogic/dvb_tv/cxd2841er.h
 new file mode 100644
-index 0000000..98a4682
+index 000000000000..98a468240a9e
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/cxd2841er.h
 @@ -0,0 +1,50 @@
@@ -41049,7 +41049,7 @@ index 0000000..98a4682
 +#endif
 diff --git a/drivers/amlogic/dvb_tv/cxd2841er_priv.h b/drivers/amlogic/dvb_tv/cxd2841er_priv.h
 new file mode 100644
-index 0000000..5e2b8d8
+index 000000000000..5e2b8d84d968
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/cxd2841er_priv.h
 @@ -0,0 +1,45 @@
@@ -41100,7 +41100,7 @@ index 0000000..5e2b8d8
 +#endif
 diff --git a/drivers/amlogic/dvb_tv/mn88436.c b/drivers/amlogic/dvb_tv/mn88436.c
 new file mode 100644
-index 0000000..d76c88d
+index 000000000000..d76c88d6bb99
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/mn88436.c
 @@ -0,0 +1,379 @@
@@ -41485,7 +41485,7 @@ index 0000000..d76c88d
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/mn88436.h b/drivers/amlogic/dvb_tv/mn88436.h
 new file mode 100644
-index 0000000..e16db86
+index 000000000000..e16db86f781d
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/mn88436.h
 @@ -0,0 +1,47 @@
@@ -41539,7 +41539,7 @@ index 0000000..e16db86
 \ No newline at end of file
 diff --git a/drivers/amlogic/dvb_tv/mxl603.c b/drivers/amlogic/dvb_tv/mxl603.c
 new file mode 100644
-index 0000000..bc7018c
+index 000000000000..bc7018c3b639
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/mxl603.c
 @@ -0,0 +1,1096 @@
@@ -42641,7 +42641,7 @@ index 0000000..bc7018c
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/mxl603.h b/drivers/amlogic/dvb_tv/mxl603.h
 new file mode 100644
-index 0000000..8560a41
+index 000000000000..8560a41e6d4f
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/mxl603.h
 @@ -0,0 +1,83 @@
@@ -42730,10 +42730,10 @@ index 0000000..8560a41
 +#endif /* __MXL603_H__ */
 diff --git a/drivers/amlogic/dvb_tv/nimdetect.c b/drivers/amlogic/dvb_tv/nimdetect.c
 new file mode 100644
-index 0000000..e20e103
+index 000000000000..7f7815e0524a
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/nimdetect.c
-@@ -0,0 +1,596 @@
+@@ -0,0 +1,534 @@
 +/*
 + * Wetek NIMs/DVB detection
 + *
@@ -43240,68 +43240,6 @@ index 0000000..e20e103
 +	}
 +};
 +#endif
-+#ifdef CONFIG_ARM64
-+#include <linux/of.h>
-+#include <linux/of_fdt.h>
-+#include <linux/of_reserved_mem.h>
-+#include <linux/uaccess.h>
-+#include <linux/dma-mapping.h>
-+static phys_addr_t wetek_rmem_paddr;
-+static void __iomem *wetek_rmem_vaddr = NULL;
-+static u32 wetek_rmem_size;
-+EXPORT_SYMBOL(wetek_rmem_size);
-+EXPORT_SYMBOL(wetek_rmem_vaddr);
-+EXPORT_SYMBOL(wetek_rmem_paddr);
-+int rmem_init(struct device *dev)
-+{
-+	return of_reserved_mem_device_init(dev);
-+}
-+EXPORT_SYMBOL(rmem_init);
-+static int rmem_wetek_device_init(struct reserved_mem *rmem, struct device *dev)
-+{
-+
-+	if ((wetek_rmem_paddr > 0) && (wetek_rmem_size > 0)) {
-+		wetek_rmem_vaddr = ioremap_wc(wetek_rmem_paddr, wetek_rmem_size);
-+		if (!wetek_rmem_vaddr)
-+			printk(KERN_INFO "wetek_memory ioremap error\n");
-+	}	
-+	return 0;
-+}
-+
-+static const struct reserved_mem_ops rmem_wetek_ops = {
-+	.device_init = rmem_wetek_device_init,
-+};
-+
-+static int __init rmem_wetek_setup(struct reserved_mem *rmem)
-+{
-+	phys_addr_t align = PAGE_SIZE;
-+	phys_addr_t mask = align - 1;
-+	if ((rmem->base & mask) || (rmem->size & mask)) {
-+		printk(KERN_INFO "Reserved memory: incorrect alignment of region\n");
-+		return -EINVAL;
-+	}
-+	wetek_rmem_paddr = rmem->base;
-+	wetek_rmem_size = rmem->size;
-+	rmem->ops = &rmem_wetek_ops;
-+	printk(KERN_INFO "Reserved memory wetek: created at 0x%p, size %ld MiB\n",
-+		     (void *)wetek_rmem_paddr, (unsigned long)wetek_rmem_size / ( 1024 * 1024));
-+	return 0;
-+}
-+RESERVEDMEM_OF_DECLARE(wetekplay, "amlogic, wetek-memory", rmem_wetek_setup);
-+
-+
-+
-+#endif
-+int AddWetekFB(struct platform_driver *drv)
-+{
-+	return platform_driver_register(drv);
-+}
-+EXPORT_SYMBOL(AddWetekFB);
-+void RemoveWetekFB(struct platform_driver *drv)
-+{
-+	platform_driver_unregister(drv);
-+}
-+EXPORT_SYMBOL(RemoveWetekFB);
 +
 +int __init nim_dvb_init(void)
 +{
@@ -43332,7 +43270,7 @@ index 0000000..e20e103
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/nimdetect.h b/drivers/amlogic/dvb_tv/nimdetect.h
 new file mode 100644
-index 0000000..ea38c82
+index 000000000000..ea38c8257373
 --- /dev/null
 +++ b/drivers/amlogic/dvb_tv/nimdetect.h
 @@ -0,0 +1,54 @@
@@ -43392,7 +43330,7 @@ index 0000000..ea38c82
 +#endif /* __NIMDETECT_H */
 diff --git a/drivers/amlogic/dvb_tv/smartcard/Kconfig b/drivers/amlogic/dvb_tv/smartcard/Kconfig
 deleted file mode 100644
-index 3cb4880..0000000
+index 3cb4880eaa3e..000000000000
 --- a/drivers/amlogic/dvb_tv/smartcard/Kconfig
 +++ /dev/null
 @@ -1,7 +0,0 @@
@@ -43405,7 +43343,7 @@ index 3cb4880..0000000
 -	default n
 diff --git a/drivers/amlogic/dvb_tv/smartcard/Makefile b/drivers/amlogic/dvb_tv/smartcard/Makefile
 deleted file mode 100644
-index 8b775fb..0000000
+index 8b775fb8663f..000000000000
 --- a/drivers/amlogic/dvb_tv/smartcard/Makefile
 +++ /dev/null
 @@ -1,8 +0,0 @@
@@ -43419,7 +43357,7 @@ index 8b775fb..0000000
 -ccflags-y += -I$(srctree)/drivers/amlogic/dvb_tv
 diff --git a/drivers/amlogic/dvb_tv/smartcard/Readme.txt b/drivers/amlogic/dvb_tv/smartcard/Readme.txt
 deleted file mode 100644
-index 4c7d8ff..0000000
+index 4c7d8ff832c3..000000000000
 --- a/drivers/amlogic/dvb_tv/smartcard/Readme.txt
 +++ /dev/null
 @@ -1,57 +0,0 @@
@@ -43482,7 +43420,7 @@ index 4c7d8ff..0000000
 -
 diff --git a/drivers/amlogic/dvb_tv/smartcard/smartcard.c b/drivers/amlogic/dvb_tv/smartcard/smartcard.c
 deleted file mode 100644
-index 8c7ba22..0000000
+index 8c7ba22c6eed..000000000000
 --- a/drivers/amlogic/dvb_tv/smartcard/smartcard.c
 +++ /dev/null
 @@ -1,2660 +0,0 @@
@@ -46148,7 +46086,7 @@ index 8c7ba22..0000000
 -MODULE_LICENSE("GPL");
 diff --git a/drivers/amlogic/dvb_tv/smartcard/smartcard.h b/drivers/amlogic/dvb_tv/smartcard/smartcard.h
 deleted file mode 100644
-index 07a9035..0000000
+index 07a903521b89..000000000000
 --- a/drivers/amlogic/dvb_tv/smartcard/smartcard.h
 +++ /dev/null
 @@ -1,8 +0,0 @@
@@ -46162,7 +46100,7 @@ index 07a9035..0000000
 -#endif
 diff --git a/drivers/amlogic/dvb_tv/smc_reg.h b/drivers/amlogic/dvb_tv/smc_reg.h
 deleted file mode 100644
-index 6cecdaa..0000000
+index 6cecdaa5d435..000000000000
 --- a/drivers/amlogic/dvb_tv/smc_reg.h
 +++ /dev/null
 @@ -1,262 +0,0 @@
@@ -46429,5 +46367,5 @@ index 6cecdaa..0000000
 -
 -#endif
 -- 
-1.7.10.4
+2.11.0