* [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap
@ 2012-12-05 1:43 Kuninori Morimoto
2012-12-13 0:17 ` Simon Horman
2012-12-14 0:57 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2012-12-05 1:43 UTC (permalink / raw)
To: linux-sh
div4_clks's bitmap of sh73a0 was wrong.
This patch is based on v2.0 datasheet.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/mach-shmobile/clock-sh73a0.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 516ff7f..5f57701 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -264,17 +264,17 @@ enum { DIV4_I, DIV4_ZG, DIV4_M3, DIV4_B, DIV4_M1, DIV4_M2,
SH_CLK_DIV4(&pll1_clk, _reg, _bit, _mask, _flags)
static struct clk div4_clks[DIV4_NR] = {
- [DIV4_I] = DIV4(FRQCRA, 20, 0xfff, CLK_ENABLE_ON_INIT),
- [DIV4_ZG] = DIV4(FRQCRA, 16, 0xbff, CLK_ENABLE_ON_INIT),
- [DIV4_M3] = DIV4(FRQCRA, 12, 0xfff, CLK_ENABLE_ON_INIT),
- [DIV4_B] = DIV4(FRQCRA, 8, 0xfff, CLK_ENABLE_ON_INIT),
- [DIV4_M1] = DIV4(FRQCRA, 4, 0xfff, 0),
- [DIV4_M2] = DIV4(FRQCRA, 0, 0xfff, 0),
- [DIV4_Z] = DIV4(FRQCRB, 24, 0xbff, 0),
- [DIV4_ZTR] = DIV4(FRQCRB, 20, 0xfff, 0),
- [DIV4_ZT] = DIV4(FRQCRB, 16, 0xfff, 0),
- [DIV4_ZX] = DIV4(FRQCRB, 12, 0xfff, 0),
- [DIV4_HP] = DIV4(FRQCRB, 4, 0xfff, 0),
+ [DIV4_I] = DIV4(FRQCRA, 20, 0xdff, CLK_ENABLE_ON_INIT),
+ [DIV4_ZG] = DIV4(FRQCRA, 16, 0xd7f, CLK_ENABLE_ON_INIT),
+ [DIV4_M3] = DIV4(FRQCRA, 12, 0x1dff, CLK_ENABLE_ON_INIT),
+ [DIV4_B] = DIV4(FRQCRA, 8, 0xdff, CLK_ENABLE_ON_INIT),
+ [DIV4_M1] = DIV4(FRQCRA, 4, 0x1dff, 0),
+ [DIV4_M2] = DIV4(FRQCRA, 0, 0x1dff, 0),
+ [DIV4_Z] = DIV4(FRQCRB, 24, 0x97f, 0),
+ [DIV4_ZTR] = DIV4(FRQCRB, 20, 0xdff, 0),
+ [DIV4_ZT] = DIV4(FRQCRB, 16, 0xdff, 0),
+ [DIV4_ZX] = DIV4(FRQCRB, 12, 0xdff, 0),
+ [DIV4_HP] = DIV4(FRQCRB, 4, 0xdff, 0),
};
enum { DIV6_VCK1, DIV6_VCK2, DIV6_VCK3, DIV6_ZB1,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap
2012-12-05 1:43 [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap Kuninori Morimoto
@ 2012-12-13 0:17 ` Simon Horman
2012-12-14 0:57 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-12-13 0:17 UTC (permalink / raw)
To: linux-sh
On Tue, Dec 04, 2012 at 05:43:29PM -0800, Kuninori Morimoto wrote:
> div4_clks's bitmap of sh73a0 was wrong.
> This patch is based on v2.0 datasheet.
Magnus, could you check this?
Or alternatively, could someone point me to the appropriate
pages of the data sheet?
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/arm/mach-shmobile/clock-sh73a0.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
> index 516ff7f..5f57701 100644
> --- a/arch/arm/mach-shmobile/clock-sh73a0.c
> +++ b/arch/arm/mach-shmobile/clock-sh73a0.c
> @@ -264,17 +264,17 @@ enum { DIV4_I, DIV4_ZG, DIV4_M3, DIV4_B, DIV4_M1, DIV4_M2,
> SH_CLK_DIV4(&pll1_clk, _reg, _bit, _mask, _flags)
>
> static struct clk div4_clks[DIV4_NR] = {
> - [DIV4_I] = DIV4(FRQCRA, 20, 0xfff, CLK_ENABLE_ON_INIT),
> - [DIV4_ZG] = DIV4(FRQCRA, 16, 0xbff, CLK_ENABLE_ON_INIT),
> - [DIV4_M3] = DIV4(FRQCRA, 12, 0xfff, CLK_ENABLE_ON_INIT),
> - [DIV4_B] = DIV4(FRQCRA, 8, 0xfff, CLK_ENABLE_ON_INIT),
> - [DIV4_M1] = DIV4(FRQCRA, 4, 0xfff, 0),
> - [DIV4_M2] = DIV4(FRQCRA, 0, 0xfff, 0),
> - [DIV4_Z] = DIV4(FRQCRB, 24, 0xbff, 0),
> - [DIV4_ZTR] = DIV4(FRQCRB, 20, 0xfff, 0),
> - [DIV4_ZT] = DIV4(FRQCRB, 16, 0xfff, 0),
> - [DIV4_ZX] = DIV4(FRQCRB, 12, 0xfff, 0),
> - [DIV4_HP] = DIV4(FRQCRB, 4, 0xfff, 0),
> + [DIV4_I] = DIV4(FRQCRA, 20, 0xdff, CLK_ENABLE_ON_INIT),
> + [DIV4_ZG] = DIV4(FRQCRA, 16, 0xd7f, CLK_ENABLE_ON_INIT),
> + [DIV4_M3] = DIV4(FRQCRA, 12, 0x1dff, CLK_ENABLE_ON_INIT),
> + [DIV4_B] = DIV4(FRQCRA, 8, 0xdff, CLK_ENABLE_ON_INIT),
> + [DIV4_M1] = DIV4(FRQCRA, 4, 0x1dff, 0),
> + [DIV4_M2] = DIV4(FRQCRA, 0, 0x1dff, 0),
> + [DIV4_Z] = DIV4(FRQCRB, 24, 0x97f, 0),
> + [DIV4_ZTR] = DIV4(FRQCRB, 20, 0xdff, 0),
> + [DIV4_ZT] = DIV4(FRQCRB, 16, 0xdff, 0),
> + [DIV4_ZX] = DIV4(FRQCRB, 12, 0xdff, 0),
> + [DIV4_HP] = DIV4(FRQCRB, 4, 0xdff, 0),
> };
>
> enum { DIV6_VCK1, DIV6_VCK2, DIV6_VCK3, DIV6_ZB1,
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap
2012-12-05 1:43 [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap Kuninori Morimoto
2012-12-13 0:17 ` Simon Horman
@ 2012-12-14 0:57 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-12-14 0:57 UTC (permalink / raw)
To: linux-sh
On Tue, Dec 04, 2012 at 05:43:29PM -0800, Kuninori Morimoto wrote:
> div4_clks's bitmap of sh73a0 was wrong.
> This patch is based on v2.0 datasheet.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thanks applied.
I have applied this to a temporary 'soc5' branch which is based on 3.7-rc1.
I will rebase this on 3.8-rc1 once it is released and rename the branch
to the more sane 'soc'.
I have also merged this change into the next branch.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-14 0:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-05 1:43 [PATCH] ARM: shmobile: sh73a0: fixup div4_clks bitmap Kuninori Morimoto
2012-12-13 0:17 ` Simon Horman
2012-12-14 0:57 ` Simon Horman
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).