clk: meson: migrate meson-eeclk out of hw_onecell_data to drop NR_CLKS
[platform/kernel/linux-starfive.git] / drivers / clk / meson / gxbb.c
index 608e0e8..116fcb6 100644 (file)
@@ -2728,428 +2728,420 @@ static MESON_PCLK(gxbb_adc, HHI_GCLK_MPEG1, 13, &gxbb_aiu_glue.hw);
 
 /* Array of all clocks provided by this provider */
 
-static struct clk_hw_onecell_data gxbb_hw_onecell_data = {
-       .hws = {
-               [CLKID_SYS_PLL]             = &gxbb_sys_pll.hw,
-               [CLKID_HDMI_PLL]            = &gxbb_hdmi_pll.hw,
-               [CLKID_FIXED_PLL]           = &gxbb_fixed_pll.hw,
-               [CLKID_FCLK_DIV2]           = &gxbb_fclk_div2.hw,
-               [CLKID_FCLK_DIV3]           = &gxbb_fclk_div3.hw,
-               [CLKID_FCLK_DIV4]           = &gxbb_fclk_div4.hw,
-               [CLKID_FCLK_DIV5]           = &gxbb_fclk_div5.hw,
-               [CLKID_FCLK_DIV7]           = &gxbb_fclk_div7.hw,
-               [CLKID_GP0_PLL]             = &gxbb_gp0_pll.hw,
-               [CLKID_MPEG_SEL]            = &gxbb_mpeg_clk_sel.hw,
-               [CLKID_MPEG_DIV]            = &gxbb_mpeg_clk_div.hw,
-               [CLKID_CLK81]               = &gxbb_clk81.hw,
-               [CLKID_MPLL0]               = &gxbb_mpll0.hw,
-               [CLKID_MPLL1]               = &gxbb_mpll1.hw,
-               [CLKID_MPLL2]               = &gxbb_mpll2.hw,
-               [CLKID_DDR]                 = &gxbb_ddr.hw,
-               [CLKID_DOS]                 = &gxbb_dos.hw,
-               [CLKID_ISA]                 = &gxbb_isa.hw,
-               [CLKID_PL301]               = &gxbb_pl301.hw,
-               [CLKID_PERIPHS]             = &gxbb_periphs.hw,
-               [CLKID_SPICC]               = &gxbb_spicc.hw,
-               [CLKID_I2C]                 = &gxbb_i2c.hw,
-               [CLKID_SAR_ADC]             = &gxbb_sar_adc.hw,
-               [CLKID_SMART_CARD]          = &gxbb_smart_card.hw,
-               [CLKID_RNG0]                = &gxbb_rng0.hw,
-               [CLKID_UART0]               = &gxbb_uart0.hw,
-               [CLKID_SDHC]                = &gxbb_sdhc.hw,
-               [CLKID_STREAM]              = &gxbb_stream.hw,
-               [CLKID_ASYNC_FIFO]          = &gxbb_async_fifo.hw,
-               [CLKID_SDIO]                = &gxbb_sdio.hw,
-               [CLKID_ABUF]                = &gxbb_abuf.hw,
-               [CLKID_HIU_IFACE]           = &gxbb_hiu_iface.hw,
-               [CLKID_ASSIST_MISC]         = &gxbb_assist_misc.hw,
-               [CLKID_SPI]                 = &gxbb_spi.hw,
-               [CLKID_I2S_SPDIF]           = &gxbb_i2s_spdif.hw,
-               [CLKID_ETH]                 = &gxbb_eth.hw,
-               [CLKID_DEMUX]               = &gxbb_demux.hw,
-               [CLKID_AIU_GLUE]            = &gxbb_aiu_glue.hw,
-               [CLKID_IEC958]              = &gxbb_iec958.hw,
-               [CLKID_I2S_OUT]             = &gxbb_i2s_out.hw,
-               [CLKID_AMCLK]               = &gxbb_amclk.hw,
-               [CLKID_AIFIFO2]             = &gxbb_aififo2.hw,
-               [CLKID_MIXER]               = &gxbb_mixer.hw,
-               [CLKID_MIXER_IFACE]         = &gxbb_mixer_iface.hw,
-               [CLKID_ADC]                 = &gxbb_adc.hw,
-               [CLKID_BLKMV]               = &gxbb_blkmv.hw,
-               [CLKID_AIU]                 = &gxbb_aiu.hw,
-               [CLKID_UART1]               = &gxbb_uart1.hw,
-               [CLKID_G2D]                 = &gxbb_g2d.hw,
-               [CLKID_USB0]                = &gxbb_usb0.hw,
-               [CLKID_USB1]                = &gxbb_usb1.hw,
-               [CLKID_RESET]               = &gxbb_reset.hw,
-               [CLKID_NAND]                = &gxbb_nand.hw,
-               [CLKID_DOS_PARSER]          = &gxbb_dos_parser.hw,
-               [CLKID_USB]                 = &gxbb_usb.hw,
-               [CLKID_VDIN1]               = &gxbb_vdin1.hw,
-               [CLKID_AHB_ARB0]            = &gxbb_ahb_arb0.hw,
-               [CLKID_EFUSE]               = &gxbb_efuse.hw,
-               [CLKID_BOOT_ROM]            = &gxbb_boot_rom.hw,
-               [CLKID_AHB_DATA_BUS]        = &gxbb_ahb_data_bus.hw,
-               [CLKID_AHB_CTRL_BUS]        = &gxbb_ahb_ctrl_bus.hw,
-               [CLKID_HDMI_INTR_SYNC]      = &gxbb_hdmi_intr_sync.hw,
-               [CLKID_HDMI_PCLK]           = &gxbb_hdmi_pclk.hw,
-               [CLKID_USB1_DDR_BRIDGE]     = &gxbb_usb1_ddr_bridge.hw,
-               [CLKID_USB0_DDR_BRIDGE]     = &gxbb_usb0_ddr_bridge.hw,
-               [CLKID_MMC_PCLK]            = &gxbb_mmc_pclk.hw,
-               [CLKID_DVIN]                = &gxbb_dvin.hw,
-               [CLKID_UART2]               = &gxbb_uart2.hw,
-               [CLKID_SANA]                = &gxbb_sana.hw,
-               [CLKID_VPU_INTR]            = &gxbb_vpu_intr.hw,
-               [CLKID_SEC_AHB_AHB3_BRIDGE] = &gxbb_sec_ahb_ahb3_bridge.hw,
-               [CLKID_CLK81_A53]           = &gxbb_clk81_a53.hw,
-               [CLKID_VCLK2_VENCI0]        = &gxbb_vclk2_venci0.hw,
-               [CLKID_VCLK2_VENCI1]        = &gxbb_vclk2_venci1.hw,
-               [CLKID_VCLK2_VENCP0]        = &gxbb_vclk2_vencp0.hw,
-               [CLKID_VCLK2_VENCP1]        = &gxbb_vclk2_vencp1.hw,
-               [CLKID_GCLK_VENCI_INT0]     = &gxbb_gclk_venci_int0.hw,
-               [CLKID_GCLK_VENCI_INT]      = &gxbb_gclk_vencp_int.hw,
-               [CLKID_DAC_CLK]             = &gxbb_dac_clk.hw,
-               [CLKID_AOCLK_GATE]          = &gxbb_aoclk_gate.hw,
-               [CLKID_IEC958_GATE]         = &gxbb_iec958_gate.hw,
-               [CLKID_ENC480P]             = &gxbb_enc480p.hw,
-               [CLKID_RNG1]                = &gxbb_rng1.hw,
-               [CLKID_GCLK_VENCI_INT1]     = &gxbb_gclk_venci_int1.hw,
-               [CLKID_VCLK2_VENCLMCC]      = &gxbb_vclk2_venclmcc.hw,
-               [CLKID_VCLK2_VENCL]         = &gxbb_vclk2_vencl.hw,
-               [CLKID_VCLK_OTHER]          = &gxbb_vclk_other.hw,
-               [CLKID_EDP]                 = &gxbb_edp.hw,
-               [CLKID_AO_MEDIA_CPU]        = &gxbb_ao_media_cpu.hw,
-               [CLKID_AO_AHB_SRAM]         = &gxbb_ao_ahb_sram.hw,
-               [CLKID_AO_AHB_BUS]          = &gxbb_ao_ahb_bus.hw,
-               [CLKID_AO_IFACE]            = &gxbb_ao_iface.hw,
-               [CLKID_AO_I2C]              = &gxbb_ao_i2c.hw,
-               [CLKID_SD_EMMC_A]           = &gxbb_emmc_a.hw,
-               [CLKID_SD_EMMC_B]           = &gxbb_emmc_b.hw,
-               [CLKID_SD_EMMC_C]           = &gxbb_emmc_c.hw,
-               [CLKID_SAR_ADC_CLK]         = &gxbb_sar_adc_clk.hw,
-               [CLKID_SAR_ADC_SEL]         = &gxbb_sar_adc_clk_sel.hw,
-               [CLKID_SAR_ADC_DIV]         = &gxbb_sar_adc_clk_div.hw,
-               [CLKID_MALI_0_SEL]          = &gxbb_mali_0_sel.hw,
-               [CLKID_MALI_0_DIV]          = &gxbb_mali_0_div.hw,
-               [CLKID_MALI_0]              = &gxbb_mali_0.hw,
-               [CLKID_MALI_1_SEL]          = &gxbb_mali_1_sel.hw,
-               [CLKID_MALI_1_DIV]          = &gxbb_mali_1_div.hw,
-               [CLKID_MALI_1]              = &gxbb_mali_1.hw,
-               [CLKID_MALI]                = &gxbb_mali.hw,
-               [CLKID_CTS_AMCLK]           = &gxbb_cts_amclk.hw,
-               [CLKID_CTS_AMCLK_SEL]       = &gxbb_cts_amclk_sel.hw,
-               [CLKID_CTS_AMCLK_DIV]       = &gxbb_cts_amclk_div.hw,
-               [CLKID_CTS_MCLK_I958]       = &gxbb_cts_mclk_i958.hw,
-               [CLKID_CTS_MCLK_I958_SEL]   = &gxbb_cts_mclk_i958_sel.hw,
-               [CLKID_CTS_MCLK_I958_DIV]   = &gxbb_cts_mclk_i958_div.hw,
-               [CLKID_CTS_I958]            = &gxbb_cts_i958.hw,
-               [CLKID_32K_CLK]             = &gxbb_32k_clk.hw,
-               [CLKID_32K_CLK_SEL]         = &gxbb_32k_clk_sel.hw,
-               [CLKID_32K_CLK_DIV]         = &gxbb_32k_clk_div.hw,
-               [CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
-               [CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
-               [CLKID_SD_EMMC_A_CLK0]      = &gxbb_sd_emmc_a_clk0.hw,
-               [CLKID_SD_EMMC_B_CLK0_SEL]  = &gxbb_sd_emmc_b_clk0_sel.hw,
-               [CLKID_SD_EMMC_B_CLK0_DIV]  = &gxbb_sd_emmc_b_clk0_div.hw,
-               [CLKID_SD_EMMC_B_CLK0]      = &gxbb_sd_emmc_b_clk0.hw,
-               [CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
-               [CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
-               [CLKID_SD_EMMC_C_CLK0]      = &gxbb_sd_emmc_c_clk0.hw,
-               [CLKID_VPU_0_SEL]           = &gxbb_vpu_0_sel.hw,
-               [CLKID_VPU_0_DIV]           = &gxbb_vpu_0_div.hw,
-               [CLKID_VPU_0]               = &gxbb_vpu_0.hw,
-               [CLKID_VPU_1_SEL]           = &gxbb_vpu_1_sel.hw,
-               [CLKID_VPU_1_DIV]           = &gxbb_vpu_1_div.hw,
-               [CLKID_VPU_1]               = &gxbb_vpu_1.hw,
-               [CLKID_VPU]                 = &gxbb_vpu.hw,
-               [CLKID_VAPB_0_SEL]          = &gxbb_vapb_0_sel.hw,
-               [CLKID_VAPB_0_DIV]          = &gxbb_vapb_0_div.hw,
-               [CLKID_VAPB_0]              = &gxbb_vapb_0.hw,
-               [CLKID_VAPB_1_SEL]          = &gxbb_vapb_1_sel.hw,
-               [CLKID_VAPB_1_DIV]          = &gxbb_vapb_1_div.hw,
-               [CLKID_VAPB_1]              = &gxbb_vapb_1.hw,
-               [CLKID_VAPB_SEL]            = &gxbb_vapb_sel.hw,
-               [CLKID_VAPB]                = &gxbb_vapb.hw,
-               [CLKID_HDMI_PLL_PRE_MULT]   = &gxbb_hdmi_pll_pre_mult.hw,
-               [CLKID_MPLL0_DIV]           = &gxbb_mpll0_div.hw,
-               [CLKID_MPLL1_DIV]           = &gxbb_mpll1_div.hw,
-               [CLKID_MPLL2_DIV]           = &gxbb_mpll2_div.hw,
-               [CLKID_MPLL_PREDIV]         = &gxbb_mpll_prediv.hw,
-               [CLKID_FCLK_DIV2_DIV]       = &gxbb_fclk_div2_div.hw,
-               [CLKID_FCLK_DIV3_DIV]       = &gxbb_fclk_div3_div.hw,
-               [CLKID_FCLK_DIV4_DIV]       = &gxbb_fclk_div4_div.hw,
-               [CLKID_FCLK_DIV5_DIV]       = &gxbb_fclk_div5_div.hw,
-               [CLKID_FCLK_DIV7_DIV]       = &gxbb_fclk_div7_div.hw,
-               [CLKID_VDEC_1_SEL]          = &gxbb_vdec_1_sel.hw,
-               [CLKID_VDEC_1_DIV]          = &gxbb_vdec_1_div.hw,
-               [CLKID_VDEC_1]              = &gxbb_vdec_1.hw,
-               [CLKID_VDEC_HEVC_SEL]       = &gxbb_vdec_hevc_sel.hw,
-               [CLKID_VDEC_HEVC_DIV]       = &gxbb_vdec_hevc_div.hw,
-               [CLKID_VDEC_HEVC]           = &gxbb_vdec_hevc.hw,
-               [CLKID_GEN_CLK_SEL]         = &gxbb_gen_clk_sel.hw,
-               [CLKID_GEN_CLK_DIV]         = &gxbb_gen_clk_div.hw,
-               [CLKID_GEN_CLK]             = &gxbb_gen_clk.hw,
-               [CLKID_FIXED_PLL_DCO]       = &gxbb_fixed_pll_dco.hw,
-               [CLKID_HDMI_PLL_DCO]        = &gxbb_hdmi_pll_dco.hw,
-               [CLKID_HDMI_PLL_OD]         = &gxbb_hdmi_pll_od.hw,
-               [CLKID_HDMI_PLL_OD2]        = &gxbb_hdmi_pll_od2.hw,
-               [CLKID_SYS_PLL_DCO]         = &gxbb_sys_pll_dco.hw,
-               [CLKID_GP0_PLL_DCO]         = &gxbb_gp0_pll_dco.hw,
-               [CLKID_VID_PLL_DIV]         = &gxbb_vid_pll_div.hw,
-               [CLKID_VID_PLL_SEL]         = &gxbb_vid_pll_sel.hw,
-               [CLKID_VID_PLL]             = &gxbb_vid_pll.hw,
-               [CLKID_VCLK_SEL]            = &gxbb_vclk_sel.hw,
-               [CLKID_VCLK2_SEL]           = &gxbb_vclk2_sel.hw,
-               [CLKID_VCLK_INPUT]          = &gxbb_vclk_input.hw,
-               [CLKID_VCLK2_INPUT]         = &gxbb_vclk2_input.hw,
-               [CLKID_VCLK_DIV]            = &gxbb_vclk_div.hw,
-               [CLKID_VCLK2_DIV]           = &gxbb_vclk2_div.hw,
-               [CLKID_VCLK]                = &gxbb_vclk.hw,
-               [CLKID_VCLK2]               = &gxbb_vclk2.hw,
-               [CLKID_VCLK_DIV1]           = &gxbb_vclk_div1.hw,
-               [CLKID_VCLK_DIV2_EN]        = &gxbb_vclk_div2_en.hw,
-               [CLKID_VCLK_DIV2]           = &gxbb_vclk_div2.hw,
-               [CLKID_VCLK_DIV4_EN]        = &gxbb_vclk_div4_en.hw,
-               [CLKID_VCLK_DIV4]           = &gxbb_vclk_div4.hw,
-               [CLKID_VCLK_DIV6_EN]        = &gxbb_vclk_div6_en.hw,
-               [CLKID_VCLK_DIV6]           = &gxbb_vclk_div6.hw,
-               [CLKID_VCLK_DIV12_EN]       = &gxbb_vclk_div12_en.hw,
-               [CLKID_VCLK_DIV12]          = &gxbb_vclk_div12.hw,
-               [CLKID_VCLK2_DIV1]          = &gxbb_vclk2_div1.hw,
-               [CLKID_VCLK2_DIV2_EN]       = &gxbb_vclk2_div2_en.hw,
-               [CLKID_VCLK2_DIV2]          = &gxbb_vclk2_div2.hw,
-               [CLKID_VCLK2_DIV4_EN]       = &gxbb_vclk2_div4_en.hw,
-               [CLKID_VCLK2_DIV4]          = &gxbb_vclk2_div4.hw,
-               [CLKID_VCLK2_DIV6_EN]       = &gxbb_vclk2_div6_en.hw,
-               [CLKID_VCLK2_DIV6]          = &gxbb_vclk2_div6.hw,
-               [CLKID_VCLK2_DIV12_EN]      = &gxbb_vclk2_div12_en.hw,
-               [CLKID_VCLK2_DIV12]         = &gxbb_vclk2_div12.hw,
-               [CLKID_CTS_ENCI_SEL]        = &gxbb_cts_enci_sel.hw,
-               [CLKID_CTS_ENCP_SEL]        = &gxbb_cts_encp_sel.hw,
-               [CLKID_CTS_VDAC_SEL]        = &gxbb_cts_vdac_sel.hw,
-               [CLKID_HDMI_TX_SEL]         = &gxbb_hdmi_tx_sel.hw,
-               [CLKID_CTS_ENCI]            = &gxbb_cts_enci.hw,
-               [CLKID_CTS_ENCP]            = &gxbb_cts_encp.hw,
-               [CLKID_CTS_VDAC]            = &gxbb_cts_vdac.hw,
-               [CLKID_HDMI_TX]             = &gxbb_hdmi_tx.hw,
-               [CLKID_HDMI_SEL]            = &gxbb_hdmi_sel.hw,
-               [CLKID_HDMI_DIV]            = &gxbb_hdmi_div.hw,
-               [CLKID_HDMI]                = &gxbb_hdmi.hw,
-               [NR_CLKS]                   = NULL,
-       },
-       .num = NR_CLKS,
-};
-
-static struct clk_hw_onecell_data gxl_hw_onecell_data = {
-       .hws = {
-               [CLKID_SYS_PLL]             = &gxbb_sys_pll.hw,
-               [CLKID_HDMI_PLL]            = &gxl_hdmi_pll.hw,
-               [CLKID_FIXED_PLL]           = &gxbb_fixed_pll.hw,
-               [CLKID_FCLK_DIV2]           = &gxbb_fclk_div2.hw,
-               [CLKID_FCLK_DIV3]           = &gxbb_fclk_div3.hw,
-               [CLKID_FCLK_DIV4]           = &gxbb_fclk_div4.hw,
-               [CLKID_FCLK_DIV5]           = &gxbb_fclk_div5.hw,
-               [CLKID_FCLK_DIV7]           = &gxbb_fclk_div7.hw,
-               [CLKID_GP0_PLL]             = &gxbb_gp0_pll.hw,
-               [CLKID_MPEG_SEL]            = &gxbb_mpeg_clk_sel.hw,
-               [CLKID_MPEG_DIV]            = &gxbb_mpeg_clk_div.hw,
-               [CLKID_CLK81]               = &gxbb_clk81.hw,
-               [CLKID_MPLL0]               = &gxbb_mpll0.hw,
-               [CLKID_MPLL1]               = &gxbb_mpll1.hw,
-               [CLKID_MPLL2]               = &gxbb_mpll2.hw,
-               [CLKID_DDR]                 = &gxbb_ddr.hw,
-               [CLKID_DOS]                 = &gxbb_dos.hw,
-               [CLKID_ISA]                 = &gxbb_isa.hw,
-               [CLKID_PL301]               = &gxbb_pl301.hw,
-               [CLKID_PERIPHS]             = &gxbb_periphs.hw,
-               [CLKID_SPICC]               = &gxbb_spicc.hw,
-               [CLKID_I2C]                 = &gxbb_i2c.hw,
-               [CLKID_SAR_ADC]             = &gxbb_sar_adc.hw,
-               [CLKID_SMART_CARD]          = &gxbb_smart_card.hw,
-               [CLKID_RNG0]                = &gxbb_rng0.hw,
-               [CLKID_UART0]               = &gxbb_uart0.hw,
-               [CLKID_SDHC]                = &gxbb_sdhc.hw,
-               [CLKID_STREAM]              = &gxbb_stream.hw,
-               [CLKID_ASYNC_FIFO]          = &gxbb_async_fifo.hw,
-               [CLKID_SDIO]                = &gxbb_sdio.hw,
-               [CLKID_ABUF]                = &gxbb_abuf.hw,
-               [CLKID_HIU_IFACE]           = &gxbb_hiu_iface.hw,
-               [CLKID_ASSIST_MISC]         = &gxbb_assist_misc.hw,
-               [CLKID_SPI]                 = &gxbb_spi.hw,
-               [CLKID_I2S_SPDIF]           = &gxbb_i2s_spdif.hw,
-               [CLKID_ETH]                 = &gxbb_eth.hw,
-               [CLKID_DEMUX]               = &gxbb_demux.hw,
-               [CLKID_AIU_GLUE]            = &gxbb_aiu_glue.hw,
-               [CLKID_IEC958]              = &gxbb_iec958.hw,
-               [CLKID_I2S_OUT]             = &gxbb_i2s_out.hw,
-               [CLKID_AMCLK]               = &gxbb_amclk.hw,
-               [CLKID_AIFIFO2]             = &gxbb_aififo2.hw,
-               [CLKID_MIXER]               = &gxbb_mixer.hw,
-               [CLKID_MIXER_IFACE]         = &gxbb_mixer_iface.hw,
-               [CLKID_ADC]                 = &gxbb_adc.hw,
-               [CLKID_BLKMV]               = &gxbb_blkmv.hw,
-               [CLKID_AIU]                 = &gxbb_aiu.hw,
-               [CLKID_UART1]               = &gxbb_uart1.hw,
-               [CLKID_G2D]                 = &gxbb_g2d.hw,
-               [CLKID_USB0]                = &gxbb_usb0.hw,
-               [CLKID_USB1]                = &gxbb_usb1.hw,
-               [CLKID_RESET]               = &gxbb_reset.hw,
-               [CLKID_NAND]                = &gxbb_nand.hw,
-               [CLKID_DOS_PARSER]          = &gxbb_dos_parser.hw,
-               [CLKID_USB]                 = &gxbb_usb.hw,
-               [CLKID_VDIN1]               = &gxbb_vdin1.hw,
-               [CLKID_AHB_ARB0]            = &gxbb_ahb_arb0.hw,
-               [CLKID_EFUSE]               = &gxbb_efuse.hw,
-               [CLKID_BOOT_ROM]            = &gxbb_boot_rom.hw,
-               [CLKID_AHB_DATA_BUS]        = &gxbb_ahb_data_bus.hw,
-               [CLKID_AHB_CTRL_BUS]        = &gxbb_ahb_ctrl_bus.hw,
-               [CLKID_HDMI_INTR_SYNC]      = &gxbb_hdmi_intr_sync.hw,
-               [CLKID_HDMI_PCLK]           = &gxbb_hdmi_pclk.hw,
-               [CLKID_USB1_DDR_BRIDGE]     = &gxbb_usb1_ddr_bridge.hw,
-               [CLKID_USB0_DDR_BRIDGE]     = &gxbb_usb0_ddr_bridge.hw,
-               [CLKID_MMC_PCLK]            = &gxbb_mmc_pclk.hw,
-               [CLKID_DVIN]                = &gxbb_dvin.hw,
-               [CLKID_UART2]               = &gxbb_uart2.hw,
-               [CLKID_SANA]                = &gxbb_sana.hw,
-               [CLKID_VPU_INTR]            = &gxbb_vpu_intr.hw,
-               [CLKID_SEC_AHB_AHB3_BRIDGE] = &gxbb_sec_ahb_ahb3_bridge.hw,
-               [CLKID_CLK81_A53]           = &gxbb_clk81_a53.hw,
-               [CLKID_VCLK2_VENCI0]        = &gxbb_vclk2_venci0.hw,
-               [CLKID_VCLK2_VENCI1]        = &gxbb_vclk2_venci1.hw,
-               [CLKID_VCLK2_VENCP0]        = &gxbb_vclk2_vencp0.hw,
-               [CLKID_VCLK2_VENCP1]        = &gxbb_vclk2_vencp1.hw,
-               [CLKID_GCLK_VENCI_INT0]     = &gxbb_gclk_venci_int0.hw,
-               [CLKID_GCLK_VENCI_INT]      = &gxbb_gclk_vencp_int.hw,
-               [CLKID_DAC_CLK]             = &gxbb_dac_clk.hw,
-               [CLKID_AOCLK_GATE]          = &gxbb_aoclk_gate.hw,
-               [CLKID_IEC958_GATE]         = &gxbb_iec958_gate.hw,
-               [CLKID_ENC480P]             = &gxbb_enc480p.hw,
-               [CLKID_RNG1]                = &gxbb_rng1.hw,
-               [CLKID_GCLK_VENCI_INT1]     = &gxbb_gclk_venci_int1.hw,
-               [CLKID_VCLK2_VENCLMCC]      = &gxbb_vclk2_venclmcc.hw,
-               [CLKID_VCLK2_VENCL]         = &gxbb_vclk2_vencl.hw,
-               [CLKID_VCLK_OTHER]          = &gxbb_vclk_other.hw,
-               [CLKID_EDP]                 = &gxbb_edp.hw,
-               [CLKID_AO_MEDIA_CPU]        = &gxbb_ao_media_cpu.hw,
-               [CLKID_AO_AHB_SRAM]         = &gxbb_ao_ahb_sram.hw,
-               [CLKID_AO_AHB_BUS]          = &gxbb_ao_ahb_bus.hw,
-               [CLKID_AO_IFACE]            = &gxbb_ao_iface.hw,
-               [CLKID_AO_I2C]              = &gxbb_ao_i2c.hw,
-               [CLKID_SD_EMMC_A]           = &gxbb_emmc_a.hw,
-               [CLKID_SD_EMMC_B]           = &gxbb_emmc_b.hw,
-               [CLKID_SD_EMMC_C]           = &gxbb_emmc_c.hw,
-               [CLKID_SAR_ADC_CLK]         = &gxbb_sar_adc_clk.hw,
-               [CLKID_SAR_ADC_SEL]         = &gxbb_sar_adc_clk_sel.hw,
-               [CLKID_SAR_ADC_DIV]         = &gxbb_sar_adc_clk_div.hw,
-               [CLKID_MALI_0_SEL]          = &gxbb_mali_0_sel.hw,
-               [CLKID_MALI_0_DIV]          = &gxbb_mali_0_div.hw,
-               [CLKID_MALI_0]              = &gxbb_mali_0.hw,
-               [CLKID_MALI_1_SEL]          = &gxbb_mali_1_sel.hw,
-               [CLKID_MALI_1_DIV]          = &gxbb_mali_1_div.hw,
-               [CLKID_MALI_1]              = &gxbb_mali_1.hw,
-               [CLKID_MALI]                = &gxbb_mali.hw,
-               [CLKID_CTS_AMCLK]           = &gxbb_cts_amclk.hw,
-               [CLKID_CTS_AMCLK_SEL]       = &gxbb_cts_amclk_sel.hw,
-               [CLKID_CTS_AMCLK_DIV]       = &gxbb_cts_amclk_div.hw,
-               [CLKID_CTS_MCLK_I958]       = &gxbb_cts_mclk_i958.hw,
-               [CLKID_CTS_MCLK_I958_SEL]   = &gxbb_cts_mclk_i958_sel.hw,
-               [CLKID_CTS_MCLK_I958_DIV]   = &gxbb_cts_mclk_i958_div.hw,
-               [CLKID_CTS_I958]            = &gxbb_cts_i958.hw,
-               [CLKID_32K_CLK]             = &gxbb_32k_clk.hw,
-               [CLKID_32K_CLK_SEL]         = &gxbb_32k_clk_sel.hw,
-               [CLKID_32K_CLK_DIV]         = &gxbb_32k_clk_div.hw,
-               [CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
-               [CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
-               [CLKID_SD_EMMC_A_CLK0]      = &gxbb_sd_emmc_a_clk0.hw,
-               [CLKID_SD_EMMC_B_CLK0_SEL]  = &gxbb_sd_emmc_b_clk0_sel.hw,
-               [CLKID_SD_EMMC_B_CLK0_DIV]  = &gxbb_sd_emmc_b_clk0_div.hw,
-               [CLKID_SD_EMMC_B_CLK0]      = &gxbb_sd_emmc_b_clk0.hw,
-               [CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
-               [CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
-               [CLKID_SD_EMMC_C_CLK0]      = &gxbb_sd_emmc_c_clk0.hw,
-               [CLKID_VPU_0_SEL]           = &gxbb_vpu_0_sel.hw,
-               [CLKID_VPU_0_DIV]           = &gxbb_vpu_0_div.hw,
-               [CLKID_VPU_0]               = &gxbb_vpu_0.hw,
-               [CLKID_VPU_1_SEL]           = &gxbb_vpu_1_sel.hw,
-               [CLKID_VPU_1_DIV]           = &gxbb_vpu_1_div.hw,
-               [CLKID_VPU_1]               = &gxbb_vpu_1.hw,
-               [CLKID_VPU]                 = &gxbb_vpu.hw,
-               [CLKID_VAPB_0_SEL]          = &gxbb_vapb_0_sel.hw,
-               [CLKID_VAPB_0_DIV]          = &gxbb_vapb_0_div.hw,
-               [CLKID_VAPB_0]              = &gxbb_vapb_0.hw,
-               [CLKID_VAPB_1_SEL]          = &gxbb_vapb_1_sel.hw,
-               [CLKID_VAPB_1_DIV]          = &gxbb_vapb_1_div.hw,
-               [CLKID_VAPB_1]              = &gxbb_vapb_1.hw,
-               [CLKID_VAPB_SEL]            = &gxbb_vapb_sel.hw,
-               [CLKID_VAPB]                = &gxbb_vapb.hw,
-               [CLKID_MPLL0_DIV]           = &gxl_mpll0_div.hw,
-               [CLKID_MPLL1_DIV]           = &gxbb_mpll1_div.hw,
-               [CLKID_MPLL2_DIV]           = &gxbb_mpll2_div.hw,
-               [CLKID_MPLL_PREDIV]         = &gxbb_mpll_prediv.hw,
-               [CLKID_FCLK_DIV2_DIV]       = &gxbb_fclk_div2_div.hw,
-               [CLKID_FCLK_DIV3_DIV]       = &gxbb_fclk_div3_div.hw,
-               [CLKID_FCLK_DIV4_DIV]       = &gxbb_fclk_div4_div.hw,
-               [CLKID_FCLK_DIV5_DIV]       = &gxbb_fclk_div5_div.hw,
-               [CLKID_FCLK_DIV7_DIV]       = &gxbb_fclk_div7_div.hw,
-               [CLKID_VDEC_1_SEL]          = &gxbb_vdec_1_sel.hw,
-               [CLKID_VDEC_1_DIV]          = &gxbb_vdec_1_div.hw,
-               [CLKID_VDEC_1]              = &gxbb_vdec_1.hw,
-               [CLKID_VDEC_HEVC_SEL]       = &gxbb_vdec_hevc_sel.hw,
-               [CLKID_VDEC_HEVC_DIV]       = &gxbb_vdec_hevc_div.hw,
-               [CLKID_VDEC_HEVC]           = &gxbb_vdec_hevc.hw,
-               [CLKID_GEN_CLK_SEL]         = &gxbb_gen_clk_sel.hw,
-               [CLKID_GEN_CLK_DIV]         = &gxbb_gen_clk_div.hw,
-               [CLKID_GEN_CLK]             = &gxbb_gen_clk.hw,
-               [CLKID_FIXED_PLL_DCO]       = &gxbb_fixed_pll_dco.hw,
-               [CLKID_HDMI_PLL_DCO]        = &gxl_hdmi_pll_dco.hw,
-               [CLKID_HDMI_PLL_OD]         = &gxl_hdmi_pll_od.hw,
-               [CLKID_HDMI_PLL_OD2]        = &gxl_hdmi_pll_od2.hw,
-               [CLKID_SYS_PLL_DCO]         = &gxbb_sys_pll_dco.hw,
-               [CLKID_GP0_PLL_DCO]         = &gxl_gp0_pll_dco.hw,
-               [CLKID_VID_PLL_DIV]         = &gxbb_vid_pll_div.hw,
-               [CLKID_VID_PLL_SEL]         = &gxbb_vid_pll_sel.hw,
-               [CLKID_VID_PLL]             = &gxbb_vid_pll.hw,
-               [CLKID_VCLK_SEL]            = &gxbb_vclk_sel.hw,
-               [CLKID_VCLK2_SEL]           = &gxbb_vclk2_sel.hw,
-               [CLKID_VCLK_INPUT]          = &gxbb_vclk_input.hw,
-               [CLKID_VCLK2_INPUT]         = &gxbb_vclk2_input.hw,
-               [CLKID_VCLK_DIV]            = &gxbb_vclk_div.hw,
-               [CLKID_VCLK2_DIV]           = &gxbb_vclk2_div.hw,
-               [CLKID_VCLK]                = &gxbb_vclk.hw,
-               [CLKID_VCLK2]               = &gxbb_vclk2.hw,
-               [CLKID_VCLK_DIV1]           = &gxbb_vclk_div1.hw,
-               [CLKID_VCLK_DIV2_EN]        = &gxbb_vclk_div2_en.hw,
-               [CLKID_VCLK_DIV2]           = &gxbb_vclk_div2.hw,
-               [CLKID_VCLK_DIV4_EN]        = &gxbb_vclk_div4_en.hw,
-               [CLKID_VCLK_DIV4]           = &gxbb_vclk_div4.hw,
-               [CLKID_VCLK_DIV6_EN]        = &gxbb_vclk_div6_en.hw,
-               [CLKID_VCLK_DIV6]           = &gxbb_vclk_div6.hw,
-               [CLKID_VCLK_DIV12_EN]       = &gxbb_vclk_div12_en.hw,
-               [CLKID_VCLK_DIV12]          = &gxbb_vclk_div12.hw,
-               [CLKID_VCLK2_DIV1]          = &gxbb_vclk2_div1.hw,
-               [CLKID_VCLK2_DIV2_EN]       = &gxbb_vclk2_div2_en.hw,
-               [CLKID_VCLK2_DIV2]          = &gxbb_vclk2_div2.hw,
-               [CLKID_VCLK2_DIV4_EN]       = &gxbb_vclk2_div4_en.hw,
-               [CLKID_VCLK2_DIV4]          = &gxbb_vclk2_div4.hw,
-               [CLKID_VCLK2_DIV6_EN]       = &gxbb_vclk2_div6_en.hw,
-               [CLKID_VCLK2_DIV6]          = &gxbb_vclk2_div6.hw,
-               [CLKID_VCLK2_DIV12_EN]      = &gxbb_vclk2_div12_en.hw,
-               [CLKID_VCLK2_DIV12]         = &gxbb_vclk2_div12.hw,
-               [CLKID_CTS_ENCI_SEL]        = &gxbb_cts_enci_sel.hw,
-               [CLKID_CTS_ENCP_SEL]        = &gxbb_cts_encp_sel.hw,
-               [CLKID_CTS_VDAC_SEL]        = &gxbb_cts_vdac_sel.hw,
-               [CLKID_HDMI_TX_SEL]         = &gxbb_hdmi_tx_sel.hw,
-               [CLKID_CTS_ENCI]            = &gxbb_cts_enci.hw,
-               [CLKID_CTS_ENCP]            = &gxbb_cts_encp.hw,
-               [CLKID_CTS_VDAC]            = &gxbb_cts_vdac.hw,
-               [CLKID_HDMI_TX]             = &gxbb_hdmi_tx.hw,
-               [CLKID_HDMI_SEL]            = &gxbb_hdmi_sel.hw,
-               [CLKID_HDMI_DIV]            = &gxbb_hdmi_div.hw,
-               [CLKID_HDMI]                = &gxbb_hdmi.hw,
-               [CLKID_ACODEC]              = &gxl_acodec.hw,
-               [NR_CLKS]                   = NULL,
-       },
-       .num = NR_CLKS,
+static struct clk_hw *gxbb_hw_clks[] = {
+       [CLKID_SYS_PLL]             = &gxbb_sys_pll.hw,
+       [CLKID_HDMI_PLL]            = &gxbb_hdmi_pll.hw,
+       [CLKID_FIXED_PLL]           = &gxbb_fixed_pll.hw,
+       [CLKID_FCLK_DIV2]           = &gxbb_fclk_div2.hw,
+       [CLKID_FCLK_DIV3]           = &gxbb_fclk_div3.hw,
+       [CLKID_FCLK_DIV4]           = &gxbb_fclk_div4.hw,
+       [CLKID_FCLK_DIV5]           = &gxbb_fclk_div5.hw,
+       [CLKID_FCLK_DIV7]           = &gxbb_fclk_div7.hw,
+       [CLKID_GP0_PLL]             = &gxbb_gp0_pll.hw,
+       [CLKID_MPEG_SEL]            = &gxbb_mpeg_clk_sel.hw,
+       [CLKID_MPEG_DIV]            = &gxbb_mpeg_clk_div.hw,
+       [CLKID_CLK81]               = &gxbb_clk81.hw,
+       [CLKID_MPLL0]               = &gxbb_mpll0.hw,
+       [CLKID_MPLL1]               = &gxbb_mpll1.hw,
+       [CLKID_MPLL2]               = &gxbb_mpll2.hw,
+       [CLKID_DDR]                 = &gxbb_ddr.hw,
+       [CLKID_DOS]                 = &gxbb_dos.hw,
+       [CLKID_ISA]                 = &gxbb_isa.hw,
+       [CLKID_PL301]               = &gxbb_pl301.hw,
+       [CLKID_PERIPHS]             = &gxbb_periphs.hw,
+       [CLKID_SPICC]               = &gxbb_spicc.hw,
+       [CLKID_I2C]                 = &gxbb_i2c.hw,
+       [CLKID_SAR_ADC]             = &gxbb_sar_adc.hw,
+       [CLKID_SMART_CARD]          = &gxbb_smart_card.hw,
+       [CLKID_RNG0]                = &gxbb_rng0.hw,
+       [CLKID_UART0]               = &gxbb_uart0.hw,
+       [CLKID_SDHC]                = &gxbb_sdhc.hw,
+       [CLKID_STREAM]              = &gxbb_stream.hw,
+       [CLKID_ASYNC_FIFO]          = &gxbb_async_fifo.hw,
+       [CLKID_SDIO]                = &gxbb_sdio.hw,
+       [CLKID_ABUF]                = &gxbb_abuf.hw,
+       [CLKID_HIU_IFACE]           = &gxbb_hiu_iface.hw,
+       [CLKID_ASSIST_MISC]         = &gxbb_assist_misc.hw,
+       [CLKID_SPI]                 = &gxbb_spi.hw,
+       [CLKID_I2S_SPDIF]           = &gxbb_i2s_spdif.hw,
+       [CLKID_ETH]                 = &gxbb_eth.hw,
+       [CLKID_DEMUX]               = &gxbb_demux.hw,
+       [CLKID_AIU_GLUE]            = &gxbb_aiu_glue.hw,
+       [CLKID_IEC958]              = &gxbb_iec958.hw,
+       [CLKID_I2S_OUT]             = &gxbb_i2s_out.hw,
+       [CLKID_AMCLK]               = &gxbb_amclk.hw,
+       [CLKID_AIFIFO2]             = &gxbb_aififo2.hw,
+       [CLKID_MIXER]               = &gxbb_mixer.hw,
+       [CLKID_MIXER_IFACE]         = &gxbb_mixer_iface.hw,
+       [CLKID_ADC]                 = &gxbb_adc.hw,
+       [CLKID_BLKMV]               = &gxbb_blkmv.hw,
+       [CLKID_AIU]                 = &gxbb_aiu.hw,
+       [CLKID_UART1]               = &gxbb_uart1.hw,
+       [CLKID_G2D]                 = &gxbb_g2d.hw,
+       [CLKID_USB0]                = &gxbb_usb0.hw,
+       [CLKID_USB1]                = &gxbb_usb1.hw,
+       [CLKID_RESET]               = &gxbb_reset.hw,
+       [CLKID_NAND]                = &gxbb_nand.hw,
+       [CLKID_DOS_PARSER]          = &gxbb_dos_parser.hw,
+       [CLKID_USB]                 = &gxbb_usb.hw,
+       [CLKID_VDIN1]               = &gxbb_vdin1.hw,
+       [CLKID_AHB_ARB0]            = &gxbb_ahb_arb0.hw,
+       [CLKID_EFUSE]               = &gxbb_efuse.hw,
+       [CLKID_BOOT_ROM]            = &gxbb_boot_rom.hw,
+       [CLKID_AHB_DATA_BUS]        = &gxbb_ahb_data_bus.hw,
+       [CLKID_AHB_CTRL_BUS]        = &gxbb_ahb_ctrl_bus.hw,
+       [CLKID_HDMI_INTR_SYNC]      = &gxbb_hdmi_intr_sync.hw,
+       [CLKID_HDMI_PCLK]           = &gxbb_hdmi_pclk.hw,
+       [CLKID_USB1_DDR_BRIDGE]     = &gxbb_usb1_ddr_bridge.hw,
+       [CLKID_USB0_DDR_BRIDGE]     = &gxbb_usb0_ddr_bridge.hw,
+       [CLKID_MMC_PCLK]            = &gxbb_mmc_pclk.hw,
+       [CLKID_DVIN]                = &gxbb_dvin.hw,
+       [CLKID_UART2]               = &gxbb_uart2.hw,
+       [CLKID_SANA]                = &gxbb_sana.hw,
+       [CLKID_VPU_INTR]            = &gxbb_vpu_intr.hw,
+       [CLKID_SEC_AHB_AHB3_BRIDGE] = &gxbb_sec_ahb_ahb3_bridge.hw,
+       [CLKID_CLK81_A53]           = &gxbb_clk81_a53.hw,
+       [CLKID_VCLK2_VENCI0]        = &gxbb_vclk2_venci0.hw,
+       [CLKID_VCLK2_VENCI1]        = &gxbb_vclk2_venci1.hw,
+       [CLKID_VCLK2_VENCP0]        = &gxbb_vclk2_vencp0.hw,
+       [CLKID_VCLK2_VENCP1]        = &gxbb_vclk2_vencp1.hw,
+       [CLKID_GCLK_VENCI_INT0]     = &gxbb_gclk_venci_int0.hw,
+       [CLKID_GCLK_VENCI_INT]      = &gxbb_gclk_vencp_int.hw,
+       [CLKID_DAC_CLK]             = &gxbb_dac_clk.hw,
+       [CLKID_AOCLK_GATE]          = &gxbb_aoclk_gate.hw,
+       [CLKID_IEC958_GATE]         = &gxbb_iec958_gate.hw,
+       [CLKID_ENC480P]             = &gxbb_enc480p.hw,
+       [CLKID_RNG1]                = &gxbb_rng1.hw,
+       [CLKID_GCLK_VENCI_INT1]     = &gxbb_gclk_venci_int1.hw,
+       [CLKID_VCLK2_VENCLMCC]      = &gxbb_vclk2_venclmcc.hw,
+       [CLKID_VCLK2_VENCL]         = &gxbb_vclk2_vencl.hw,
+       [CLKID_VCLK_OTHER]          = &gxbb_vclk_other.hw,
+       [CLKID_EDP]                 = &gxbb_edp.hw,
+       [CLKID_AO_MEDIA_CPU]        = &gxbb_ao_media_cpu.hw,
+       [CLKID_AO_AHB_SRAM]         = &gxbb_ao_ahb_sram.hw,
+       [CLKID_AO_AHB_BUS]          = &gxbb_ao_ahb_bus.hw,
+       [CLKID_AO_IFACE]            = &gxbb_ao_iface.hw,
+       [CLKID_AO_I2C]              = &gxbb_ao_i2c.hw,
+       [CLKID_SD_EMMC_A]           = &gxbb_emmc_a.hw,
+       [CLKID_SD_EMMC_B]           = &gxbb_emmc_b.hw,
+       [CLKID_SD_EMMC_C]           = &gxbb_emmc_c.hw,
+       [CLKID_SAR_ADC_CLK]         = &gxbb_sar_adc_clk.hw,
+       [CLKID_SAR_ADC_SEL]         = &gxbb_sar_adc_clk_sel.hw,
+       [CLKID_SAR_ADC_DIV]         = &gxbb_sar_adc_clk_div.hw,
+       [CLKID_MALI_0_SEL]          = &gxbb_mali_0_sel.hw,
+       [CLKID_MALI_0_DIV]          = &gxbb_mali_0_div.hw,
+       [CLKID_MALI_0]              = &gxbb_mali_0.hw,
+       [CLKID_MALI_1_SEL]          = &gxbb_mali_1_sel.hw,
+       [CLKID_MALI_1_DIV]          = &gxbb_mali_1_div.hw,
+       [CLKID_MALI_1]              = &gxbb_mali_1.hw,
+       [CLKID_MALI]                = &gxbb_mali.hw,
+       [CLKID_CTS_AMCLK]           = &gxbb_cts_amclk.hw,
+       [CLKID_CTS_AMCLK_SEL]       = &gxbb_cts_amclk_sel.hw,
+       [CLKID_CTS_AMCLK_DIV]       = &gxbb_cts_amclk_div.hw,
+       [CLKID_CTS_MCLK_I958]       = &gxbb_cts_mclk_i958.hw,
+       [CLKID_CTS_MCLK_I958_SEL]   = &gxbb_cts_mclk_i958_sel.hw,
+       [CLKID_CTS_MCLK_I958_DIV]   = &gxbb_cts_mclk_i958_div.hw,
+       [CLKID_CTS_I958]            = &gxbb_cts_i958.hw,
+       [CLKID_32K_CLK]             = &gxbb_32k_clk.hw,
+       [CLKID_32K_CLK_SEL]         = &gxbb_32k_clk_sel.hw,
+       [CLKID_32K_CLK_DIV]         = &gxbb_32k_clk_div.hw,
+       [CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
+       [CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
+       [CLKID_SD_EMMC_A_CLK0]      = &gxbb_sd_emmc_a_clk0.hw,
+       [CLKID_SD_EMMC_B_CLK0_SEL]  = &gxbb_sd_emmc_b_clk0_sel.hw,
+       [CLKID_SD_EMMC_B_CLK0_DIV]  = &gxbb_sd_emmc_b_clk0_div.hw,
+       [CLKID_SD_EMMC_B_CLK0]      = &gxbb_sd_emmc_b_clk0.hw,
+       [CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
+       [CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
+       [CLKID_SD_EMMC_C_CLK0]      = &gxbb_sd_emmc_c_clk0.hw,
+       [CLKID_VPU_0_SEL]           = &gxbb_vpu_0_sel.hw,
+       [CLKID_VPU_0_DIV]           = &gxbb_vpu_0_div.hw,
+       [CLKID_VPU_0]               = &gxbb_vpu_0.hw,
+       [CLKID_VPU_1_SEL]           = &gxbb_vpu_1_sel.hw,
+       [CLKID_VPU_1_DIV]           = &gxbb_vpu_1_div.hw,
+       [CLKID_VPU_1]               = &gxbb_vpu_1.hw,
+       [CLKID_VPU]                 = &gxbb_vpu.hw,
+       [CLKID_VAPB_0_SEL]          = &gxbb_vapb_0_sel.hw,
+       [CLKID_VAPB_0_DIV]          = &gxbb_vapb_0_div.hw,
+       [CLKID_VAPB_0]              = &gxbb_vapb_0.hw,
+       [CLKID_VAPB_1_SEL]          = &gxbb_vapb_1_sel.hw,
+       [CLKID_VAPB_1_DIV]          = &gxbb_vapb_1_div.hw,
+       [CLKID_VAPB_1]              = &gxbb_vapb_1.hw,
+       [CLKID_VAPB_SEL]            = &gxbb_vapb_sel.hw,
+       [CLKID_VAPB]                = &gxbb_vapb.hw,
+       [CLKID_HDMI_PLL_PRE_MULT]   = &gxbb_hdmi_pll_pre_mult.hw,
+       [CLKID_MPLL0_DIV]           = &gxbb_mpll0_div.hw,
+       [CLKID_MPLL1_DIV]           = &gxbb_mpll1_div.hw,
+       [CLKID_MPLL2_DIV]           = &gxbb_mpll2_div.hw,
+       [CLKID_MPLL_PREDIV]         = &gxbb_mpll_prediv.hw,
+       [CLKID_FCLK_DIV2_DIV]       = &gxbb_fclk_div2_div.hw,
+       [CLKID_FCLK_DIV3_DIV]       = &gxbb_fclk_div3_div.hw,
+       [CLKID_FCLK_DIV4_DIV]       = &gxbb_fclk_div4_div.hw,
+       [CLKID_FCLK_DIV5_DIV]       = &gxbb_fclk_div5_div.hw,
+       [CLKID_FCLK_DIV7_DIV]       = &gxbb_fclk_div7_div.hw,
+       [CLKID_VDEC_1_SEL]          = &gxbb_vdec_1_sel.hw,
+       [CLKID_VDEC_1_DIV]          = &gxbb_vdec_1_div.hw,
+       [CLKID_VDEC_1]              = &gxbb_vdec_1.hw,
+       [CLKID_VDEC_HEVC_SEL]       = &gxbb_vdec_hevc_sel.hw,
+       [CLKID_VDEC_HEVC_DIV]       = &gxbb_vdec_hevc_div.hw,
+       [CLKID_VDEC_HEVC]           = &gxbb_vdec_hevc.hw,
+       [CLKID_GEN_CLK_SEL]         = &gxbb_gen_clk_sel.hw,
+       [CLKID_GEN_CLK_DIV]         = &gxbb_gen_clk_div.hw,
+       [CLKID_GEN_CLK]             = &gxbb_gen_clk.hw,
+       [CLKID_FIXED_PLL_DCO]       = &gxbb_fixed_pll_dco.hw,
+       [CLKID_HDMI_PLL_DCO]        = &gxbb_hdmi_pll_dco.hw,
+       [CLKID_HDMI_PLL_OD]         = &gxbb_hdmi_pll_od.hw,
+       [CLKID_HDMI_PLL_OD2]        = &gxbb_hdmi_pll_od2.hw,
+       [CLKID_SYS_PLL_DCO]         = &gxbb_sys_pll_dco.hw,
+       [CLKID_GP0_PLL_DCO]         = &gxbb_gp0_pll_dco.hw,
+       [CLKID_VID_PLL_DIV]         = &gxbb_vid_pll_div.hw,
+       [CLKID_VID_PLL_SEL]         = &gxbb_vid_pll_sel.hw,
+       [CLKID_VID_PLL]             = &gxbb_vid_pll.hw,
+       [CLKID_VCLK_SEL]            = &gxbb_vclk_sel.hw,
+       [CLKID_VCLK2_SEL]           = &gxbb_vclk2_sel.hw,
+       [CLKID_VCLK_INPUT]          = &gxbb_vclk_input.hw,
+       [CLKID_VCLK2_INPUT]         = &gxbb_vclk2_input.hw,
+       [CLKID_VCLK_DIV]            = &gxbb_vclk_div.hw,
+       [CLKID_VCLK2_DIV]           = &gxbb_vclk2_div.hw,
+       [CLKID_VCLK]                = &gxbb_vclk.hw,
+       [CLKID_VCLK2]               = &gxbb_vclk2.hw,
+       [CLKID_VCLK_DIV1]           = &gxbb_vclk_div1.hw,
+       [CLKID_VCLK_DIV2_EN]        = &gxbb_vclk_div2_en.hw,
+       [CLKID_VCLK_DIV2]           = &gxbb_vclk_div2.hw,
+       [CLKID_VCLK_DIV4_EN]        = &gxbb_vclk_div4_en.hw,
+       [CLKID_VCLK_DIV4]           = &gxbb_vclk_div4.hw,
+       [CLKID_VCLK_DIV6_EN]        = &gxbb_vclk_div6_en.hw,
+       [CLKID_VCLK_DIV6]           = &gxbb_vclk_div6.hw,
+       [CLKID_VCLK_DIV12_EN]       = &gxbb_vclk_div12_en.hw,
+       [CLKID_VCLK_DIV12]          = &gxbb_vclk_div12.hw,
+       [CLKID_VCLK2_DIV1]          = &gxbb_vclk2_div1.hw,
+       [CLKID_VCLK2_DIV2_EN]       = &gxbb_vclk2_div2_en.hw,
+       [CLKID_VCLK2_DIV2]          = &gxbb_vclk2_div2.hw,
+       [CLKID_VCLK2_DIV4_EN]       = &gxbb_vclk2_div4_en.hw,
+       [CLKID_VCLK2_DIV4]          = &gxbb_vclk2_div4.hw,
+       [CLKID_VCLK2_DIV6_EN]       = &gxbb_vclk2_div6_en.hw,
+       [CLKID_VCLK2_DIV6]          = &gxbb_vclk2_div6.hw,
+       [CLKID_VCLK2_DIV12_EN]      = &gxbb_vclk2_div12_en.hw,
+       [CLKID_VCLK2_DIV12]         = &gxbb_vclk2_div12.hw,
+       [CLKID_CTS_ENCI_SEL]        = &gxbb_cts_enci_sel.hw,
+       [CLKID_CTS_ENCP_SEL]        = &gxbb_cts_encp_sel.hw,
+       [CLKID_CTS_VDAC_SEL]        = &gxbb_cts_vdac_sel.hw,
+       [CLKID_HDMI_TX_SEL]         = &gxbb_hdmi_tx_sel.hw,
+       [CLKID_CTS_ENCI]            = &gxbb_cts_enci.hw,
+       [CLKID_CTS_ENCP]            = &gxbb_cts_encp.hw,
+       [CLKID_CTS_VDAC]            = &gxbb_cts_vdac.hw,
+       [CLKID_HDMI_TX]             = &gxbb_hdmi_tx.hw,
+       [CLKID_HDMI_SEL]            = &gxbb_hdmi_sel.hw,
+       [CLKID_HDMI_DIV]            = &gxbb_hdmi_div.hw,
+       [CLKID_HDMI]                = &gxbb_hdmi.hw,
+};
+
+static struct clk_hw *gxl_hw_clks[] = {
+       [CLKID_SYS_PLL]             = &gxbb_sys_pll.hw,
+       [CLKID_HDMI_PLL]            = &gxl_hdmi_pll.hw,
+       [CLKID_FIXED_PLL]           = &gxbb_fixed_pll.hw,
+       [CLKID_FCLK_DIV2]           = &gxbb_fclk_div2.hw,
+       [CLKID_FCLK_DIV3]           = &gxbb_fclk_div3.hw,
+       [CLKID_FCLK_DIV4]           = &gxbb_fclk_div4.hw,
+       [CLKID_FCLK_DIV5]           = &gxbb_fclk_div5.hw,
+       [CLKID_FCLK_DIV7]           = &gxbb_fclk_div7.hw,
+       [CLKID_GP0_PLL]             = &gxbb_gp0_pll.hw,
+       [CLKID_MPEG_SEL]            = &gxbb_mpeg_clk_sel.hw,
+       [CLKID_MPEG_DIV]            = &gxbb_mpeg_clk_div.hw,
+       [CLKID_CLK81]               = &gxbb_clk81.hw,
+       [CLKID_MPLL0]               = &gxbb_mpll0.hw,
+       [CLKID_MPLL1]               = &gxbb_mpll1.hw,
+       [CLKID_MPLL2]               = &gxbb_mpll2.hw,
+       [CLKID_DDR]                 = &gxbb_ddr.hw,
+       [CLKID_DOS]                 = &gxbb_dos.hw,
+       [CLKID_ISA]                 = &gxbb_isa.hw,
+       [CLKID_PL301]               = &gxbb_pl301.hw,
+       [CLKID_PERIPHS]             = &gxbb_periphs.hw,
+       [CLKID_SPICC]               = &gxbb_spicc.hw,
+       [CLKID_I2C]                 = &gxbb_i2c.hw,
+       [CLKID_SAR_ADC]             = &gxbb_sar_adc.hw,
+       [CLKID_SMART_CARD]          = &gxbb_smart_card.hw,
+       [CLKID_RNG0]                = &gxbb_rng0.hw,
+       [CLKID_UART0]               = &gxbb_uart0.hw,
+       [CLKID_SDHC]                = &gxbb_sdhc.hw,
+       [CLKID_STREAM]              = &gxbb_stream.hw,
+       [CLKID_ASYNC_FIFO]          = &gxbb_async_fifo.hw,
+       [CLKID_SDIO]                = &gxbb_sdio.hw,
+       [CLKID_ABUF]                = &gxbb_abuf.hw,
+       [CLKID_HIU_IFACE]           = &gxbb_hiu_iface.hw,
+       [CLKID_ASSIST_MISC]         = &gxbb_assist_misc.hw,
+       [CLKID_SPI]                 = &gxbb_spi.hw,
+       [CLKID_I2S_SPDIF]           = &gxbb_i2s_spdif.hw,
+       [CLKID_ETH]                 = &gxbb_eth.hw,
+       [CLKID_DEMUX]               = &gxbb_demux.hw,
+       [CLKID_AIU_GLUE]            = &gxbb_aiu_glue.hw,
+       [CLKID_IEC958]              = &gxbb_iec958.hw,
+       [CLKID_I2S_OUT]             = &gxbb_i2s_out.hw,
+       [CLKID_AMCLK]               = &gxbb_amclk.hw,
+       [CLKID_AIFIFO2]             = &gxbb_aififo2.hw,
+       [CLKID_MIXER]               = &gxbb_mixer.hw,
+       [CLKID_MIXER_IFACE]         = &gxbb_mixer_iface.hw,
+       [CLKID_ADC]                 = &gxbb_adc.hw,
+       [CLKID_BLKMV]               = &gxbb_blkmv.hw,
+       [CLKID_AIU]                 = &gxbb_aiu.hw,
+       [CLKID_UART1]               = &gxbb_uart1.hw,
+       [CLKID_G2D]                 = &gxbb_g2d.hw,
+       [CLKID_USB0]                = &gxbb_usb0.hw,
+       [CLKID_USB1]                = &gxbb_usb1.hw,
+       [CLKID_RESET]               = &gxbb_reset.hw,
+       [CLKID_NAND]                = &gxbb_nand.hw,
+       [CLKID_DOS_PARSER]          = &gxbb_dos_parser.hw,
+       [CLKID_USB]                 = &gxbb_usb.hw,
+       [CLKID_VDIN1]               = &gxbb_vdin1.hw,
+       [CLKID_AHB_ARB0]            = &gxbb_ahb_arb0.hw,
+       [CLKID_EFUSE]               = &gxbb_efuse.hw,
+       [CLKID_BOOT_ROM]            = &gxbb_boot_rom.hw,
+       [CLKID_AHB_DATA_BUS]        = &gxbb_ahb_data_bus.hw,
+       [CLKID_AHB_CTRL_BUS]        = &gxbb_ahb_ctrl_bus.hw,
+       [CLKID_HDMI_INTR_SYNC]      = &gxbb_hdmi_intr_sync.hw,
+       [CLKID_HDMI_PCLK]           = &gxbb_hdmi_pclk.hw,
+       [CLKID_USB1_DDR_BRIDGE]     = &gxbb_usb1_ddr_bridge.hw,
+       [CLKID_USB0_DDR_BRIDGE]     = &gxbb_usb0_ddr_bridge.hw,
+       [CLKID_MMC_PCLK]            = &gxbb_mmc_pclk.hw,
+       [CLKID_DVIN]                = &gxbb_dvin.hw,
+       [CLKID_UART2]               = &gxbb_uart2.hw,
+       [CLKID_SANA]                = &gxbb_sana.hw,
+       [CLKID_VPU_INTR]            = &gxbb_vpu_intr.hw,
+       [CLKID_SEC_AHB_AHB3_BRIDGE] = &gxbb_sec_ahb_ahb3_bridge.hw,
+       [CLKID_CLK81_A53]           = &gxbb_clk81_a53.hw,
+       [CLKID_VCLK2_VENCI0]        = &gxbb_vclk2_venci0.hw,
+       [CLKID_VCLK2_VENCI1]        = &gxbb_vclk2_venci1.hw,
+       [CLKID_VCLK2_VENCP0]        = &gxbb_vclk2_vencp0.hw,
+       [CLKID_VCLK2_VENCP1]        = &gxbb_vclk2_vencp1.hw,
+       [CLKID_GCLK_VENCI_INT0]     = &gxbb_gclk_venci_int0.hw,
+       [CLKID_GCLK_VENCI_INT]      = &gxbb_gclk_vencp_int.hw,
+       [CLKID_DAC_CLK]             = &gxbb_dac_clk.hw,
+       [CLKID_AOCLK_GATE]          = &gxbb_aoclk_gate.hw,
+       [CLKID_IEC958_GATE]         = &gxbb_iec958_gate.hw,
+       [CLKID_ENC480P]             = &gxbb_enc480p.hw,
+       [CLKID_RNG1]                = &gxbb_rng1.hw,
+       [CLKID_GCLK_VENCI_INT1]     = &gxbb_gclk_venci_int1.hw,
+       [CLKID_VCLK2_VENCLMCC]      = &gxbb_vclk2_venclmcc.hw,
+       [CLKID_VCLK2_VENCL]         = &gxbb_vclk2_vencl.hw,
+       [CLKID_VCLK_OTHER]          = &gxbb_vclk_other.hw,
+       [CLKID_EDP]                 = &gxbb_edp.hw,
+       [CLKID_AO_MEDIA_CPU]        = &gxbb_ao_media_cpu.hw,
+       [CLKID_AO_AHB_SRAM]         = &gxbb_ao_ahb_sram.hw,
+       [CLKID_AO_AHB_BUS]          = &gxbb_ao_ahb_bus.hw,
+       [CLKID_AO_IFACE]            = &gxbb_ao_iface.hw,
+       [CLKID_AO_I2C]              = &gxbb_ao_i2c.hw,
+       [CLKID_SD_EMMC_A]           = &gxbb_emmc_a.hw,
+       [CLKID_SD_EMMC_B]           = &gxbb_emmc_b.hw,
+       [CLKID_SD_EMMC_C]           = &gxbb_emmc_c.hw,
+       [CLKID_SAR_ADC_CLK]         = &gxbb_sar_adc_clk.hw,
+       [CLKID_SAR_ADC_SEL]         = &gxbb_sar_adc_clk_sel.hw,
+       [CLKID_SAR_ADC_DIV]         = &gxbb_sar_adc_clk_div.hw,
+       [CLKID_MALI_0_SEL]          = &gxbb_mali_0_sel.hw,
+       [CLKID_MALI_0_DIV]          = &gxbb_mali_0_div.hw,
+       [CLKID_MALI_0]              = &gxbb_mali_0.hw,
+       [CLKID_MALI_1_SEL]          = &gxbb_mali_1_sel.hw,
+       [CLKID_MALI_1_DIV]          = &gxbb_mali_1_div.hw,
+       [CLKID_MALI_1]              = &gxbb_mali_1.hw,
+       [CLKID_MALI]                = &gxbb_mali.hw,
+       [CLKID_CTS_AMCLK]           = &gxbb_cts_amclk.hw,
+       [CLKID_CTS_AMCLK_SEL]       = &gxbb_cts_amclk_sel.hw,
+       [CLKID_CTS_AMCLK_DIV]       = &gxbb_cts_amclk_div.hw,
+       [CLKID_CTS_MCLK_I958]       = &gxbb_cts_mclk_i958.hw,
+       [CLKID_CTS_MCLK_I958_SEL]   = &gxbb_cts_mclk_i958_sel.hw,
+       [CLKID_CTS_MCLK_I958_DIV]   = &gxbb_cts_mclk_i958_div.hw,
+       [CLKID_CTS_I958]            = &gxbb_cts_i958.hw,
+       [CLKID_32K_CLK]             = &gxbb_32k_clk.hw,
+       [CLKID_32K_CLK_SEL]         = &gxbb_32k_clk_sel.hw,
+       [CLKID_32K_CLK_DIV]         = &gxbb_32k_clk_div.hw,
+       [CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
+       [CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
+       [CLKID_SD_EMMC_A_CLK0]      = &gxbb_sd_emmc_a_clk0.hw,
+       [CLKID_SD_EMMC_B_CLK0_SEL]  = &gxbb_sd_emmc_b_clk0_sel.hw,
+       [CLKID_SD_EMMC_B_CLK0_DIV]  = &gxbb_sd_emmc_b_clk0_div.hw,
+       [CLKID_SD_EMMC_B_CLK0]      = &gxbb_sd_emmc_b_clk0.hw,
+       [CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
+       [CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
+       [CLKID_SD_EMMC_C_CLK0]      = &gxbb_sd_emmc_c_clk0.hw,
+       [CLKID_VPU_0_SEL]           = &gxbb_vpu_0_sel.hw,
+       [CLKID_VPU_0_DIV]           = &gxbb_vpu_0_div.hw,
+       [CLKID_VPU_0]               = &gxbb_vpu_0.hw,
+       [CLKID_VPU_1_SEL]           = &gxbb_vpu_1_sel.hw,
+       [CLKID_VPU_1_DIV]           = &gxbb_vpu_1_div.hw,
+       [CLKID_VPU_1]               = &gxbb_vpu_1.hw,
+       [CLKID_VPU]                 = &gxbb_vpu.hw,
+       [CLKID_VAPB_0_SEL]          = &gxbb_vapb_0_sel.hw,
+       [CLKID_VAPB_0_DIV]          = &gxbb_vapb_0_div.hw,
+       [CLKID_VAPB_0]              = &gxbb_vapb_0.hw,
+       [CLKID_VAPB_1_SEL]          = &gxbb_vapb_1_sel.hw,
+       [CLKID_VAPB_1_DIV]          = &gxbb_vapb_1_div.hw,
+       [CLKID_VAPB_1]              = &gxbb_vapb_1.hw,
+       [CLKID_VAPB_SEL]            = &gxbb_vapb_sel.hw,
+       [CLKID_VAPB]                = &gxbb_vapb.hw,
+       [CLKID_MPLL0_DIV]           = &gxl_mpll0_div.hw,
+       [CLKID_MPLL1_DIV]           = &gxbb_mpll1_div.hw,
+       [CLKID_MPLL2_DIV]           = &gxbb_mpll2_div.hw,
+       [CLKID_MPLL_PREDIV]         = &gxbb_mpll_prediv.hw,
+       [CLKID_FCLK_DIV2_DIV]       = &gxbb_fclk_div2_div.hw,
+       [CLKID_FCLK_DIV3_DIV]       = &gxbb_fclk_div3_div.hw,
+       [CLKID_FCLK_DIV4_DIV]       = &gxbb_fclk_div4_div.hw,
+       [CLKID_FCLK_DIV5_DIV]       = &gxbb_fclk_div5_div.hw,
+       [CLKID_FCLK_DIV7_DIV]       = &gxbb_fclk_div7_div.hw,
+       [CLKID_VDEC_1_SEL]          = &gxbb_vdec_1_sel.hw,
+       [CLKID_VDEC_1_DIV]          = &gxbb_vdec_1_div.hw,
+       [CLKID_VDEC_1]              = &gxbb_vdec_1.hw,
+       [CLKID_VDEC_HEVC_SEL]       = &gxbb_vdec_hevc_sel.hw,
+       [CLKID_VDEC_HEVC_DIV]       = &gxbb_vdec_hevc_div.hw,
+       [CLKID_VDEC_HEVC]           = &gxbb_vdec_hevc.hw,
+       [CLKID_GEN_CLK_SEL]         = &gxbb_gen_clk_sel.hw,
+       [CLKID_GEN_CLK_DIV]         = &gxbb_gen_clk_div.hw,
+       [CLKID_GEN_CLK]             = &gxbb_gen_clk.hw,
+       [CLKID_FIXED_PLL_DCO]       = &gxbb_fixed_pll_dco.hw,
+       [CLKID_HDMI_PLL_DCO]        = &gxl_hdmi_pll_dco.hw,
+       [CLKID_HDMI_PLL_OD]         = &gxl_hdmi_pll_od.hw,
+       [CLKID_HDMI_PLL_OD2]        = &gxl_hdmi_pll_od2.hw,
+       [CLKID_SYS_PLL_DCO]         = &gxbb_sys_pll_dco.hw,
+       [CLKID_GP0_PLL_DCO]         = &gxl_gp0_pll_dco.hw,
+       [CLKID_VID_PLL_DIV]         = &gxbb_vid_pll_div.hw,
+       [CLKID_VID_PLL_SEL]         = &gxbb_vid_pll_sel.hw,
+       [CLKID_VID_PLL]             = &gxbb_vid_pll.hw,
+       [CLKID_VCLK_SEL]            = &gxbb_vclk_sel.hw,
+       [CLKID_VCLK2_SEL]           = &gxbb_vclk2_sel.hw,
+       [CLKID_VCLK_INPUT]          = &gxbb_vclk_input.hw,
+       [CLKID_VCLK2_INPUT]         = &gxbb_vclk2_input.hw,
+       [CLKID_VCLK_DIV]            = &gxbb_vclk_div.hw,
+       [CLKID_VCLK2_DIV]           = &gxbb_vclk2_div.hw,
+       [CLKID_VCLK]                = &gxbb_vclk.hw,
+       [CLKID_VCLK2]               = &gxbb_vclk2.hw,
+       [CLKID_VCLK_DIV1]           = &gxbb_vclk_div1.hw,
+       [CLKID_VCLK_DIV2_EN]        = &gxbb_vclk_div2_en.hw,
+       [CLKID_VCLK_DIV2]           = &gxbb_vclk_div2.hw,
+       [CLKID_VCLK_DIV4_EN]        = &gxbb_vclk_div4_en.hw,
+       [CLKID_VCLK_DIV4]           = &gxbb_vclk_div4.hw,
+       [CLKID_VCLK_DIV6_EN]        = &gxbb_vclk_div6_en.hw,
+       [CLKID_VCLK_DIV6]           = &gxbb_vclk_div6.hw,
+       [CLKID_VCLK_DIV12_EN]       = &gxbb_vclk_div12_en.hw,
+       [CLKID_VCLK_DIV12]          = &gxbb_vclk_div12.hw,
+       [CLKID_VCLK2_DIV1]          = &gxbb_vclk2_div1.hw,
+       [CLKID_VCLK2_DIV2_EN]       = &gxbb_vclk2_div2_en.hw,
+       [CLKID_VCLK2_DIV2]          = &gxbb_vclk2_div2.hw,
+       [CLKID_VCLK2_DIV4_EN]       = &gxbb_vclk2_div4_en.hw,
+       [CLKID_VCLK2_DIV4]          = &gxbb_vclk2_div4.hw,
+       [CLKID_VCLK2_DIV6_EN]       = &gxbb_vclk2_div6_en.hw,
+       [CLKID_VCLK2_DIV6]          = &gxbb_vclk2_div6.hw,
+       [CLKID_VCLK2_DIV12_EN]      = &gxbb_vclk2_div12_en.hw,
+       [CLKID_VCLK2_DIV12]         = &gxbb_vclk2_div12.hw,
+       [CLKID_CTS_ENCI_SEL]        = &gxbb_cts_enci_sel.hw,
+       [CLKID_CTS_ENCP_SEL]        = &gxbb_cts_encp_sel.hw,
+       [CLKID_CTS_VDAC_SEL]        = &gxbb_cts_vdac_sel.hw,
+       [CLKID_HDMI_TX_SEL]         = &gxbb_hdmi_tx_sel.hw,
+       [CLKID_CTS_ENCI]            = &gxbb_cts_enci.hw,
+       [CLKID_CTS_ENCP]            = &gxbb_cts_encp.hw,
+       [CLKID_CTS_VDAC]            = &gxbb_cts_vdac.hw,
+       [CLKID_HDMI_TX]             = &gxbb_hdmi_tx.hw,
+       [CLKID_HDMI_SEL]            = &gxbb_hdmi_sel.hw,
+       [CLKID_HDMI_DIV]            = &gxbb_hdmi_div.hw,
+       [CLKID_HDMI]                = &gxbb_hdmi.hw,
+       [CLKID_ACODEC]              = &gxl_acodec.hw,
 };
 
 static struct clk_regmap *const gxbb_clk_regmaps[] = {
@@ -3544,13 +3536,19 @@ static struct clk_regmap *const gxl_clk_regmaps[] = {
 static const struct meson_eeclkc_data gxbb_clkc_data = {
        .regmap_clks = gxbb_clk_regmaps,
        .regmap_clk_num = ARRAY_SIZE(gxbb_clk_regmaps),
-       .hw_onecell_data = &gxbb_hw_onecell_data,
+       .hw_clks = {
+               .hws = gxbb_hw_clks,
+               .num = ARRAY_SIZE(gxbb_hw_clks),
+       },
 };
 
 static const struct meson_eeclkc_data gxl_clkc_data = {
        .regmap_clks = gxl_clk_regmaps,
        .regmap_clk_num = ARRAY_SIZE(gxl_clk_regmaps),
-       .hw_onecell_data = &gxl_hw_onecell_data,
+       .hw_clks = {
+               .hws = gxl_hw_clks,
+               .num = ARRAY_SIZE(gxl_hw_clks),
+       },
 };
 
 static const struct of_device_id clkc_match_table[] = {