diff options
Diffstat (limited to 'drivers/clk/qcom/lcc-ipq806x.c')
| -rw-r--r-- | drivers/clk/qcom/lcc-ipq806x.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c index 121ffde25dc3..47f0ac16d149 100644 --- a/drivers/clk/qcom/lcc-ipq806x.c +++ b/drivers/clk/qcom/lcc-ipq806x.c @@ -61,12 +61,14 @@ static const struct pll_config pll4_config = { .main_output_mask = BIT(23), }; -#define P_PXO 0 -#define P_PLL4 1 +enum { + P_PXO, + P_PLL4, +}; -static const u8 lcc_pxo_pll4_map[] = { - [P_PXO] = 0, - [P_PLL4] = 2, +static const struct parent_map lcc_pxo_pll4_map[] = { + { P_PXO, 0 }, + { P_PLL4, 2 } }; static const char *lcc_pxo_pll4[] = { @@ -294,14 +296,14 @@ static struct clk_regmap_mux pcm_clk = { }; static struct freq_tbl clk_tbl_aif_osr[] = { - { 22050, P_PLL4, 1, 147, 20480 }, - { 32000, P_PLL4, 1, 1, 96 }, - { 44100, P_PLL4, 1, 147, 10240 }, - { 48000, P_PLL4, 1, 1, 64 }, - { 88200, P_PLL4, 1, 147, 5120 }, - { 96000, P_PLL4, 1, 1, 32 }, - { 176400, P_PLL4, 1, 147, 2560 }, - { 192000, P_PLL4, 1, 1, 16 }, + { 2822400, P_PLL4, 1, 147, 20480 }, + { 4096000, P_PLL4, 1, 1, 96 }, + { 5644800, P_PLL4, 1, 147, 10240 }, + { 6144000, P_PLL4, 1, 1, 64 }, + { 11289600, P_PLL4, 1, 147, 5120 }, + { 12288000, P_PLL4, 1, 1, 32 }, + { 22579200, P_PLL4, 1, 147, 2560 }, + { 24576000, P_PLL4, 1, 1, 16 }, { }, }; @@ -360,7 +362,7 @@ static struct clk_branch spdif_clk = { }; static struct freq_tbl clk_tbl_ahbix[] = { - { 131072, P_PLL4, 1, 1, 3 }, + { 131072000, P_PLL4, 1, 1, 3 }, { }, }; @@ -386,13 +388,12 @@ static struct clk_rcg ahbix_clk = { .freq_tbl = clk_tbl_ahbix, .clkr = { .enable_reg = 0x38, - .enable_mask = BIT(10), /* toggle the gfmux to select mn/pxo */ + .enable_mask = BIT(11), .hw.init = &(struct clk_init_data){ .name = "ahbix", .parent_names = lcc_pxo_pll4, .num_parents = 2, - .ops = &clk_rcg_ops, - .flags = CLK_SET_RATE_GATE, + .ops = &clk_rcg_lcc_ops, }, }, }; @@ -462,7 +463,6 @@ static struct platform_driver lcc_ipq806x_driver = { .remove = lcc_ipq806x_remove, .driver = { .name = "lcc-ipq806x", - .owner = THIS_MODULE, .of_match_table = lcc_ipq806x_match_table, }, }; |