* [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset
@ 2016-07-11 20:34 Maxime Ripard
2016-07-11 20:34 ` [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo Maxime Ripard
2016-07-11 21:36 ` [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Michael Turquette
0 siblings, 2 replies; 4+ messages in thread
From: Maxime Ripard @ 2016-07-11 20:34 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Chen-Yu Tsai
Cc: linux-clk, linux-arm-kernel, linux-kernel, Maxime Ripard
The code had a typo and got the wrong offset for the hardcoded divider, fix
that.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reported-by: Jean-Francois Moine <moinejf@free.fr>
Reported-by: Chen-Yu Tsai <wens@csie.org>
---
drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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);
}
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo
2016-07-11 20:34 [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Maxime Ripard
@ 2016-07-11 20:34 ` Maxime Ripard
2016-07-11 21:36 ` Michael Turquette
2016-07-11 21:36 ` [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Michael Turquette
1 sibling, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2016-07-11 20:34 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Chen-Yu Tsai
Cc: linux-clk, linux-arm-kernel, linux-kernel, Maxime Ripard
The Kconfig symbol for the sun8i SoC family was mistyped. Fix that.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/clk/sunxi-ng/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset
2016-07-11 20:34 [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Maxime Ripard
2016-07-11 20:34 ` [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo Maxime Ripard
@ 2016-07-11 21:36 ` Michael Turquette
1 sibling, 0 replies; 4+ messages in thread
From: Michael Turquette @ 2016-07-11 21:36 UTC (permalink / raw)
To: Maxime Ripard, Stephen Boyd, Chen-Yu Tsai
Cc: linux-clk, linux-arm-kernel, linux-kernel, Maxime Ripard
Quoting Maxime Ripard (2016-07-11 13:34:47)
> The code had a typo and got the wrong offset for the hardcoded divider, f=
ix
> that.
> =
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Reported-by: Jean-Francois Moine <moinejf@free.fr>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
Applied.
Regards,
Mike
> ---
> drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> =
> diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/c=
cu-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_n=
ode *node)
> =
> /* Force the PLL-Audio-1x divider to 4 */
> val =3D readl(reg + SUN8I_H3_PLL_AUDIO_REG);
> - val &=3D ~GENMASK(4, 0);
> - writel(val | 3, reg + SUN8I_H3_PLL_AUDIO_REG);
> + val &=3D ~GENMASK(19, 16);
> + writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG);
> =
> sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc);
> }
> -- =
> 2.9.0
>=20
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo
2016-07-11 20:34 ` [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo Maxime Ripard
@ 2016-07-11 21:36 ` Michael Turquette
0 siblings, 0 replies; 4+ messages in thread
From: Michael Turquette @ 2016-07-11 21:36 UTC (permalink / raw)
To: Maxime Ripard, Stephen Boyd, Chen-Yu Tsai
Cc: linux-clk, linux-arm-kernel, linux-kernel, Maxime Ripard
Quoting Maxime Ripard (2016-07-11 13:34:48)
> The Kconfig symbol for the sun8i SoC family was mistyped. Fix that.
> =
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Applied.
Regards,
Mike
> ---
> drivers/clk/sunxi-ng/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> =
> 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
> -- =
> 2.9.0
>=20
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-11 21:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-11 20:34 [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Maxime Ripard
2016-07-11 20:34 ` [PATCH 2/2] clk: sunxi-ng: h3: Fix Kconfig symbol typo Maxime Ripard
2016-07-11 21:36 ` Michael Turquette
2016-07-11 21:36 ` [PATCH 1/2] clk: sunxi-ng: h3: Fix audio clock divider offset Michael Turquette
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).