From b75016a67de5bcd8188942e9980ce9b219b1fcbd Mon Sep 17 00:00:00 2001 From: Jianxiong Pan Date: Mon, 7 Aug 2023 17:20:12 +0800 Subject: [PATCH] zapper: remove c1a relate code. [1/1] PD#SWPL-126879 Problem: memory optimization. Solution: remove c1a relate code. Verify: s1a. Test: run on s1a board normally. Change-Id: Idbd24a529666278295724f26d10f1a720877ca6a Signed-off-by: Jianxiong Pan --- arch/arm/configs/meson64_a32_zapper_defconfig | 1 + drivers/clk/meson/meson-clk-measure.c | 6 +++ drivers/debug/Kconfig | 7 +++ drivers/drm/meson_vpu.c | 4 ++ drivers/drm/vpu-hw/meson_vpu_osd_mif.c | 14 ++++++ drivers/gpio/irqchip/irq-meson-gpio.c | 4 ++ drivers/iio/adc/meson_saradc.c | 4 ++ drivers/iio/adc/meson_saradc_m8.c | 2 + drivers/media/cec/std_ao_cec.c | 1 + .../common/arch/registers/register_map.c | 6 ++- drivers/media/common/ge2d/ge2d_main.c | 4 ++ drivers/media/common/vpu/vpu.c | 4 ++ drivers/media/di_multi/di_sys.c | 2 +- drivers/media/dtv_demod/amlfrontend.c | 4 ++ drivers/media/enhancement/amvecm/amvecm.c | 6 +++ drivers/media/vin/adc/adc.c | 48 +++++++++++++++++-- drivers/media/vout/vdac/vdac_config.c | 4 ++ drivers/memory_debug/ddr_tool/ddr_port_desc.c | 5 +- drivers/memory_debug/ddr_tool/ddr_priority.c | 4 ++ drivers/memory_debug/ddr_tool/dmc_monitor.c | 2 + drivers/power/sec_power_domain.c | 4 ++ sound/soc/amlogic/Makefile | 2 + sound/soc/amlogic/auge/clks/audio_clks.c | 2 + sound/soc/amlogic/auge/ddr_mngr.c | 4 ++ 24 files changed, 137 insertions(+), 7 deletions(-) diff --git a/arch/arm/configs/meson64_a32_zapper_defconfig b/arch/arm/configs/meson64_a32_zapper_defconfig index ce215d478..9f369f0ff 100644 --- a/arch/arm/configs/meson64_a32_zapper_defconfig +++ b/arch/arm/configs/meson64_a32_zapper_defconfig @@ -481,6 +481,7 @@ CONFIG_AMLOGIC_DEBUG_HLD=y # CONFIG_AMLOGIC_DEBUG_MHZ is not set CONFIG_AMLOGIC_ENV_DEBUG=y CONFIG_AMLOGIC_ZAPPER_CUT=y +CONFIG_AMLOGIC_ZAPPER_C1A=y CONFIG_AMLOGIC_REMOVE_OLD=y CONFIG_AMLOGIC_DEBUG_IOTRACE=y CONFIG_AMLOGIC_ARMV8_AARCH32=y diff --git a/drivers/clk/meson/meson-clk-measure.c b/drivers/clk/meson/meson-clk-measure.c index 98afaad07..08b5da804 100644 --- a/drivers/clk/meson/meson-clk-measure.c +++ b/drivers/clk/meson/meson-clk-measure.c @@ -254,6 +254,7 @@ static struct meson_msr_id clk_msr_axg[] __initdata = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct meson_msr_id clk_msr_s4[] __initdata = { CLK_MSR_ID(0, "cts_sys_clk"), CLK_MSR_ID(1, "cts_axi_clk"), @@ -405,6 +406,7 @@ static struct meson_msr_id clk_msr_s4[] __initdata = { CLK_MSR_ID(222, "sys_cpu_osc_ring26"), CLK_MSR_ID(223, "sys_cpu_osc_ring27"), }; +#endif static struct meson_msr_id clk_msr_s1a[] __initdata = { CLK_MSR_ID(0, "cts_sys_clk"), @@ -3504,6 +3506,7 @@ static struct meson_msr_data meson_axg_data __initdata = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct meson_msr_data meson_s4_data __initdata = { .msr_table = (struct meson_msr_id *)&clk_msr_s4, .table_size = ARRAY_SIZE(clk_msr_s4), @@ -3512,6 +3515,7 @@ static struct meson_msr_data meson_s4_data __initdata = { .reg1_offset = 0x4, .reg2_offset = 0x8, }; +#endif static struct meson_msr_data meson_s1a_data __initdata = { .msr_table = (struct meson_msr_id *)&clk_msr_s1a, @@ -3704,10 +3708,12 @@ static const struct of_device_id meson_msr_match_table[] = { .data = &meson_axg_data, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic,meson-s4-clk-measure", .data = &meson_s4_data, }, +#endif { .compatible = "amlogic,meson-s1a-clk-measure", .data = &meson_s1a_data, diff --git a/drivers/debug/Kconfig b/drivers/debug/Kconfig index be662b795..6e6582378 100644 --- a/drivers/debug/Kconfig +++ b/drivers/debug/Kconfig @@ -118,6 +118,13 @@ config AMLOGIC_ZAPPER_CUT help remove more for zapper +config AMLOGIC_ZAPPER_C1A + bool "zapper C1A" + depends on AMLOGIC_DEBUG + default n + help + remove more for zapper c1a + config AMLOGIC_REMOVE_OLD bool "zapper cut" depends on AMLOGIC_DEBUG diff --git a/drivers/drm/meson_vpu.c b/drivers/drm/meson_vpu.c index 86dadd287..ec38be2a4 100644 --- a/drivers/drm/meson_vpu.c +++ b/drivers/drm/meson_vpu.c @@ -286,6 +286,7 @@ static const struct component_ops am_meson_vpu_component_ops = { .unbind = am_meson_vpu_unbind, }; +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static const struct meson_vpu_data vpu_g12a_data = { .crtc_func = { .reg_ops = t7_reg_ops, @@ -300,6 +301,7 @@ static const struct meson_vpu_data vpu_g12a_data = { .postblend_ops = &postblend_ops, .video_ops = &video_ops, }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static const struct meson_vpu_data vpu_g12b_data = { @@ -453,8 +455,10 @@ static const struct of_device_id am_meson_vpu_driver_dt_match[] = { {.compatible = "amlogic, meson-sc2-vpu", .data = &vpu_g12a_data,}, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A {.compatible = "amlogic, meson-s4-vpu", .data = &vpu_g12a_data,}, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT {.compatible = "amlogic, meson-t7-vpu", .data = &vpu_t7_data,}, diff --git a/drivers/drm/vpu-hw/meson_vpu_osd_mif.c b/drivers/drm/vpu-hw/meson_vpu_osd_mif.c index a5d437b23..bbafe4dd7 100644 --- a/drivers/drm/vpu-hw/meson_vpu_osd_mif.c +++ b/drivers/drm/vpu-hw/meson_vpu_osd_mif.c @@ -321,6 +321,7 @@ static u32 osd_secure_input_index[] = {OSD1_INPUT_SECURE, * Internal function to query information for a given format. See * meson_drm_format_info() for the public API. */ +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A const struct meson_drm_format_info *__meson_drm_format_info(u32 format) { static const struct meson_drm_format_info formats[] = { @@ -391,6 +392,7 @@ const struct meson_drm_format_info *__meson_drm_format_info(u32 format) return NULL; } +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT const struct meson_drm_format_info *__meson_drm_format_info_t3x(u32 format) @@ -576,6 +578,7 @@ const struct meson_drm_format_info *__meson_drm_format_info_s1a(u32 format) return NULL; } +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A const struct meson_drm_format_info *__meson_drm_afbc_format_info(u32 format) { static const struct meson_drm_format_info formats[] = { @@ -623,6 +626,7 @@ const struct meson_drm_format_info *__meson_drm_afbc_format_info(u32 format) return NULL; } +#endif /** * meson_drm_format_info - query information for a given format @@ -635,6 +639,7 @@ const struct meson_drm_format_info *__meson_drm_afbc_format_info(u32 format) * The instance of struct meson_drm_format_info that describes the * pixel format, or NULL if the format is unsupported. */ +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A const struct meson_drm_format_info *meson_drm_format_info(u32 format, bool afbc_en) { @@ -647,6 +652,7 @@ const struct meson_drm_format_info *meson_drm_format_info(u32 format, WARN_ON(!info); return info; } +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT const struct meson_drm_format_info *meson_drm_format_info_t3x(u32 format, @@ -683,6 +689,7 @@ const struct meson_drm_format_info *meson_drm_format_info_s1a(u32 format, * Returns: * The hw_blkmode match the specified pixel format. */ +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static u8 meson_drm_format_hw_blkmode(u32 format, bool afbc_en) { const struct meson_drm_format_info *info; @@ -690,6 +697,7 @@ static u8 meson_drm_format_hw_blkmode(u32 format, bool afbc_en) info = meson_drm_format_info(format, afbc_en); return info ? info->hw_blkmode : 0; } +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static u8 meson_drm_format_hw_blkmode_t3x(u32 format, bool afbc_en) @@ -716,6 +724,7 @@ static u8 meson_drm_format_hw_blkmode_s1a(u32 format, bool afbc_en) * Returns: * The hw_colormat match the specified pixel format. */ +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static u8 meson_drm_format_hw_colormat(u32 format, bool afbc_en) { const struct meson_drm_format_info *info; @@ -723,6 +732,7 @@ static u8 meson_drm_format_hw_colormat(u32 format, bool afbc_en) info = meson_drm_format_info(format, afbc_en); return info ? info->hw_colormat : 0; } +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static u8 meson_drm_format_hw_colormat_t3x(u32 format, bool afbc_en) @@ -749,6 +759,7 @@ static u8 meson_drm_format_hw_colormat_s1a(u32 format, bool afbc_en) * Returns: * The alpha_replace match the specified pixel format. */ +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static u8 meson_drm_format_alpha_replace(u32 format, bool afbc_en) { const struct meson_drm_format_info *info; @@ -756,6 +767,7 @@ static u8 meson_drm_format_alpha_replace(u32 format, bool afbc_en) info = meson_drm_format_info(format, afbc_en); return info ? info->alpha_replace : 0; } +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static u8 meson_drm_format_alpha_replace_t3x(u32 format, bool afbc_en) @@ -979,11 +991,13 @@ static void osd_color_config(struct meson_vpu_block *vblk, color = meson_drm_format_hw_colormat_s1a(pixel_format, afbc_en); alpha_replace = (pixel_blend == DRM_MODE_BLEND_PIXEL_NONE) || meson_drm_format_alpha_replace_s1a(pixel_format, afbc_en); +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else { blk_mode = meson_drm_format_hw_blkmode(pixel_format, afbc_en); color = meson_drm_format_hw_colormat(pixel_format, afbc_en); alpha_replace = (pixel_blend == DRM_MODE_BLEND_PIXEL_NONE) || meson_drm_format_alpha_replace(pixel_format, afbc_en); +#endif } reg_ops->rdma_write_reg_bits(reg->viu_osd_blk0_cfg_w0, blk_mode, 8, 4); diff --git a/drivers/gpio/irqchip/irq-meson-gpio.c b/drivers/gpio/irqchip/irq-meson-gpio.c index d0f060dcc..513782710 100644 --- a/drivers/gpio/irqchip/irq-meson-gpio.c +++ b/drivers/gpio/irqchip/irq-meson-gpio.c @@ -241,9 +241,11 @@ static const struct meson_gpio_irq_params t7_params = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static const struct meson_gpio_irq_params s4_params = { INIT_MESON_SC2_COMMON_DATA(82) }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static const struct meson_gpio_irq_params t3_params = { @@ -311,7 +313,9 @@ static const struct of_device_id meson_irq_gpio_matches[] = { { .compatible = "amlogic,meson-t5d-gpio-intc", .data = &t5d_params }, { .compatible = "amlogic,meson-t7-gpio-intc", .data = &t7_params }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic,meson-s4-gpio-intc", .data = &s4_params }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic,meson-t3-gpio-intc", .data = &t3_params }, { .compatible = "amlogic,meson-p1-gpio-intc", .data = &p1_params }, diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 6a2899fb9..d98874b0b 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -1311,10 +1311,12 @@ static const struct meson_sar_adc_data meson_sar_adc_txlx_data = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static const struct meson_sar_adc_data meson_sar_adc_g12a_data = { .param = &meson_sar_adc_g12a_param, .name = "meson-g12a-saradc", }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static const struct meson_sar_adc_data meson_sar_adc_c2_data = { @@ -1360,10 +1362,12 @@ static const struct of_device_id meson_sar_adc_of_match[] = { .data = &meson_sar_adc_txlx_data, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic,meson-g12a-saradc", .data = &meson_sar_adc_g12a_data, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic,meson-c2-saradc", diff --git a/drivers/iio/adc/meson_saradc_m8.c b/drivers/iio/adc/meson_saradc_m8.c index b57cf0349..6155147c6 100644 --- a/drivers/iio/adc/meson_saradc_m8.c +++ b/drivers/iio/adc/meson_saradc_m8.c @@ -395,6 +395,7 @@ const struct meson_sar_adc_param meson_sar_adc_txlx_param __initconst = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A const struct meson_sar_adc_param meson_sar_adc_g12a_param __initconst = { .has_bl30_integration = false, .clock_rate = 1200000, @@ -412,6 +413,7 @@ const struct meson_sar_adc_param meson_sar_adc_g12a_param __initconst = { .channels = meson_m8_sar_adc_iio_channels, .num_channels = ARRAY_SIZE(meson_m8_sar_adc_iio_channels), }; +#endif const struct meson_sar_adc_param meson_sar_adc_txhd2_param __initconst = { .has_bl30_integration = false, diff --git a/drivers/media/cec/std_ao_cec.c b/drivers/media/cec/std_ao_cec.c index f46b4a89b..9b3df30b2 100644 --- a/drivers/media/cec/std_ao_cec.c +++ b/drivers/media/cec/std_ao_cec.c @@ -1868,6 +1868,7 @@ static const struct cec_platform_data_s cec_t7_data = { .share_io = true, .reg_tab_group = cec_reg_group_a1, }; +#endif static const struct cec_platform_data_s cec_s4_data = { .chip_id = CEC_CHIP_S4, diff --git a/drivers/media/common/arch/registers/register_map.c b/drivers/media/common/arch/registers/register_map.c index 61c305b1b..a9ff33c43 100644 --- a/drivers/media/common/arch/registers/register_map.c +++ b/drivers/media/common/arch/registers/register_map.c @@ -108,9 +108,11 @@ static struct codecio_device_data_s codecio_s4 = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct codecio_device_data_s codecio_s4d = { .cpu_id = MESON_CPU_MAJOR_ID_S4D, }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct codecio_device_data_s codecio_t3 = { @@ -232,11 +234,13 @@ static const struct of_device_id codec_io_dt_match[] = { .data = &codecio_s4, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, meson-s4d, codec-io", .data = &codecio_s4d, }, - #ifndef CONFIG_AMLOGIC_ZAPPER_CUT +#endif +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic, meson-t3, codec-io", .data = &codecio_t3, diff --git a/drivers/media/common/ge2d/ge2d_main.c b/drivers/media/common/ge2d/ge2d_main.c index 28d822c4a..1386829a8 100644 --- a/drivers/media/common/ge2d/ge2d_main.c +++ b/drivers/media/common/ge2d/ge2d_main.c @@ -1417,6 +1417,7 @@ static struct ge2d_device_data_s ge2d_t3 = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct ge2d_device_data_s ge2d_s4 = { .ge2d_rate = 500000000, .src2_alp = 1, @@ -1431,6 +1432,7 @@ static struct ge2d_device_data_s ge2d_s4 = { .adv_matrix = 1, .src2_repeat = 1, }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct ge2d_device_data_s ge2d_p1 = { @@ -1616,10 +1618,12 @@ static const struct of_device_id ge2d_dt_match[] = { .data = &ge2d_t3, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, ge2d-s4", .data = &ge2d_s4, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic, ge2d-p1", diff --git a/drivers/media/common/vpu/vpu.c b/drivers/media/common/vpu/vpu.c index 30210fff0..8d7350b36 100644 --- a/drivers/media/common/vpu/vpu.c +++ b/drivers/media/common/vpu/vpu.c @@ -1951,6 +1951,7 @@ static struct vpu_data_s vpu_data_t3 = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct vpu_data_s vpu_data_s4d = { .chip_type = VPU_CHIP_S4D, .chip_name = "s4d", @@ -1993,6 +1994,7 @@ static struct vpu_data_s vpu_data_s4d = { .clk_apply = vpu_clk_apply_dft, .clktree_init = vpu_clktree_init_dft, }; +#endif static struct vpu_data_s vpu_data_s1a = { .chip_type = VPU_CHIP_S1A, @@ -2364,10 +2366,12 @@ static const struct of_device_id vpu_of_table[] = { .data = &vpu_data_s4, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, vpu-s4d", .data = &vpu_data_s4d, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic, vpu-t3", diff --git a/drivers/media/di_multi/di_sys.c b/drivers/media/di_multi/di_sys.c index 389a28ae8..e3434bb02 100644 --- a/drivers/media/di_multi/di_sys.c +++ b/drivers/media/di_multi/di_sys.c @@ -3741,7 +3741,6 @@ static const struct di_meson_data data_s5 = { IC_SUPPORT_DW | IC_SUPPORT_TB }; -#endif static const struct di_meson_data data_t3x = { .name = "dim_t3x", @@ -3750,6 +3749,7 @@ static const struct di_meson_data data_t3x = { IC_SUPPORT_HDR | IC_SUPPORT_DW }; +#endif /* #ifdef CONFIG_USE_OF */ static const struct of_device_id amlogic_deinterlace_dt_match[] = { diff --git a/drivers/media/dtv_demod/amlfrontend.c b/drivers/media/dtv_demod/amlfrontend.c index 7e0e7d238..79af4a84d 100644 --- a/drivers/media/dtv_demod/amlfrontend.c +++ b/drivers/media/dtv_demod/amlfrontend.c @@ -1035,6 +1035,7 @@ const struct meson_ddemod_data data_t3 = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A const struct meson_ddemod_data data_s4d = { .dig_clk = { .demod_clk_ctl = 0x74, @@ -1049,6 +1050,7 @@ const struct meson_ddemod_data data_s4d = { }, .hw_ver = DTVDEMOD_HW_S4D, }; +#endif const struct meson_ddemod_data data_s1a = { .dig_clk = { @@ -1180,10 +1182,12 @@ static const struct of_device_id meson_ddemod_match[] = { .data = &data_t3, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, ddemod-s4d", .data = &data_s4d, }, +#endif { .compatible = "amlogic, ddemod-s1a", .data = &data_s1a, diff --git a/drivers/media/enhancement/amvecm/amvecm.c b/drivers/media/enhancement/amvecm/amvecm.c index 38c8f98c2..7e04776b4 100644 --- a/drivers/media/enhancement/amvecm/amvecm.c +++ b/drivers/media/enhancement/amvecm/amvecm.c @@ -11970,6 +11970,7 @@ static const struct file_operations amvecm_fops = { .poll = amvecm_poll, }; +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static const struct vecm_match_data_s vecm_dt_xxx = { .chip_id = chip_other, .chip_cls = OTHER_CLS, @@ -11980,6 +11981,7 @@ static const struct vecm_match_data_s vecm_dt_xxx = { .vlk_phlock_en = false, .vlk_pll_sel = vlock_pll_sel_tcon, }; +#endif #ifndef CONFIG_AMLOGIC_REMOVE_OLD static const struct vecm_match_data_s vecm_dt_tl1 = { @@ -12149,10 +12151,12 @@ static const struct vecm_match_data_s vecm_dt_s1a = { }; static const struct of_device_id aml_vecm_dt_match[] = { +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, vecm", .data = &vecm_dt_xxx, }, +#endif #ifndef CONFIG_AMLOGIC_REMOVE_OLD { .compatible = "amlogic, vecm-tl1", @@ -12352,9 +12356,11 @@ static void aml_vecm_dt_parse(struct amvecm_dev_s *devp, struct platform_device if (of_id) { pr_amvecm_dbg("%s", of_id->compatible); matchdata = (struct vecm_match_data_s *)of_id->data; +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else { matchdata = (struct vecm_match_data_s *)&vecm_dt_xxx; pr_amvecm_dbg("unable to get matched device\n"); +#endif } aml_vecm_match_init(matchdata); #ifndef CONFIG_AMLOGIC_ZAPPER_CUT diff --git a/drivers/media/vin/adc/adc.c b/drivers/media/vin/adc/adc.c index 42c72eb98..d655a4c67 100644 --- a/drivers/media/vin/adc/adc.c +++ b/drivers/media/vin/adc/adc.c @@ -191,6 +191,7 @@ static int adc_32m_pll_config(struct tvin_adc_dev *devp) pll_addr = &devp->plat_data->pll_addr; +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x619a50c0); adc_wr_hiu(pll_addr->adc_pll_cntl_1, 0xc3b02804); @@ -210,7 +211,9 @@ static int adc_32m_pll_config(struct tvin_adc_dev *devp) adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x313af140); usleep_range(20, 25); adc_wr_hiu(pll_addr->adc_pll_cntl_1, 0x021a4605); - } else if (devp->plat_data->chip_id >= ADC_CHIP_T5) { + } else +#endif + if (devp->plat_data->chip_id >= ADC_CHIP_T5) { adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x210504a0); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x310504a0); adc_wr_hiu(pll_addr->adc_pll_cntl_1, 0x03c00000); @@ -220,6 +223,7 @@ static int adc_32m_pll_config(struct tvin_adc_dev *devp) adc_wr_hiu(pll_addr->adc_pll_cntl_5, 0x39272000); adc_wr_hiu(pll_addr->adc_pll_cntl_6, 0x56540000); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x110504a0); +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT } else { adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x01200490); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x31200490); @@ -230,6 +234,7 @@ static int adc_32m_pll_config(struct tvin_adc_dev *devp) adc_wr_hiu(pll_addr->adc_pll_cntl_5, 0x39272000); adc_wr_hiu(pll_addr->adc_pll_cntl_6, 0x56540000); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x11010490); +#endif } return 0; } @@ -272,6 +277,7 @@ static int adc_24m_pll_config(struct tvin_adc_dev *devp) usleep_range(20, 25); adc_wr_hiu(pll_addr->adc_pll_cntl_1, 0x021a4605); #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else { adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x01200490); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x31200490); @@ -286,6 +292,7 @@ static int adc_24m_pll_config(struct tvin_adc_dev *devp) adc_wr_hiu(pll_addr->adc_pll_cntl_6, 0x56540000); usleep_range(20, 25); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x11010490); +#endif } return 0; } @@ -364,6 +371,7 @@ static int adc_dpll_dvbs_config(struct tvin_adc_dev *devp, usleep_range(20, 25); adc_wr_hiu(pll_addr->adc_pll_cntl_1, 0xc3882004); usleep_range(20, 25); +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else if (devp->plat_data->chip_id == ADC_CHIP_T5M || devp->plat_data->chip_id == ADC_CHIP_T3X) { adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x112e410e); @@ -411,6 +419,7 @@ static int adc_dpll_dvbs_config(struct tvin_adc_dev *devp, adc_wr_hiu(pll_addr->adc_pll_cntl_5, 0x3927a000); adc_wr_hiu(pll_addr->adc_pll_cntl_6, 0x56540000); adc_wr_hiu(pll_addr->adc_pll_cntl_0, 0x10050487); +#endif } return 0; } @@ -422,6 +431,7 @@ static int adc_dadc_atv_cntl_config(struct tvin_adc_dev *devp) adc_addr = &devp->plat_data->adc_addr; +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(adc_addr->dadc_cntl, 0x03132048); adc_wr_hiu(adc_addr->dadc_cntl_2, 0x401); @@ -436,17 +446,22 @@ static int adc_dadc_atv_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->s2_dadc_cntl_2, 0x00000582); adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); adc_wr_hiu(adc_addr->dadc_cntl, 0x0030307c); - } else if (devp->plat_data->chip_id >= ADC_CHIP_T5) { + } else +#endif + if (devp->plat_data->chip_id >= ADC_CHIP_T5) { adc_wr_hiu_bits(adc_addr->vdac_cntl_0, 1, 11, 1); if (devp->plat_data->chip_id >= ADC_CHIP_T5D) { adc_wr_hiu(adc_addr->s2_dadc_cntl_2, 0x00000582); adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); } adc_wr_hiu(adc_addr->dadc_cntl, 0x00303044); +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT } else { adc_wr_hiu(adc_addr->dadc_cntl, 0x00303044); +#endif } +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT if (devp->plat_data->chip_id <= ADC_CHIP_T3X) { if (devp->plat_data->chip_id >= ADC_CHIP_T3) adc_wr_hiu(adc_addr->dadc_cntl_2, 0x00003488); @@ -454,6 +469,7 @@ static int adc_dadc_atv_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->dadc_cntl_2, 0x00003480); adc_wr_hiu(adc_addr->dadc_cntl_3, 0x08300b83); } +#endif return 0; } @@ -464,6 +480,7 @@ static int adc_dadc_av_cntl_config(struct tvin_adc_dev *devp) adc_addr = &devp->plat_data->adc_addr; +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(adc_addr->dadc_cntl, 0x03132048); adc_wr_hiu(adc_addr->dadc_cntl_2, 0x400); @@ -477,14 +494,19 @@ static int adc_dadc_av_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->s2_dadc_cntl_2, 0x00000582); adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); adc_wr_hiu(adc_addr->dadc_cntl, 0x0030307c); - } else if (devp->plat_data->chip_id >= ADC_CHIP_T5D) { + } else +#endif + if (devp->plat_data->chip_id >= ADC_CHIP_T5D) { adc_wr_hiu(adc_addr->s2_dadc_cntl_2, 0x00000582); adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); adc_wr_hiu(adc_addr->dadc_cntl, 0x00303044); +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT } else { adc_wr_hiu(adc_addr->dadc_cntl, 0x00303044); +#endif } +#ifndef CONFIG_AMLOGIC_ZAPPER_CUT if (devp->plat_data->chip_id <= ADC_CHIP_T3X) { if (devp->plat_data->chip_id >= ADC_CHIP_T5) adc_wr_hiu_bits(adc_addr->vdac_cntl_0, 1, 11, 1); @@ -495,6 +517,7 @@ static int adc_dadc_av_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->dadc_cntl_2, 0x00003400); adc_wr_hiu(adc_addr->dadc_cntl_3, 0x08300b83); } +#endif return 0; } @@ -508,6 +531,7 @@ static int adc_dadc_other_dtv_cntl_config(struct tvin_adc_dev *devp) /* enable bandgap */ adc_wr_hiu_bits(adc_addr->vdac_cntl_0, 0x982, 0, 12); adc_wr_hiu(adc_addr->s2_dadc_cntl, 0x308e3106); +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(adc_addr->dadc_cntl, 0x03132048); adc_wr_hiu(adc_addr->dadc_cntl_2, 0x401); @@ -531,6 +555,7 @@ static int adc_dadc_other_dtv_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->dadc_cntl_3, 0x08300b83); adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); +#endif } return 0; } @@ -546,6 +571,7 @@ static int adc_dadc_dvbs_cntl_config(struct tvin_adc_dev *devp) /* enable bandgap */ adc_wr_hiu_bits(adc_addr->vdac_cntl_0, 0x982, 0, 12); adc_wr_hiu(adc_addr->s2_dadc_cntl, 0x302c3007); +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A } else if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(adc_addr->dadc_cntl, 0x03132048); adc_wr_hiu(adc_addr->dadc_cntl_2, 0x401); @@ -574,6 +600,7 @@ static int adc_dadc_dvbs_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->dadc_cntl_4, 0x0); /* only for debug to clkmsr(id:149) */ /* adc_wr_hiu(adc_addr->dadc_cntl_3, 0x08300b8f); */ +#endif } return 0; } @@ -585,6 +612,7 @@ static int adc_dadc_dvbt_cntl_config(struct tvin_adc_dev *devp) adc_addr = &devp->plat_data->adc_addr; +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A if (devp->plat_data->chip_id == ADC_CHIP_TXHD2) { adc_wr_hiu(adc_addr->dadc_cntl, 0x03132048); adc_wr_hiu(adc_addr->dadc_cntl_2, 0x401); @@ -596,10 +624,13 @@ static int adc_dadc_dvbt_cntl_config(struct tvin_adc_dev *devp) } else if (devp->plat_data->chip_id == ADC_CHIP_T5M || devp->plat_data->chip_id == ADC_CHIP_T3X) { adc_wr_hiu(adc_addr->dadc_cntl, 0x0030307c); - } else { + } else +#endif + { adc_wr_hiu(adc_addr->dadc_cntl, 0x0030303c); } +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A if (devp->plat_data->chip_id <= ADC_CHIP_T3X) { if (devp->plat_data->chip_id >= ADC_CHIP_T3) adc_wr_hiu(adc_addr->dadc_cntl_2, 0x00003448); @@ -610,9 +641,11 @@ static int adc_dadc_dvbt_cntl_config(struct tvin_adc_dev *devp) adc_wr_hiu(adc_addr->dadc_cntl_3, 0x08300b93); adc_wr_hiu(adc_addr->dadc_cntl_4, 0xc00); } +#endif return 0; } +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A //s4/s4d box framework config DTV but not DVBS/S2 DVBT/T2 format static int adc_dadc_box_other_dtv_cntl_config(struct tvin_adc_dev *devp) { @@ -631,6 +664,7 @@ static int adc_dadc_box_other_dtv_cntl_config(struct tvin_adc_dev *devp) return 0; } +#endif static void adc_av_filter_config(struct tvin_adc_dev *devp) { @@ -771,10 +805,12 @@ void adc_set_ddemod_default(enum fe_delivery_system delsys) adc_wr_hiu(adc_addr->s2_dadc_cntl_2, 0x00000582); break; +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A case ADC_CHIP_S4: case ADC_CHIP_S4D: adc_dadc_box_other_dtv_cntl_config(devp); break; +#endif default: adc_other_dtv_filter_config(devp); if (devp->plat_data->chip_id >= ADC_CHIP_TXHD2) { @@ -1783,12 +1819,14 @@ static const struct adc_platform_data_s adc_data_t3 = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static const struct adc_platform_data_s adc_data_s4d = { ADC_ADDR_TL1_TO_S4, ADC_PLL_ADDR_TL1, .chip_id = ADC_CHIP_S4D, .is_tv_chip = false, }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static const struct adc_platform_data_s adc_data_t5w = { @@ -1868,10 +1906,12 @@ static const struct of_device_id adc_dt_match[] = { .data = &adc_data_t3, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, adc-s4d", .data = &adc_data_s4d, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic, adc-t5w", diff --git a/drivers/media/vout/vdac/vdac_config.c b/drivers/media/vout/vdac/vdac_config.c index 3549b7272..4276b515c 100644 --- a/drivers/media/vout/vdac/vdac_config.c +++ b/drivers/media/vout/vdac/vdac_config.c @@ -190,6 +190,7 @@ static struct meson_vdac_data meson_t3_vdac_data = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct meson_vdac_data meson_s4d_vdac_data = { .cpu_id = VDAC_CPU_S4D, .name = "meson-s4d-vdac", @@ -200,6 +201,7 @@ static struct meson_vdac_data meson_s4d_vdac_data = { .reg_vid2_clk_div = CLKCTRL_VIID_CLK_DIV, .ctrl_table = vdac_ctrl_enable_s4, }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct meson_vdac_data meson_t5w_vdac_data = { @@ -309,10 +311,12 @@ const struct of_device_id meson_vdac_dt_match[] = { .data = &meson_t3_vdac_data, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, vdac-s4d", .data = &meson_s4d_vdac_data, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic, vdac-t5w", diff --git a/drivers/memory_debug/ddr_tool/ddr_port_desc.c b/drivers/memory_debug/ddr_tool/ddr_port_desc.c index e07fe088c..4447d3379 100644 --- a/drivers/memory_debug/ddr_tool/ddr_port_desc.c +++ b/drivers/memory_debug/ddr_tool/ddr_port_desc.c @@ -718,6 +718,7 @@ static struct ddr_port_desc ddr_port_desc_t3[] __initdata = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct ddr_port_desc ddr_port_desc_s4[] __initdata = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI" }, @@ -748,6 +749,7 @@ static struct ddr_port_desc ddr_port_desc_s4[] __initdata = { { .port_id = 45, .port_name = "ETHERNET" }, { .port_id = 47, .port_name = "DEMOD" } }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct ddr_port_desc ddr_port_desc_sc2[] __initdata = { @@ -1211,11 +1213,12 @@ int __init ddr_find_port_desc_type(int cpu_type, struct ddr_port_desc **desc, in desc_size = ARRAY_SIZE(ddr_port_desc_t3); break; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A case DMC_TYPE_S4: *desc = ddr_port_desc_s4; desc_size = ARRAY_SIZE(ddr_port_desc_s4); break; - +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT case DMC_TYPE_SC2: *desc = ddr_port_desc_sc2; diff --git a/drivers/memory_debug/ddr_tool/ddr_priority.c b/drivers/memory_debug/ddr_tool/ddr_priority.c index b3b0f51a2..719dffc5b 100644 --- a/drivers/memory_debug/ddr_tool/ddr_priority.c +++ b/drivers/memory_debug/ddr_tool/ddr_priority.c @@ -17,6 +17,7 @@ #define PRIORITY_NUM (aml_db->ddr_priority_num & 0xffff) +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct ddr_priority ddr_priority_s4[] __initdata = { { .port_id = 0, .reg_base = 0xfe036000, .reg_mode = 0, .reg_config = 0, @@ -93,6 +94,7 @@ static struct ddr_priority ddr_priority_s4[] __initdata = { .w_offset = (0x7c << 2), .w_bit_s = 16, .w_width = 0x7, .r_offset = (0x7c << 2), .r_bit_s = 16, .r_width = 0x7 } }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct ddr_priority ddr_priority_t7[] __initdata = { @@ -871,10 +873,12 @@ int __init ddr_find_port_priority(int cpu_type, struct ddr_priority **desc) desc_size = ARRAY_SIZE(ddr_priority_t7); break; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A case DMC_TYPE_S4: *desc = ddr_priority_s4; desc_size = ARRAY_SIZE(ddr_priority_s4); break; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT case DMC_TYPE_S5: *desc = ddr_priority_s5; diff --git a/drivers/memory_debug/ddr_tool/dmc_monitor.c b/drivers/memory_debug/ddr_tool/dmc_monitor.c index f865d7374..77fd4c17c 100644 --- a/drivers/memory_debug/ddr_tool/dmc_monitor.c +++ b/drivers/memory_debug/ddr_tool/dmc_monitor.c @@ -1451,10 +1451,12 @@ static const struct of_device_id dmc_monitor_match[] = { .data = (void *)DMC_TYPE_P1, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic,dmc_monitor-s4", .data = (void *)DMC_TYPE_S4, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic,dmc_monitor-sc2", diff --git a/drivers/power/sec_power_domain.c b/drivers/power/sec_power_domain.c index 08eabbeb2..48b2932a2 100644 --- a/drivers/power/sec_power_domain.c +++ b/drivers/power/sec_power_domain.c @@ -327,6 +327,7 @@ static struct sec_pm_domain_data t7_pm_domain_data __initdata = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct sec_pm_private_domain s4_pm_domains[] __initdata = { [PDID_S4_DOS_HEVC] = POWER_DOMAIN(hevc, PDID_S4_DOS_HEVC, DOMAIN_INIT_OFF, 0), [PDID_S4_DOS_VDEC] = POWER_DOMAIN(vdec, PDID_S4_DOS_VDEC, DOMAIN_INIT_OFF, 0), @@ -343,6 +344,7 @@ static struct sec_pm_domain_data s4_pm_domain_data __initdata = { .domains = s4_pm_domains, .domains_count = ARRAY_SIZE(s4_pm_domains), }; +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT static struct sec_pm_private_domain s5_pm_domains[] = { @@ -815,10 +817,12 @@ static const struct of_device_id pd_match_table[] = { .data = &t7_pm_domain_data, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic,s4-power-domain", .data = &s4_pm_domain_data, }, +#endif #ifndef CONFIG_AMLOGIC_ZAPPER_CUT { .compatible = "amlogic,t3-power-domain", diff --git a/sound/soc/amlogic/Makefile b/sound/soc/amlogic/Makefile index 18a0af32e..d8539f3a9 100644 --- a/sound/soc/amlogic/Makefile +++ b/sound/soc/amlogic/Makefile @@ -33,7 +33,9 @@ $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/clks/clk-t3x.o $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/clks/clk-txhd2.o endif $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/clks/clk-s1a.o +ifndef CONFIG_AMLOGIC_ZAPPER_C1A $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/clks/clk-sc2.o +endif $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/clks/audio_clks.o $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/audio_controller.o $(MODULE_NAME)-$(CONFIG_AMLOGIC_SND_SOC_AUGE) += auge/audio_io.o diff --git a/sound/soc/amlogic/auge/clks/audio_clks.c b/sound/soc/amlogic/auge/clks/audio_clks.c index ea4ae4c23..114bf1614 100644 --- a/sound/soc/amlogic/auge/clks/audio_clks.c +++ b/sound/soc/amlogic/auge/clks/audio_clks.c @@ -34,10 +34,12 @@ static const struct of_device_id audio_clocks_of_match[] = { .data = &tm2_audio_clks_init, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, sc2-audio-clocks", .data = &sc2_audio_clks_init, }, +#endif { .compatible = "amlogic, s1a-audio-clocks", .data = &s1a_audio_clks_init, diff --git a/sound/soc/amlogic/auge/ddr_mngr.c b/sound/soc/amlogic/auge/ddr_mngr.c index dc4d9114f..bed8d0faf 100644 --- a/sound/soc/amlogic/auge/ddr_mngr.c +++ b/sound/soc/amlogic/auge/ddr_mngr.c @@ -2272,6 +2272,7 @@ static struct ddr_chipinfo c2_ddr_chipinfo = { }; #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A static struct ddr_chipinfo t5_ddr_chipinfo = { .same_src_fn = true, .ugt = true, @@ -2288,6 +2289,7 @@ static struct ddr_chipinfo t5_ddr_chipinfo = { .fr_reset_reg_offset = &fr_reset_reg_offset_array_v2[0], .fr_reset_reg_shift = &fr_reset_reg_shift_array_v2[0], }; +#endif static struct ddr_chipinfo s1a_ddr_chipinfo = { .same_src_fn = true, @@ -2418,10 +2420,12 @@ static const struct of_device_id aml_ddr_mngr_device_id[] = { .data = &c2_ddr_chipinfo, }, #endif +#ifndef CONFIG_AMLOGIC_ZAPPER_C1A { .compatible = "amlogic, t5-audio-ddr-manager", .data = &t5_ddr_chipinfo, }, +#endif { .compatible = "amlogic, s1a-audio-ddr-manager", .data = &s1a_ddr_chipinfo,