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

This commit is contained in:
Michael Turquette 2016-07-11 14:39:47 -07:00
commit 3c67d1162a
3 changed files with 63 additions and 255 deletions

View file

@ -60,6 +60,6 @@ config SUN8I_H3_CCU
select SUNXI_CCU_NM
select SUNXI_CCU_MP
select SUNXI_CCU_PHASE
default ARCH_SUN8I
default MACH_SUN8I
endif

View file

@ -817,8 +817,8 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node)
/* Force the PLL-Audio-1x divider to 4 */
val = readl(reg + SUN8I_H3_PLL_AUDIO_REG);
val &= ~GENMASK(4, 0);
writel(val | 3, reg + SUN8I_H3_PLL_AUDIO_REG);
val &= ~GENMASK(19, 16);
writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG);
sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc);
}