diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-07-12 00:39:47 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-12 00:39:47 +0300 |
| commit | 3c67d1162aaf51b028784c249bf213f9b14df66b (patch) | |
| tree | b6b88f0a9571cef7c7aa85ae88c2153ffcadd078 /drivers/clk | |
| parent | 7adb76956189d10fd77f00b41b4d413480e94715 (diff) | |
| parent | f38f51992347f80f982e50160596fd5388a43797 (diff) | |
| download | linux-3c67d1162aaf51b028784c249bf213f9b14df66b.tar.xz | |
Merge branch 'clk-sunxi-ng' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/sunxi-ng/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 41e53e8d4d41..2afcbd39e41e 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -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 diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c index bcc0a95549d3..9af359544110 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c @@ -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); } |