Commit 3c67d116 authored by Michael Turquette's avatar Michael Turquette

Merge branch 'clk-sunxi-ng' into clk-next

parents 7adb7695 f38f5199
This diff is collapsed.
...@@ -60,6 +60,6 @@ config SUN8I_H3_CCU ...@@ -60,6 +60,6 @@ config SUN8I_H3_CCU
select SUNXI_CCU_NM select SUNXI_CCU_NM
select SUNXI_CCU_MP select SUNXI_CCU_MP
select SUNXI_CCU_PHASE select SUNXI_CCU_PHASE
default ARCH_SUN8I default MACH_SUN8I
endif endif
...@@ -817,8 +817,8 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node) ...@@ -817,8 +817,8 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node)
/* Force the PLL-Audio-1x divider to 4 */ /* Force the PLL-Audio-1x divider to 4 */
val = readl(reg + SUN8I_H3_PLL_AUDIO_REG); val = readl(reg + SUN8I_H3_PLL_AUDIO_REG);
val &= ~GENMASK(4, 0); val &= ~GENMASK(19, 16);
writel(val | 3, reg + SUN8I_H3_PLL_AUDIO_REG); writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG);
sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc); sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment