#define CBF_PLL_OFFSET 0xf000
 
-static const u8 cbf_pll_regs[PLL_OFF_MAX_REGS] = {
-       [PLL_OFF_L_VAL] = 0x08,
-       [PLL_OFF_ALPHA_VAL] = 0x10,
-       [PLL_OFF_USER_CTL] = 0x18,
-       [PLL_OFF_CONFIG_CTL] = 0x20,
-       [PLL_OFF_CONFIG_CTL_U] = 0x24,
-       [PLL_OFF_TEST_CTL] = 0x30,
-       [PLL_OFF_TEST_CTL_U] = 0x34,
-       [PLL_OFF_STATUS] = 0x28,
-};
-
 static struct alpha_pll_config cbfpll_config = {
        .l = 72,
        .config_ctl_val = 0x200d4828,
 
 static struct clk_alpha_pll cbf_pll = {
        .offset = CBF_PLL_OFFSET,
-       .regs = cbf_pll_regs,
+       .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_HUAYRA_APSS],
        .flags = SUPPORTS_DYNAMIC_UPDATE | SUPPORTS_FSM_MODE,
        .clkr.hw.init = &(struct clk_init_data){
                .name = "cbf_pll",