clk: meson: migrate meson-eeclk out of hw_onecell_data to drop NR_CLKS
[platform/kernel/linux-starfive.git] / drivers / clk / meson / g12a.c
index 310accf..e0e2956 100644 (file)
@@ -4244,746 +4244,734 @@ static MESON_GATE_RO(g12a_reset_sec,          HHI_GCLK_OTHER2, 3);
 static MESON_GATE_RO(g12a_sec_ahb_apb3,                HHI_GCLK_OTHER2, 4);
 
 /* Array of all clocks provided by this provider */
-static struct clk_hw_onecell_data g12a_hw_onecell_data = {
-       .hws = {
-               [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
-               [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
-               [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
-               [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
-               [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
-               [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
-               [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
-               [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
-               [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
-               [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
-               [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
-               [CLKID_CLK81]                   = &g12a_clk81.hw,
-               [CLKID_MPLL0]                   = &g12a_mpll0.hw,
-               [CLKID_MPLL1]                   = &g12a_mpll1.hw,
-               [CLKID_MPLL2]                   = &g12a_mpll2.hw,
-               [CLKID_MPLL3]                   = &g12a_mpll3.hw,
-               [CLKID_DDR]                     = &g12a_ddr.hw,
-               [CLKID_DOS]                     = &g12a_dos.hw,
-               [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
-               [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
-               [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
-               [CLKID_ISA]                     = &g12a_isa.hw,
-               [CLKID_PL301]                   = &g12a_pl301.hw,
-               [CLKID_PERIPHS]                 = &g12a_periphs.hw,
-               [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
-               [CLKID_I2C]                     = &g12a_i2c.hw,
-               [CLKID_SANA]                    = &g12a_sana.hw,
-               [CLKID_SD]                      = &g12a_sd.hw,
-               [CLKID_RNG0]                    = &g12a_rng0.hw,
-               [CLKID_UART0]                   = &g12a_uart0.hw,
-               [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
-               [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
-               [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
-               [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
-               [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
-               [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
-               [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
-               [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
-               [CLKID_AUDIO]                   = &g12a_audio.hw,
-               [CLKID_ETH]                     = &g12a_eth_core.hw,
-               [CLKID_DEMUX]                   = &g12a_demux.hw,
-               [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
-               [CLKID_ADC]                     = &g12a_adc.hw,
-               [CLKID_UART1]                   = &g12a_uart1.hw,
-               [CLKID_G2D]                     = &g12a_g2d.hw,
-               [CLKID_RESET]                   = &g12a_reset.hw,
-               [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
-               [CLKID_PARSER]                  = &g12a_parser.hw,
-               [CLKID_USB]                     = &g12a_usb_general.hw,
-               [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
-               [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
-               [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
-               [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
-               [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
-               [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
-               [CLKID_BT656]                   = &g12a_bt656.hw,
-               [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
-               [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
-               [CLKID_UART2]                   = &g12a_uart2.hw,
-               [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
-               [CLKID_GIC]                     = &g12a_gic.hw,
-               [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
-               [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
-               [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
-               [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
-               [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
-               [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
-               [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
-               [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
-               [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
-               [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
-               [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
-               [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
-               [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
-               [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
-               [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
-               [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
-               [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
-               [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
-               [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
-               [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
-               [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
-               [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
-               [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
-               [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
-               [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
-               [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
-               [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
-               [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
-               [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
-               [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
-               [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
-               [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
-               [CLKID_ENC480P]                 = &g12a_enc480p.hw,
-               [CLKID_RNG1]                    = &g12a_rng1.hw,
-               [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
-               [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
-               [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
-               [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
-               [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
-               [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
-               [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
-               [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
-               [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
-               [CLKID_DMA]                     = &g12a_dma.hw,
-               [CLKID_EFUSE]                   = &g12a_efuse.hw,
-               [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
-               [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
-               [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
-               [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
-               [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
-               [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
-               [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
-               [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
-               [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
-               [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
-               [CLKID_VPU]                     = &g12a_vpu.hw,
-               [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
-               [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
-               [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
-               [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
-               [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
-               [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
-               [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
-               [CLKID_VAPB]                    = &g12a_vapb.hw,
-               [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
-               [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
-               [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
-               [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
-               [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
-               [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
-               [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
-               [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
-               [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
-               [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
-               [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
-               [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
-               [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
-               [CLKID_VCLK]                    = &g12a_vclk.hw,
-               [CLKID_VCLK2]                   = &g12a_vclk2.hw,
-               [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
-               [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
-               [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
-               [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
-               [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
-               [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
-               [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
-               [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
-               [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
-               [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
-               [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
-               [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
-               [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
-               [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
-               [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
-               [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
-               [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
-               [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
-               [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
-               [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
-               [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
-               [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
-               [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
-               [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
-               [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
-               [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
-               [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
-               [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
-               [CLKID_HDMI]                    = &g12a_hdmi.hw,
-               [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
-               [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
-               [CLKID_MALI_0]                  = &g12a_mali_0.hw,
-               [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
-               [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
-               [CLKID_MALI_1]                  = &g12a_mali_1.hw,
-               [CLKID_MALI]                    = &g12a_mali.hw,
-               [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
-               [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
-               [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
-               [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
-               [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
-               [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
-               [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
-               [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
-               [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
-               [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
-               [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
-               [CLKID_CPU_CLK]                 = &g12a_cpu_clk.hw,
-               [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
-               [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
-               [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
-               [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
-               [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
-               [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
-               [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
-               [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
-               [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
-               [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
-               [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
-               [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
-               [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
-               [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
-               [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
-               [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
-               [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
-               [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
-               [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
-               [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
-               [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
-               [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
-               [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
-               [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
-               [CLKID_TS]                      = &g12a_ts.hw,
-               [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
-               [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
-               [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
-               [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
-               [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
-               [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
-               [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
-               [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
-               [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
-               [NR_CLKS]                       = NULL,
-       },
-       .num = NR_CLKS,
-};
-
-static struct clk_hw_onecell_data g12b_hw_onecell_data = {
-       .hws = {
-               [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
-               [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
-               [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
-               [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
-               [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
-               [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
-               [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
-               [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
-               [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
-               [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
-               [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
-               [CLKID_CLK81]                   = &g12a_clk81.hw,
-               [CLKID_MPLL0]                   = &g12a_mpll0.hw,
-               [CLKID_MPLL1]                   = &g12a_mpll1.hw,
-               [CLKID_MPLL2]                   = &g12a_mpll2.hw,
-               [CLKID_MPLL3]                   = &g12a_mpll3.hw,
-               [CLKID_DDR]                     = &g12a_ddr.hw,
-               [CLKID_DOS]                     = &g12a_dos.hw,
-               [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
-               [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
-               [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
-               [CLKID_ISA]                     = &g12a_isa.hw,
-               [CLKID_PL301]                   = &g12a_pl301.hw,
-               [CLKID_PERIPHS]                 = &g12a_periphs.hw,
-               [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
-               [CLKID_I2C]                     = &g12a_i2c.hw,
-               [CLKID_SANA]                    = &g12a_sana.hw,
-               [CLKID_SD]                      = &g12a_sd.hw,
-               [CLKID_RNG0]                    = &g12a_rng0.hw,
-               [CLKID_UART0]                   = &g12a_uart0.hw,
-               [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
-               [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
-               [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
-               [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
-               [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
-               [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
-               [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
-               [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
-               [CLKID_AUDIO]                   = &g12a_audio.hw,
-               [CLKID_ETH]                     = &g12a_eth_core.hw,
-               [CLKID_DEMUX]                   = &g12a_demux.hw,
-               [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
-               [CLKID_ADC]                     = &g12a_adc.hw,
-               [CLKID_UART1]                   = &g12a_uart1.hw,
-               [CLKID_G2D]                     = &g12a_g2d.hw,
-               [CLKID_RESET]                   = &g12a_reset.hw,
-               [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
-               [CLKID_PARSER]                  = &g12a_parser.hw,
-               [CLKID_USB]                     = &g12a_usb_general.hw,
-               [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
-               [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
-               [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
-               [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
-               [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
-               [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
-               [CLKID_BT656]                   = &g12a_bt656.hw,
-               [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
-               [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
-               [CLKID_UART2]                   = &g12a_uart2.hw,
-               [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
-               [CLKID_GIC]                     = &g12a_gic.hw,
-               [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
-               [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
-               [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
-               [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
-               [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
-               [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
-               [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
-               [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
-               [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
-               [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
-               [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
-               [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
-               [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
-               [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
-               [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
-               [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
-               [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
-               [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
-               [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
-               [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
-               [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
-               [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
-               [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
-               [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
-               [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
-               [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
-               [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
-               [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
-               [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
-               [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
-               [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
-               [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
-               [CLKID_ENC480P]                 = &g12a_enc480p.hw,
-               [CLKID_RNG1]                    = &g12a_rng1.hw,
-               [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
-               [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
-               [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
-               [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
-               [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
-               [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
-               [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
-               [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
-               [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
-               [CLKID_DMA]                     = &g12a_dma.hw,
-               [CLKID_EFUSE]                   = &g12a_efuse.hw,
-               [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
-               [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
-               [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
-               [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
-               [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
-               [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
-               [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
-               [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
-               [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
-               [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
-               [CLKID_VPU]                     = &g12a_vpu.hw,
-               [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
-               [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
-               [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
-               [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
-               [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
-               [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
-               [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
-               [CLKID_VAPB]                    = &g12a_vapb.hw,
-               [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
-               [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
-               [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
-               [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
-               [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
-               [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
-               [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
-               [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
-               [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
-               [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
-               [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
-               [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
-               [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
-               [CLKID_VCLK]                    = &g12a_vclk.hw,
-               [CLKID_VCLK2]                   = &g12a_vclk2.hw,
-               [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
-               [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
-               [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
-               [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
-               [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
-               [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
-               [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
-               [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
-               [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
-               [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
-               [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
-               [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
-               [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
-               [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
-               [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
-               [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
-               [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
-               [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
-               [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
-               [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
-               [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
-               [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
-               [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
-               [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
-               [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
-               [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
-               [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
-               [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
-               [CLKID_HDMI]                    = &g12a_hdmi.hw,
-               [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
-               [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
-               [CLKID_MALI_0]                  = &g12a_mali_0.hw,
-               [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
-               [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
-               [CLKID_MALI_1]                  = &g12a_mali_1.hw,
-               [CLKID_MALI]                    = &g12a_mali.hw,
-               [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
-               [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
-               [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
-               [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
-               [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
-               [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
-               [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
-               [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
-               [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
-               [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
-               [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
-               [CLKID_CPU_CLK]                 = &g12b_cpu_clk.hw,
-               [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
-               [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
-               [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
-               [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
-               [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
-               [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
-               [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
-               [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
-               [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
-               [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
-               [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
-               [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
-               [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
-               [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
-               [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
-               [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
-               [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
-               [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
-               [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
-               [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
-               [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
-               [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
-               [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
-               [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
-               [CLKID_TS]                      = &g12a_ts.hw,
-               [CLKID_SYS1_PLL_DCO]            = &g12b_sys1_pll_dco.hw,
-               [CLKID_SYS1_PLL]                = &g12b_sys1_pll.hw,
-               [CLKID_SYS1_PLL_DIV16_EN]       = &g12b_sys1_pll_div16_en.hw,
-               [CLKID_SYS1_PLL_DIV16]          = &g12b_sys1_pll_div16.hw,
-               [CLKID_CPUB_CLK_DYN0_SEL]       = &g12b_cpub_clk_premux0.hw,
-               [CLKID_CPUB_CLK_DYN0_DIV]       = &g12b_cpub_clk_mux0_div.hw,
-               [CLKID_CPUB_CLK_DYN0]           = &g12b_cpub_clk_postmux0.hw,
-               [CLKID_CPUB_CLK_DYN1_SEL]       = &g12b_cpub_clk_premux1.hw,
-               [CLKID_CPUB_CLK_DYN1_DIV]       = &g12b_cpub_clk_mux1_div.hw,
-               [CLKID_CPUB_CLK_DYN1]           = &g12b_cpub_clk_postmux1.hw,
-               [CLKID_CPUB_CLK_DYN]            = &g12b_cpub_clk_dyn.hw,
-               [CLKID_CPUB_CLK]                = &g12b_cpub_clk.hw,
-               [CLKID_CPUB_CLK_DIV16_EN]       = &g12b_cpub_clk_div16_en.hw,
-               [CLKID_CPUB_CLK_DIV16]          = &g12b_cpub_clk_div16.hw,
-               [CLKID_CPUB_CLK_DIV2]           = &g12b_cpub_clk_div2.hw,
-               [CLKID_CPUB_CLK_DIV3]           = &g12b_cpub_clk_div3.hw,
-               [CLKID_CPUB_CLK_DIV4]           = &g12b_cpub_clk_div4.hw,
-               [CLKID_CPUB_CLK_DIV5]           = &g12b_cpub_clk_div5.hw,
-               [CLKID_CPUB_CLK_DIV6]           = &g12b_cpub_clk_div6.hw,
-               [CLKID_CPUB_CLK_DIV7]           = &g12b_cpub_clk_div7.hw,
-               [CLKID_CPUB_CLK_DIV8]           = &g12b_cpub_clk_div8.hw,
-               [CLKID_CPUB_CLK_APB_SEL]        = &g12b_cpub_clk_apb_sel.hw,
-               [CLKID_CPUB_CLK_APB]            = &g12b_cpub_clk_apb.hw,
-               [CLKID_CPUB_CLK_ATB_SEL]        = &g12b_cpub_clk_atb_sel.hw,
-               [CLKID_CPUB_CLK_ATB]            = &g12b_cpub_clk_atb.hw,
-               [CLKID_CPUB_CLK_AXI_SEL]        = &g12b_cpub_clk_axi_sel.hw,
-               [CLKID_CPUB_CLK_AXI]            = &g12b_cpub_clk_axi.hw,
-               [CLKID_CPUB_CLK_TRACE_SEL]      = &g12b_cpub_clk_trace_sel.hw,
-               [CLKID_CPUB_CLK_TRACE]          = &g12b_cpub_clk_trace.hw,
-               [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
-               [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
-               [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
-               [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
-               [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
-               [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
-               [CLKID_NNA_AXI_CLK_SEL]         = &sm1_nna_axi_clk_sel.hw,
-               [CLKID_NNA_AXI_CLK_DIV]         = &sm1_nna_axi_clk_div.hw,
-               [CLKID_NNA_AXI_CLK]             = &sm1_nna_axi_clk.hw,
-               [CLKID_NNA_CORE_CLK_SEL]        = &sm1_nna_core_clk_sel.hw,
-               [CLKID_NNA_CORE_CLK_DIV]        = &sm1_nna_core_clk_div.hw,
-               [CLKID_NNA_CORE_CLK]            = &sm1_nna_core_clk.hw,
-               [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
-               [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
-               [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
-               [NR_CLKS]                       = NULL,
-       },
-       .num = NR_CLKS,
-};
-
-static struct clk_hw_onecell_data sm1_hw_onecell_data = {
-       .hws = {
-               [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
-               [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
-               [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
-               [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
-               [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
-               [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
-               [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
-               [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
-               [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
-               [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
-               [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
-               [CLKID_CLK81]                   = &g12a_clk81.hw,
-               [CLKID_MPLL0]                   = &g12a_mpll0.hw,
-               [CLKID_MPLL1]                   = &g12a_mpll1.hw,
-               [CLKID_MPLL2]                   = &g12a_mpll2.hw,
-               [CLKID_MPLL3]                   = &g12a_mpll3.hw,
-               [CLKID_DDR]                     = &g12a_ddr.hw,
-               [CLKID_DOS]                     = &g12a_dos.hw,
-               [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
-               [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
-               [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
-               [CLKID_ISA]                     = &g12a_isa.hw,
-               [CLKID_PL301]                   = &g12a_pl301.hw,
-               [CLKID_PERIPHS]                 = &g12a_periphs.hw,
-               [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
-               [CLKID_I2C]                     = &g12a_i2c.hw,
-               [CLKID_SANA]                    = &g12a_sana.hw,
-               [CLKID_SD]                      = &g12a_sd.hw,
-               [CLKID_RNG0]                    = &g12a_rng0.hw,
-               [CLKID_UART0]                   = &g12a_uart0.hw,
-               [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
-               [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
-               [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
-               [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
-               [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
-               [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
-               [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
-               [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
-               [CLKID_AUDIO]                   = &g12a_audio.hw,
-               [CLKID_ETH]                     = &g12a_eth_core.hw,
-               [CLKID_DEMUX]                   = &g12a_demux.hw,
-               [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
-               [CLKID_ADC]                     = &g12a_adc.hw,
-               [CLKID_UART1]                   = &g12a_uart1.hw,
-               [CLKID_G2D]                     = &g12a_g2d.hw,
-               [CLKID_RESET]                   = &g12a_reset.hw,
-               [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
-               [CLKID_PARSER]                  = &g12a_parser.hw,
-               [CLKID_USB]                     = &g12a_usb_general.hw,
-               [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
-               [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
-               [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
-               [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
-               [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
-               [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
-               [CLKID_BT656]                   = &g12a_bt656.hw,
-               [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
-               [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
-               [CLKID_UART2]                   = &g12a_uart2.hw,
-               [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
-               [CLKID_GIC]                     = &g12a_gic.hw,
-               [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
-               [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
-               [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
-               [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
-               [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
-               [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
-               [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
-               [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
-               [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
-               [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
-               [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
-               [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
-               [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
-               [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
-               [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
-               [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
-               [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
-               [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
-               [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
-               [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
-               [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
-               [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
-               [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
-               [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
-               [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
-               [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
-               [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
-               [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
-               [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
-               [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
-               [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
-               [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
-               [CLKID_ENC480P]                 = &g12a_enc480p.hw,
-               [CLKID_RNG1]                    = &g12a_rng1.hw,
-               [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
-               [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
-               [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
-               [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
-               [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
-               [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
-               [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
-               [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
-               [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
-               [CLKID_DMA]                     = &g12a_dma.hw,
-               [CLKID_EFUSE]                   = &g12a_efuse.hw,
-               [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
-               [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
-               [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
-               [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
-               [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
-               [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
-               [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
-               [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
-               [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
-               [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
-               [CLKID_VPU]                     = &g12a_vpu.hw,
-               [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
-               [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
-               [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
-               [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
-               [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
-               [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
-               [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
-               [CLKID_VAPB]                    = &g12a_vapb.hw,
-               [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
-               [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
-               [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
-               [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
-               [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
-               [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
-               [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
-               [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
-               [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
-               [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
-               [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
-               [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
-               [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
-               [CLKID_VCLK]                    = &g12a_vclk.hw,
-               [CLKID_VCLK2]                   = &g12a_vclk2.hw,
-               [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
-               [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
-               [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
-               [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
-               [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
-               [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
-               [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
-               [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
-               [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
-               [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
-               [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
-               [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
-               [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
-               [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
-               [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
-               [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
-               [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
-               [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
-               [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
-               [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
-               [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
-               [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
-               [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
-               [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
-               [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
-               [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
-               [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
-               [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
-               [CLKID_HDMI]                    = &g12a_hdmi.hw,
-               [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
-               [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
-               [CLKID_MALI_0]                  = &g12a_mali_0.hw,
-               [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
-               [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
-               [CLKID_MALI_1]                  = &g12a_mali_1.hw,
-               [CLKID_MALI]                    = &g12a_mali.hw,
-               [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
-               [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
-               [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
-               [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
-               [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
-               [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
-               [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
-               [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
-               [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
-               [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
-               [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
-               [CLKID_CPU_CLK]                 = &g12a_cpu_clk.hw,
-               [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
-               [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
-               [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
-               [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
-               [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
-               [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
-               [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
-               [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
-               [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
-               [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
-               [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
-               [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
-               [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
-               [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
-               [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
-               [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
-               [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
-               [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
-               [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
-               [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
-               [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
-               [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
-               [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
-               [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
-               [CLKID_TS]                      = &g12a_ts.hw,
-               [CLKID_GP1_PLL_DCO]             = &sm1_gp1_pll_dco.hw,
-               [CLKID_GP1_PLL]                 = &sm1_gp1_pll.hw,
-               [CLKID_DSU_CLK_DYN0_SEL]        = &sm1_dsu_clk_premux0.hw,
-               [CLKID_DSU_CLK_DYN0_DIV]        = &sm1_dsu_clk_premux1.hw,
-               [CLKID_DSU_CLK_DYN0]            = &sm1_dsu_clk_mux0_div.hw,
-               [CLKID_DSU_CLK_DYN1_SEL]        = &sm1_dsu_clk_postmux0.hw,
-               [CLKID_DSU_CLK_DYN1_DIV]        = &sm1_dsu_clk_mux1_div.hw,
-               [CLKID_DSU_CLK_DYN1]            = &sm1_dsu_clk_postmux1.hw,
-               [CLKID_DSU_CLK_DYN]             = &sm1_dsu_clk_dyn.hw,
-               [CLKID_DSU_CLK_FINAL]           = &sm1_dsu_final_clk.hw,
-               [CLKID_DSU_CLK]                 = &sm1_dsu_clk.hw,
-               [CLKID_CPU1_CLK]                = &sm1_cpu1_clk.hw,
-               [CLKID_CPU2_CLK]                = &sm1_cpu2_clk.hw,
-               [CLKID_CPU3_CLK]                = &sm1_cpu3_clk.hw,
-               [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
-               [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
-               [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
-               [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
-               [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
-               [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
-               [CLKID_NNA_AXI_CLK_SEL]         = &sm1_nna_axi_clk_sel.hw,
-               [CLKID_NNA_AXI_CLK_DIV]         = &sm1_nna_axi_clk_div.hw,
-               [CLKID_NNA_AXI_CLK]             = &sm1_nna_axi_clk.hw,
-               [CLKID_NNA_CORE_CLK_SEL]        = &sm1_nna_core_clk_sel.hw,
-               [CLKID_NNA_CORE_CLK_DIV]        = &sm1_nna_core_clk_div.hw,
-               [CLKID_NNA_CORE_CLK]            = &sm1_nna_core_clk.hw,
-               [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
-               [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
-               [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
-               [NR_CLKS]                       = NULL,
-       },
-       .num = NR_CLKS,
+static struct clk_hw *g12a_hw_clks[] = {
+       [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
+       [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
+       [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
+       [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
+       [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
+       [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
+       [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
+       [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
+       [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
+       [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
+       [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
+       [CLKID_CLK81]                   = &g12a_clk81.hw,
+       [CLKID_MPLL0]                   = &g12a_mpll0.hw,
+       [CLKID_MPLL1]                   = &g12a_mpll1.hw,
+       [CLKID_MPLL2]                   = &g12a_mpll2.hw,
+       [CLKID_MPLL3]                   = &g12a_mpll3.hw,
+       [CLKID_DDR]                     = &g12a_ddr.hw,
+       [CLKID_DOS]                     = &g12a_dos.hw,
+       [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
+       [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
+       [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
+       [CLKID_ISA]                     = &g12a_isa.hw,
+       [CLKID_PL301]                   = &g12a_pl301.hw,
+       [CLKID_PERIPHS]                 = &g12a_periphs.hw,
+       [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
+       [CLKID_I2C]                     = &g12a_i2c.hw,
+       [CLKID_SANA]                    = &g12a_sana.hw,
+       [CLKID_SD]                      = &g12a_sd.hw,
+       [CLKID_RNG0]                    = &g12a_rng0.hw,
+       [CLKID_UART0]                   = &g12a_uart0.hw,
+       [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
+       [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
+       [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
+       [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
+       [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
+       [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
+       [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
+       [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
+       [CLKID_AUDIO]                   = &g12a_audio.hw,
+       [CLKID_ETH]                     = &g12a_eth_core.hw,
+       [CLKID_DEMUX]                   = &g12a_demux.hw,
+       [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
+       [CLKID_ADC]                     = &g12a_adc.hw,
+       [CLKID_UART1]                   = &g12a_uart1.hw,
+       [CLKID_G2D]                     = &g12a_g2d.hw,
+       [CLKID_RESET]                   = &g12a_reset.hw,
+       [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
+       [CLKID_PARSER]                  = &g12a_parser.hw,
+       [CLKID_USB]                     = &g12a_usb_general.hw,
+       [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
+       [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
+       [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
+       [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
+       [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
+       [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
+       [CLKID_BT656]                   = &g12a_bt656.hw,
+       [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
+       [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
+       [CLKID_UART2]                   = &g12a_uart2.hw,
+       [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
+       [CLKID_GIC]                     = &g12a_gic.hw,
+       [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
+       [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
+       [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
+       [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
+       [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
+       [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
+       [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
+       [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
+       [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
+       [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
+       [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
+       [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
+       [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
+       [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
+       [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
+       [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
+       [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
+       [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
+       [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
+       [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
+       [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
+       [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
+       [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
+       [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
+       [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
+       [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
+       [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
+       [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
+       [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
+       [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
+       [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
+       [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
+       [CLKID_ENC480P]                 = &g12a_enc480p.hw,
+       [CLKID_RNG1]                    = &g12a_rng1.hw,
+       [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
+       [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
+       [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
+       [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
+       [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
+       [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
+       [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
+       [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
+       [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
+       [CLKID_DMA]                     = &g12a_dma.hw,
+       [CLKID_EFUSE]                   = &g12a_efuse.hw,
+       [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
+       [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
+       [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
+       [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
+       [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
+       [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
+       [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
+       [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
+       [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
+       [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
+       [CLKID_VPU]                     = &g12a_vpu.hw,
+       [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
+       [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
+       [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
+       [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
+       [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
+       [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
+       [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
+       [CLKID_VAPB]                    = &g12a_vapb.hw,
+       [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
+       [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
+       [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
+       [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
+       [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
+       [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
+       [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
+       [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
+       [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
+       [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
+       [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
+       [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
+       [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
+       [CLKID_VCLK]                    = &g12a_vclk.hw,
+       [CLKID_VCLK2]                   = &g12a_vclk2.hw,
+       [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
+       [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
+       [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
+       [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
+       [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
+       [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
+       [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
+       [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
+       [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
+       [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
+       [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
+       [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
+       [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
+       [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
+       [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
+       [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
+       [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
+       [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
+       [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
+       [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
+       [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
+       [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
+       [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
+       [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
+       [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
+       [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
+       [CLKID_HDMI]                    = &g12a_hdmi.hw,
+       [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
+       [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
+       [CLKID_MALI_0]                  = &g12a_mali_0.hw,
+       [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
+       [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
+       [CLKID_MALI_1]                  = &g12a_mali_1.hw,
+       [CLKID_MALI]                    = &g12a_mali.hw,
+       [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
+       [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
+       [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
+       [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
+       [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
+       [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
+       [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
+       [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
+       [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
+       [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
+       [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
+       [CLKID_CPU_CLK]                 = &g12a_cpu_clk.hw,
+       [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
+       [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
+       [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
+       [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
+       [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
+       [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
+       [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
+       [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
+       [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
+       [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
+       [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
+       [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
+       [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
+       [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
+       [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
+       [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
+       [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
+       [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
+       [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
+       [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
+       [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
+       [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
+       [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
+       [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
+       [CLKID_TS]                      = &g12a_ts.hw,
+       [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
+       [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
+       [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
+       [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
+       [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
+       [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
+       [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
+       [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
+       [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
+};
+
+static struct clk_hw *g12b_hw_clks[] = {
+       [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
+       [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
+       [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
+       [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
+       [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
+       [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
+       [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
+       [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
+       [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
+       [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
+       [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
+       [CLKID_CLK81]                   = &g12a_clk81.hw,
+       [CLKID_MPLL0]                   = &g12a_mpll0.hw,
+       [CLKID_MPLL1]                   = &g12a_mpll1.hw,
+       [CLKID_MPLL2]                   = &g12a_mpll2.hw,
+       [CLKID_MPLL3]                   = &g12a_mpll3.hw,
+       [CLKID_DDR]                     = &g12a_ddr.hw,
+       [CLKID_DOS]                     = &g12a_dos.hw,
+       [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
+       [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
+       [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
+       [CLKID_ISA]                     = &g12a_isa.hw,
+       [CLKID_PL301]                   = &g12a_pl301.hw,
+       [CLKID_PERIPHS]                 = &g12a_periphs.hw,
+       [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
+       [CLKID_I2C]                     = &g12a_i2c.hw,
+       [CLKID_SANA]                    = &g12a_sana.hw,
+       [CLKID_SD]                      = &g12a_sd.hw,
+       [CLKID_RNG0]                    = &g12a_rng0.hw,
+       [CLKID_UART0]                   = &g12a_uart0.hw,
+       [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
+       [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
+       [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
+       [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
+       [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
+       [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
+       [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
+       [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
+       [CLKID_AUDIO]                   = &g12a_audio.hw,
+       [CLKID_ETH]                     = &g12a_eth_core.hw,
+       [CLKID_DEMUX]                   = &g12a_demux.hw,
+       [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
+       [CLKID_ADC]                     = &g12a_adc.hw,
+       [CLKID_UART1]                   = &g12a_uart1.hw,
+       [CLKID_G2D]                     = &g12a_g2d.hw,
+       [CLKID_RESET]                   = &g12a_reset.hw,
+       [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
+       [CLKID_PARSER]                  = &g12a_parser.hw,
+       [CLKID_USB]                     = &g12a_usb_general.hw,
+       [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
+       [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
+       [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
+       [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
+       [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
+       [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
+       [CLKID_BT656]                   = &g12a_bt656.hw,
+       [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
+       [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
+       [CLKID_UART2]                   = &g12a_uart2.hw,
+       [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
+       [CLKID_GIC]                     = &g12a_gic.hw,
+       [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
+       [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
+       [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
+       [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
+       [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
+       [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
+       [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
+       [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
+       [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
+       [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
+       [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
+       [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
+       [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
+       [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
+       [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
+       [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
+       [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
+       [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
+       [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
+       [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
+       [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
+       [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
+       [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
+       [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
+       [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
+       [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
+       [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
+       [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
+       [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
+       [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
+       [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
+       [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
+       [CLKID_ENC480P]                 = &g12a_enc480p.hw,
+       [CLKID_RNG1]                    = &g12a_rng1.hw,
+       [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
+       [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
+       [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
+       [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
+       [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
+       [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
+       [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
+       [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
+       [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
+       [CLKID_DMA]                     = &g12a_dma.hw,
+       [CLKID_EFUSE]                   = &g12a_efuse.hw,
+       [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
+       [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
+       [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
+       [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
+       [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
+       [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
+       [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
+       [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
+       [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
+       [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
+       [CLKID_VPU]                     = &g12a_vpu.hw,
+       [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
+       [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
+       [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
+       [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
+       [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
+       [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
+       [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
+       [CLKID_VAPB]                    = &g12a_vapb.hw,
+       [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
+       [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
+       [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
+       [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
+       [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
+       [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
+       [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
+       [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
+       [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
+       [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
+       [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
+       [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
+       [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
+       [CLKID_VCLK]                    = &g12a_vclk.hw,
+       [CLKID_VCLK2]                   = &g12a_vclk2.hw,
+       [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
+       [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
+       [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
+       [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
+       [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
+       [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
+       [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
+       [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
+       [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
+       [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
+       [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
+       [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
+       [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
+       [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
+       [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
+       [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
+       [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
+       [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
+       [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
+       [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
+       [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
+       [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
+       [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
+       [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
+       [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
+       [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
+       [CLKID_HDMI]                    = &g12a_hdmi.hw,
+       [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
+       [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
+       [CLKID_MALI_0]                  = &g12a_mali_0.hw,
+       [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
+       [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
+       [CLKID_MALI_1]                  = &g12a_mali_1.hw,
+       [CLKID_MALI]                    = &g12a_mali.hw,
+       [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
+       [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
+       [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
+       [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
+       [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
+       [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
+       [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
+       [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
+       [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
+       [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
+       [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
+       [CLKID_CPU_CLK]                 = &g12b_cpu_clk.hw,
+       [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
+       [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
+       [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
+       [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
+       [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
+       [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
+       [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
+       [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
+       [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
+       [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
+       [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
+       [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
+       [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
+       [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
+       [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
+       [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
+       [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
+       [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
+       [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
+       [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
+       [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
+       [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
+       [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
+       [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
+       [CLKID_TS]                      = &g12a_ts.hw,
+       [CLKID_SYS1_PLL_DCO]            = &g12b_sys1_pll_dco.hw,
+       [CLKID_SYS1_PLL]                = &g12b_sys1_pll.hw,
+       [CLKID_SYS1_PLL_DIV16_EN]       = &g12b_sys1_pll_div16_en.hw,
+       [CLKID_SYS1_PLL_DIV16]          = &g12b_sys1_pll_div16.hw,
+       [CLKID_CPUB_CLK_DYN0_SEL]       = &g12b_cpub_clk_premux0.hw,
+       [CLKID_CPUB_CLK_DYN0_DIV]       = &g12b_cpub_clk_mux0_div.hw,
+       [CLKID_CPUB_CLK_DYN0]           = &g12b_cpub_clk_postmux0.hw,
+       [CLKID_CPUB_CLK_DYN1_SEL]       = &g12b_cpub_clk_premux1.hw,
+       [CLKID_CPUB_CLK_DYN1_DIV]       = &g12b_cpub_clk_mux1_div.hw,
+       [CLKID_CPUB_CLK_DYN1]           = &g12b_cpub_clk_postmux1.hw,
+       [CLKID_CPUB_CLK_DYN]            = &g12b_cpub_clk_dyn.hw,
+       [CLKID_CPUB_CLK]                = &g12b_cpub_clk.hw,
+       [CLKID_CPUB_CLK_DIV16_EN]       = &g12b_cpub_clk_div16_en.hw,
+       [CLKID_CPUB_CLK_DIV16]          = &g12b_cpub_clk_div16.hw,
+       [CLKID_CPUB_CLK_DIV2]           = &g12b_cpub_clk_div2.hw,
+       [CLKID_CPUB_CLK_DIV3]           = &g12b_cpub_clk_div3.hw,
+       [CLKID_CPUB_CLK_DIV4]           = &g12b_cpub_clk_div4.hw,
+       [CLKID_CPUB_CLK_DIV5]           = &g12b_cpub_clk_div5.hw,
+       [CLKID_CPUB_CLK_DIV6]           = &g12b_cpub_clk_div6.hw,
+       [CLKID_CPUB_CLK_DIV7]           = &g12b_cpub_clk_div7.hw,
+       [CLKID_CPUB_CLK_DIV8]           = &g12b_cpub_clk_div8.hw,
+       [CLKID_CPUB_CLK_APB_SEL]        = &g12b_cpub_clk_apb_sel.hw,
+       [CLKID_CPUB_CLK_APB]            = &g12b_cpub_clk_apb.hw,
+       [CLKID_CPUB_CLK_ATB_SEL]        = &g12b_cpub_clk_atb_sel.hw,
+       [CLKID_CPUB_CLK_ATB]            = &g12b_cpub_clk_atb.hw,
+       [CLKID_CPUB_CLK_AXI_SEL]        = &g12b_cpub_clk_axi_sel.hw,
+       [CLKID_CPUB_CLK_AXI]            = &g12b_cpub_clk_axi.hw,
+       [CLKID_CPUB_CLK_TRACE_SEL]      = &g12b_cpub_clk_trace_sel.hw,
+       [CLKID_CPUB_CLK_TRACE]          = &g12b_cpub_clk_trace.hw,
+       [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
+       [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
+       [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
+       [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
+       [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
+       [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
+       [CLKID_NNA_AXI_CLK_SEL]         = &sm1_nna_axi_clk_sel.hw,
+       [CLKID_NNA_AXI_CLK_DIV]         = &sm1_nna_axi_clk_div.hw,
+       [CLKID_NNA_AXI_CLK]             = &sm1_nna_axi_clk.hw,
+       [CLKID_NNA_CORE_CLK_SEL]        = &sm1_nna_core_clk_sel.hw,
+       [CLKID_NNA_CORE_CLK_DIV]        = &sm1_nna_core_clk_div.hw,
+       [CLKID_NNA_CORE_CLK]            = &sm1_nna_core_clk.hw,
+       [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
+       [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
+       [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
+};
+
+static struct clk_hw *sm1_hw_clks[] = {
+       [CLKID_SYS_PLL]                 = &g12a_sys_pll.hw,
+       [CLKID_FIXED_PLL]               = &g12a_fixed_pll.hw,
+       [CLKID_FCLK_DIV2]               = &g12a_fclk_div2.hw,
+       [CLKID_FCLK_DIV3]               = &g12a_fclk_div3.hw,
+       [CLKID_FCLK_DIV4]               = &g12a_fclk_div4.hw,
+       [CLKID_FCLK_DIV5]               = &g12a_fclk_div5.hw,
+       [CLKID_FCLK_DIV7]               = &g12a_fclk_div7.hw,
+       [CLKID_FCLK_DIV2P5]             = &g12a_fclk_div2p5.hw,
+       [CLKID_GP0_PLL]                 = &g12a_gp0_pll.hw,
+       [CLKID_MPEG_SEL]                = &g12a_mpeg_clk_sel.hw,
+       [CLKID_MPEG_DIV]                = &g12a_mpeg_clk_div.hw,
+       [CLKID_CLK81]                   = &g12a_clk81.hw,
+       [CLKID_MPLL0]                   = &g12a_mpll0.hw,
+       [CLKID_MPLL1]                   = &g12a_mpll1.hw,
+       [CLKID_MPLL2]                   = &g12a_mpll2.hw,
+       [CLKID_MPLL3]                   = &g12a_mpll3.hw,
+       [CLKID_DDR]                     = &g12a_ddr.hw,
+       [CLKID_DOS]                     = &g12a_dos.hw,
+       [CLKID_AUDIO_LOCKER]            = &g12a_audio_locker.hw,
+       [CLKID_MIPI_DSI_HOST]           = &g12a_mipi_dsi_host.hw,
+       [CLKID_ETH_PHY]                 = &g12a_eth_phy.hw,
+       [CLKID_ISA]                     = &g12a_isa.hw,
+       [CLKID_PL301]                   = &g12a_pl301.hw,
+       [CLKID_PERIPHS]                 = &g12a_periphs.hw,
+       [CLKID_SPICC0]                  = &g12a_spicc_0.hw,
+       [CLKID_I2C]                     = &g12a_i2c.hw,
+       [CLKID_SANA]                    = &g12a_sana.hw,
+       [CLKID_SD]                      = &g12a_sd.hw,
+       [CLKID_RNG0]                    = &g12a_rng0.hw,
+       [CLKID_UART0]                   = &g12a_uart0.hw,
+       [CLKID_SPICC1]                  = &g12a_spicc_1.hw,
+       [CLKID_HIU_IFACE]               = &g12a_hiu_reg.hw,
+       [CLKID_MIPI_DSI_PHY]            = &g12a_mipi_dsi_phy.hw,
+       [CLKID_ASSIST_MISC]             = &g12a_assist_misc.hw,
+       [CLKID_SD_EMMC_A]               = &g12a_emmc_a.hw,
+       [CLKID_SD_EMMC_B]               = &g12a_emmc_b.hw,
+       [CLKID_SD_EMMC_C]               = &g12a_emmc_c.hw,
+       [CLKID_AUDIO_CODEC]             = &g12a_audio_codec.hw,
+       [CLKID_AUDIO]                   = &g12a_audio.hw,
+       [CLKID_ETH]                     = &g12a_eth_core.hw,
+       [CLKID_DEMUX]                   = &g12a_demux.hw,
+       [CLKID_AUDIO_IFIFO]             = &g12a_audio_ififo.hw,
+       [CLKID_ADC]                     = &g12a_adc.hw,
+       [CLKID_UART1]                   = &g12a_uart1.hw,
+       [CLKID_G2D]                     = &g12a_g2d.hw,
+       [CLKID_RESET]                   = &g12a_reset.hw,
+       [CLKID_PCIE_COMB]               = &g12a_pcie_comb.hw,
+       [CLKID_PARSER]                  = &g12a_parser.hw,
+       [CLKID_USB]                     = &g12a_usb_general.hw,
+       [CLKID_PCIE_PHY]                = &g12a_pcie_phy.hw,
+       [CLKID_AHB_ARB0]                = &g12a_ahb_arb0.hw,
+       [CLKID_AHB_DATA_BUS]            = &g12a_ahb_data_bus.hw,
+       [CLKID_AHB_CTRL_BUS]            = &g12a_ahb_ctrl_bus.hw,
+       [CLKID_HTX_HDCP22]              = &g12a_htx_hdcp22.hw,
+       [CLKID_HTX_PCLK]                = &g12a_htx_pclk.hw,
+       [CLKID_BT656]                   = &g12a_bt656.hw,
+       [CLKID_USB1_DDR_BRIDGE]         = &g12a_usb1_to_ddr.hw,
+       [CLKID_MMC_PCLK]                = &g12a_mmc_pclk.hw,
+       [CLKID_UART2]                   = &g12a_uart2.hw,
+       [CLKID_VPU_INTR]                = &g12a_vpu_intr.hw,
+       [CLKID_GIC]                     = &g12a_gic.hw,
+       [CLKID_SD_EMMC_A_CLK0_SEL]      = &g12a_sd_emmc_a_clk0_sel.hw,
+       [CLKID_SD_EMMC_A_CLK0_DIV]      = &g12a_sd_emmc_a_clk0_div.hw,
+       [CLKID_SD_EMMC_A_CLK0]          = &g12a_sd_emmc_a_clk0.hw,
+       [CLKID_SD_EMMC_B_CLK0_SEL]      = &g12a_sd_emmc_b_clk0_sel.hw,
+       [CLKID_SD_EMMC_B_CLK0_DIV]      = &g12a_sd_emmc_b_clk0_div.hw,
+       [CLKID_SD_EMMC_B_CLK0]          = &g12a_sd_emmc_b_clk0.hw,
+       [CLKID_SD_EMMC_C_CLK0_SEL]      = &g12a_sd_emmc_c_clk0_sel.hw,
+       [CLKID_SD_EMMC_C_CLK0_DIV]      = &g12a_sd_emmc_c_clk0_div.hw,
+       [CLKID_SD_EMMC_C_CLK0]          = &g12a_sd_emmc_c_clk0.hw,
+       [CLKID_MPLL0_DIV]               = &g12a_mpll0_div.hw,
+       [CLKID_MPLL1_DIV]               = &g12a_mpll1_div.hw,
+       [CLKID_MPLL2_DIV]               = &g12a_mpll2_div.hw,
+       [CLKID_MPLL3_DIV]               = &g12a_mpll3_div.hw,
+       [CLKID_FCLK_DIV2_DIV]           = &g12a_fclk_div2_div.hw,
+       [CLKID_FCLK_DIV3_DIV]           = &g12a_fclk_div3_div.hw,
+       [CLKID_FCLK_DIV4_DIV]           = &g12a_fclk_div4_div.hw,
+       [CLKID_FCLK_DIV5_DIV]           = &g12a_fclk_div5_div.hw,
+       [CLKID_FCLK_DIV7_DIV]           = &g12a_fclk_div7_div.hw,
+       [CLKID_FCLK_DIV2P5_DIV]         = &g12a_fclk_div2p5_div.hw,
+       [CLKID_HIFI_PLL]                = &g12a_hifi_pll.hw,
+       [CLKID_VCLK2_VENCI0]            = &g12a_vclk2_venci0.hw,
+       [CLKID_VCLK2_VENCI1]            = &g12a_vclk2_venci1.hw,
+       [CLKID_VCLK2_VENCP0]            = &g12a_vclk2_vencp0.hw,
+       [CLKID_VCLK2_VENCP1]            = &g12a_vclk2_vencp1.hw,
+       [CLKID_VCLK2_VENCT0]            = &g12a_vclk2_venct0.hw,
+       [CLKID_VCLK2_VENCT1]            = &g12a_vclk2_venct1.hw,
+       [CLKID_VCLK2_OTHER]             = &g12a_vclk2_other.hw,
+       [CLKID_VCLK2_ENCI]              = &g12a_vclk2_enci.hw,
+       [CLKID_VCLK2_ENCP]              = &g12a_vclk2_encp.hw,
+       [CLKID_DAC_CLK]                 = &g12a_dac_clk.hw,
+       [CLKID_AOCLK]                   = &g12a_aoclk_gate.hw,
+       [CLKID_IEC958]                  = &g12a_iec958_gate.hw,
+       [CLKID_ENC480P]                 = &g12a_enc480p.hw,
+       [CLKID_RNG1]                    = &g12a_rng1.hw,
+       [CLKID_VCLK2_ENCT]              = &g12a_vclk2_enct.hw,
+       [CLKID_VCLK2_ENCL]              = &g12a_vclk2_encl.hw,
+       [CLKID_VCLK2_VENCLMMC]          = &g12a_vclk2_venclmmc.hw,
+       [CLKID_VCLK2_VENCL]             = &g12a_vclk2_vencl.hw,
+       [CLKID_VCLK2_OTHER1]            = &g12a_vclk2_other1.hw,
+       [CLKID_FIXED_PLL_DCO]           = &g12a_fixed_pll_dco.hw,
+       [CLKID_SYS_PLL_DCO]             = &g12a_sys_pll_dco.hw,
+       [CLKID_GP0_PLL_DCO]             = &g12a_gp0_pll_dco.hw,
+       [CLKID_HIFI_PLL_DCO]            = &g12a_hifi_pll_dco.hw,
+       [CLKID_DMA]                     = &g12a_dma.hw,
+       [CLKID_EFUSE]                   = &g12a_efuse.hw,
+       [CLKID_ROM_BOOT]                = &g12a_rom_boot.hw,
+       [CLKID_RESET_SEC]               = &g12a_reset_sec.hw,
+       [CLKID_SEC_AHB_APB3]            = &g12a_sec_ahb_apb3.hw,
+       [CLKID_MPLL_PREDIV]             = &g12a_mpll_prediv.hw,
+       [CLKID_VPU_0_SEL]               = &g12a_vpu_0_sel.hw,
+       [CLKID_VPU_0_DIV]               = &g12a_vpu_0_div.hw,
+       [CLKID_VPU_0]                   = &g12a_vpu_0.hw,
+       [CLKID_VPU_1_SEL]               = &g12a_vpu_1_sel.hw,
+       [CLKID_VPU_1_DIV]               = &g12a_vpu_1_div.hw,
+       [CLKID_VPU_1]                   = &g12a_vpu_1.hw,
+       [CLKID_VPU]                     = &g12a_vpu.hw,
+       [CLKID_VAPB_0_SEL]              = &g12a_vapb_0_sel.hw,
+       [CLKID_VAPB_0_DIV]              = &g12a_vapb_0_div.hw,
+       [CLKID_VAPB_0]                  = &g12a_vapb_0.hw,
+       [CLKID_VAPB_1_SEL]              = &g12a_vapb_1_sel.hw,
+       [CLKID_VAPB_1_DIV]              = &g12a_vapb_1_div.hw,
+       [CLKID_VAPB_1]                  = &g12a_vapb_1.hw,
+       [CLKID_VAPB_SEL]                = &g12a_vapb_sel.hw,
+       [CLKID_VAPB]                    = &g12a_vapb.hw,
+       [CLKID_HDMI_PLL_DCO]            = &g12a_hdmi_pll_dco.hw,
+       [CLKID_HDMI_PLL_OD]             = &g12a_hdmi_pll_od.hw,
+       [CLKID_HDMI_PLL_OD2]            = &g12a_hdmi_pll_od2.hw,
+       [CLKID_HDMI_PLL]                = &g12a_hdmi_pll.hw,
+       [CLKID_VID_PLL]                 = &g12a_vid_pll_div.hw,
+       [CLKID_VID_PLL_SEL]             = &g12a_vid_pll_sel.hw,
+       [CLKID_VID_PLL_DIV]             = &g12a_vid_pll.hw,
+       [CLKID_VCLK_SEL]                = &g12a_vclk_sel.hw,
+       [CLKID_VCLK2_SEL]               = &g12a_vclk2_sel.hw,
+       [CLKID_VCLK_INPUT]              = &g12a_vclk_input.hw,
+       [CLKID_VCLK2_INPUT]             = &g12a_vclk2_input.hw,
+       [CLKID_VCLK_DIV]                = &g12a_vclk_div.hw,
+       [CLKID_VCLK2_DIV]               = &g12a_vclk2_div.hw,
+       [CLKID_VCLK]                    = &g12a_vclk.hw,
+       [CLKID_VCLK2]                   = &g12a_vclk2.hw,
+       [CLKID_VCLK_DIV1]               = &g12a_vclk_div1.hw,
+       [CLKID_VCLK_DIV2_EN]            = &g12a_vclk_div2_en.hw,
+       [CLKID_VCLK_DIV4_EN]            = &g12a_vclk_div4_en.hw,
+       [CLKID_VCLK_DIV6_EN]            = &g12a_vclk_div6_en.hw,
+       [CLKID_VCLK_DIV12_EN]           = &g12a_vclk_div12_en.hw,
+       [CLKID_VCLK2_DIV1]              = &g12a_vclk2_div1.hw,
+       [CLKID_VCLK2_DIV2_EN]           = &g12a_vclk2_div2_en.hw,
+       [CLKID_VCLK2_DIV4_EN]           = &g12a_vclk2_div4_en.hw,
+       [CLKID_VCLK2_DIV6_EN]           = &g12a_vclk2_div6_en.hw,
+       [CLKID_VCLK2_DIV12_EN]          = &g12a_vclk2_div12_en.hw,
+       [CLKID_VCLK_DIV2]               = &g12a_vclk_div2.hw,
+       [CLKID_VCLK_DIV4]               = &g12a_vclk_div4.hw,
+       [CLKID_VCLK_DIV6]               = &g12a_vclk_div6.hw,
+       [CLKID_VCLK_DIV12]              = &g12a_vclk_div12.hw,
+       [CLKID_VCLK2_DIV2]              = &g12a_vclk2_div2.hw,
+       [CLKID_VCLK2_DIV4]              = &g12a_vclk2_div4.hw,
+       [CLKID_VCLK2_DIV6]              = &g12a_vclk2_div6.hw,
+       [CLKID_VCLK2_DIV12]             = &g12a_vclk2_div12.hw,
+       [CLKID_CTS_ENCI_SEL]            = &g12a_cts_enci_sel.hw,
+       [CLKID_CTS_ENCP_SEL]            = &g12a_cts_encp_sel.hw,
+       [CLKID_CTS_VDAC_SEL]            = &g12a_cts_vdac_sel.hw,
+       [CLKID_HDMI_TX_SEL]             = &g12a_hdmi_tx_sel.hw,
+       [CLKID_CTS_ENCI]                = &g12a_cts_enci.hw,
+       [CLKID_CTS_ENCP]                = &g12a_cts_encp.hw,
+       [CLKID_CTS_VDAC]                = &g12a_cts_vdac.hw,
+       [CLKID_HDMI_TX]                 = &g12a_hdmi_tx.hw,
+       [CLKID_HDMI_SEL]                = &g12a_hdmi_sel.hw,
+       [CLKID_HDMI_DIV]                = &g12a_hdmi_div.hw,
+       [CLKID_HDMI]                    = &g12a_hdmi.hw,
+       [CLKID_MALI_0_SEL]              = &g12a_mali_0_sel.hw,
+       [CLKID_MALI_0_DIV]              = &g12a_mali_0_div.hw,
+       [CLKID_MALI_0]                  = &g12a_mali_0.hw,
+       [CLKID_MALI_1_SEL]              = &g12a_mali_1_sel.hw,
+       [CLKID_MALI_1_DIV]              = &g12a_mali_1_div.hw,
+       [CLKID_MALI_1]                  = &g12a_mali_1.hw,
+       [CLKID_MALI]                    = &g12a_mali.hw,
+       [CLKID_MPLL_50M_DIV]            = &g12a_mpll_50m_div.hw,
+       [CLKID_MPLL_50M]                = &g12a_mpll_50m.hw,
+       [CLKID_SYS_PLL_DIV16_EN]        = &g12a_sys_pll_div16_en.hw,
+       [CLKID_SYS_PLL_DIV16]           = &g12a_sys_pll_div16.hw,
+       [CLKID_CPU_CLK_DYN0_SEL]        = &g12a_cpu_clk_premux0.hw,
+       [CLKID_CPU_CLK_DYN0_DIV]        = &g12a_cpu_clk_mux0_div.hw,
+       [CLKID_CPU_CLK_DYN0]            = &g12a_cpu_clk_postmux0.hw,
+       [CLKID_CPU_CLK_DYN1_SEL]        = &g12a_cpu_clk_premux1.hw,
+       [CLKID_CPU_CLK_DYN1_DIV]        = &g12a_cpu_clk_mux1_div.hw,
+       [CLKID_CPU_CLK_DYN1]            = &g12a_cpu_clk_postmux1.hw,
+       [CLKID_CPU_CLK_DYN]             = &g12a_cpu_clk_dyn.hw,
+       [CLKID_CPU_CLK]                 = &g12a_cpu_clk.hw,
+       [CLKID_CPU_CLK_DIV16_EN]        = &g12a_cpu_clk_div16_en.hw,
+       [CLKID_CPU_CLK_DIV16]           = &g12a_cpu_clk_div16.hw,
+       [CLKID_CPU_CLK_APB_DIV]         = &g12a_cpu_clk_apb_div.hw,
+       [CLKID_CPU_CLK_APB]             = &g12a_cpu_clk_apb.hw,
+       [CLKID_CPU_CLK_ATB_DIV]         = &g12a_cpu_clk_atb_div.hw,
+       [CLKID_CPU_CLK_ATB]             = &g12a_cpu_clk_atb.hw,
+       [CLKID_CPU_CLK_AXI_DIV]         = &g12a_cpu_clk_axi_div.hw,
+       [CLKID_CPU_CLK_AXI]             = &g12a_cpu_clk_axi.hw,
+       [CLKID_CPU_CLK_TRACE_DIV]       = &g12a_cpu_clk_trace_div.hw,
+       [CLKID_CPU_CLK_TRACE]           = &g12a_cpu_clk_trace.hw,
+       [CLKID_PCIE_PLL_DCO]            = &g12a_pcie_pll_dco.hw,
+       [CLKID_PCIE_PLL_DCO_DIV2]       = &g12a_pcie_pll_dco_div2.hw,
+       [CLKID_PCIE_PLL_OD]             = &g12a_pcie_pll_od.hw,
+       [CLKID_PCIE_PLL]                = &g12a_pcie_pll.hw,
+       [CLKID_VDEC_1_SEL]              = &g12a_vdec_1_sel.hw,
+       [CLKID_VDEC_1_DIV]              = &g12a_vdec_1_div.hw,
+       [CLKID_VDEC_1]                  = &g12a_vdec_1.hw,
+       [CLKID_VDEC_HEVC_SEL]           = &g12a_vdec_hevc_sel.hw,
+       [CLKID_VDEC_HEVC_DIV]           = &g12a_vdec_hevc_div.hw,
+       [CLKID_VDEC_HEVC]               = &g12a_vdec_hevc.hw,
+       [CLKID_VDEC_HEVCF_SEL]          = &g12a_vdec_hevcf_sel.hw,
+       [CLKID_VDEC_HEVCF_DIV]          = &g12a_vdec_hevcf_div.hw,
+       [CLKID_VDEC_HEVCF]              = &g12a_vdec_hevcf.hw,
+       [CLKID_TS_DIV]                  = &g12a_ts_div.hw,
+       [CLKID_TS]                      = &g12a_ts.hw,
+       [CLKID_GP1_PLL_DCO]             = &sm1_gp1_pll_dco.hw,
+       [CLKID_GP1_PLL]                 = &sm1_gp1_pll.hw,
+       [CLKID_DSU_CLK_DYN0_SEL]        = &sm1_dsu_clk_premux0.hw,
+       [CLKID_DSU_CLK_DYN0_DIV]        = &sm1_dsu_clk_premux1.hw,
+       [CLKID_DSU_CLK_DYN0]            = &sm1_dsu_clk_mux0_div.hw,
+       [CLKID_DSU_CLK_DYN1_SEL]        = &sm1_dsu_clk_postmux0.hw,
+       [CLKID_DSU_CLK_DYN1_DIV]        = &sm1_dsu_clk_mux1_div.hw,
+       [CLKID_DSU_CLK_DYN1]            = &sm1_dsu_clk_postmux1.hw,
+       [CLKID_DSU_CLK_DYN]             = &sm1_dsu_clk_dyn.hw,
+       [CLKID_DSU_CLK_FINAL]           = &sm1_dsu_final_clk.hw,
+       [CLKID_DSU_CLK]                 = &sm1_dsu_clk.hw,
+       [CLKID_CPU1_CLK]                = &sm1_cpu1_clk.hw,
+       [CLKID_CPU2_CLK]                = &sm1_cpu2_clk.hw,
+       [CLKID_CPU3_CLK]                = &sm1_cpu3_clk.hw,
+       [CLKID_SPICC0_SCLK_SEL]         = &g12a_spicc0_sclk_sel.hw,
+       [CLKID_SPICC0_SCLK_DIV]         = &g12a_spicc0_sclk_div.hw,
+       [CLKID_SPICC0_SCLK]             = &g12a_spicc0_sclk.hw,
+       [CLKID_SPICC1_SCLK_SEL]         = &g12a_spicc1_sclk_sel.hw,
+       [CLKID_SPICC1_SCLK_DIV]         = &g12a_spicc1_sclk_div.hw,
+       [CLKID_SPICC1_SCLK]             = &g12a_spicc1_sclk.hw,
+       [CLKID_NNA_AXI_CLK_SEL]         = &sm1_nna_axi_clk_sel.hw,
+       [CLKID_NNA_AXI_CLK_DIV]         = &sm1_nna_axi_clk_div.hw,
+       [CLKID_NNA_AXI_CLK]             = &sm1_nna_axi_clk.hw,
+       [CLKID_NNA_CORE_CLK_SEL]        = &sm1_nna_core_clk_sel.hw,
+       [CLKID_NNA_CORE_CLK_DIV]        = &sm1_nna_core_clk_div.hw,
+       [CLKID_NNA_CORE_CLK]            = &sm1_nna_core_clk.hw,
+       [CLKID_MIPI_DSI_PXCLK_SEL]      = &g12a_mipi_dsi_pxclk_sel.hw,
+       [CLKID_MIPI_DSI_PXCLK_DIV]      = &g12a_mipi_dsi_pxclk_div.hw,
+       [CLKID_MIPI_DSI_PXCLK]          = &g12a_mipi_dsi_pxclk.hw,
 };
 
 /* Convenience table to populate regmap in .probe */
@@ -5274,7 +5262,7 @@ static int meson_g12a_dvfs_setup_common(struct device *dev,
 
 static int meson_g12b_dvfs_setup(struct platform_device *pdev)
 {
-       struct clk_hw **hws = g12b_hw_onecell_data.hws;
+       struct clk_hw **hws = g12b_hw_clks;
        struct device *dev = &pdev->dev;
        struct clk *notifier_clk;
        struct clk_hw *xtal;
@@ -5351,7 +5339,7 @@ static int meson_g12b_dvfs_setup(struct platform_device *pdev)
 
 static int meson_g12a_dvfs_setup(struct platform_device *pdev)
 {
-       struct clk_hw **hws = g12a_hw_onecell_data.hws;
+       struct clk_hw **hws = g12a_hw_clks;
        struct device *dev = &pdev->dev;
        struct clk *notifier_clk;
        int ret;
@@ -5413,7 +5401,10 @@ static const struct meson_g12a_data g12a_clkc_data = {
        .eeclkc_data = {
                .regmap_clks = g12a_clk_regmaps,
                .regmap_clk_num = ARRAY_SIZE(g12a_clk_regmaps),
-               .hw_onecell_data = &g12a_hw_onecell_data,
+               .hw_clks = {
+                       .hws = g12a_hw_clks,
+                       .num = ARRAY_SIZE(g12a_hw_clks),
+               },
                .init_regs = g12a_init_regs,
                .init_count = ARRAY_SIZE(g12a_init_regs),
        },
@@ -5424,7 +5415,10 @@ static const struct meson_g12a_data g12b_clkc_data = {
        .eeclkc_data = {
                .regmap_clks = g12a_clk_regmaps,
                .regmap_clk_num = ARRAY_SIZE(g12a_clk_regmaps),
-               .hw_onecell_data = &g12b_hw_onecell_data,
+               .hw_clks = {
+                       .hws = g12b_hw_clks,
+                       .num = ARRAY_SIZE(g12b_hw_clks),
+               },
        },
        .dvfs_setup = meson_g12b_dvfs_setup,
 };
@@ -5433,7 +5427,10 @@ static const struct meson_g12a_data sm1_clkc_data = {
        .eeclkc_data = {
                .regmap_clks = g12a_clk_regmaps,
                .regmap_clk_num = ARRAY_SIZE(g12a_clk_regmaps),
-               .hw_onecell_data = &sm1_hw_onecell_data,
+               .hw_clks = {
+                       .hws = sm1_hw_clks,
+                       .num = ARRAY_SIZE(sm1_hw_clks),
+               },
        },
        .dvfs_setup = meson_g12a_dvfs_setup,
 };