* [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
@ 2013-05-17 14:55 Guennadi Liakhovetski
2013-05-18 14:38 ` Sergei Shtylyov
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-17 14:55 UTC (permalink / raw)
To: linux-sh
Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
interfaces on r8a7790 (H2).
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index b393592..53a13b4 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
/* MSTP */
enum {
MSTP721, MSTP720,
- MSTP304,
+ MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
MSTP_NR
};
@@ -189,6 +189,12 @@ enum {
static struct clk mstp_clks[MSTP_NR] = {
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
+ [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
+ [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
+ [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
+ [MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SD2], SMSTPCR3, 12, 0), /* SDHI2 */
+ [MSTP311] = SH_CLK_MSTP32(&div6_clks[DIV6_SD3], SMSTPCR3, 11, 0), /* SDHI3 */
+ [MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1], SMSTPCR3, 5, 0), /* MMC1 */
[MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */
[MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */
[MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */
@@ -229,14 +235,8 @@ static struct clk_lookup lookups[] = {
/* DIV4 */
CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]),
- CLKDEV_CON_ID("sd0", &div4_clks[DIV4_SD0]),
- CLKDEV_CON_ID("sd1", &div4_clks[DIV4_SD1]),
/* DIV6 */
- CLKDEV_CON_ID("sd2", &div6_clks[DIV6_SD2]),
- CLKDEV_CON_ID("sd3", &div6_clks[DIV6_SD3]),
- CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]),
- CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]),
CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]),
CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),
@@ -249,6 +249,18 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),
CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),
CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
+ CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
+ CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
+ CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
+ CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
+ CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
+ CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
+ CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
+ CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
+ CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),
+ CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
+ CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
+ CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
};
#define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
@ 2013-05-18 14:38 ` Sergei Shtylyov
2013-05-18 15:02 ` Guennadi Liakhovetski
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sergei Shtylyov @ 2013-05-18 14:38 UTC (permalink / raw)
To: linux-sh
Hello.
On 17-05-2013 18:55, Guennadi Liakhovetski wrote:
> Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
> interfaces on r8a7790 (H2).
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> ---
> arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
> 1 files changed, 19 insertions(+), 7 deletions(-)
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index b393592..53a13b4 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
> /* MSTP */
> enum {
> MSTP721, MSTP720,
> - MSTP304,
> + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311,
Should have broken this line here.
> MSTP305, MSTP304,
> MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> MSTP_NR
> };
WBR, Sergei
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
2013-05-18 14:38 ` Sergei Shtylyov
@ 2013-05-18 15:02 ` Guennadi Liakhovetski
2013-05-18 15:28 ` Sergei Shtylyov
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-18 15:02 UTC (permalink / raw)
To: linux-sh
On Sat, 18 May 2013, Sergei Shtylyov wrote:
> Hello.
>
> On 17-05-2013 18:55, Guennadi Liakhovetski wrote:
>
> > Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
> > interfaces on r8a7790 (H2).
>
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > ---
> > arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
> > 1 files changed, 19 insertions(+), 7 deletions(-)
>
> > diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
> > b/arch/arm/mach-shmobile/clock-r8a7790.c
> > index b393592..53a13b4 100644
> > --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> > +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> > @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
> > /* MSTP */
> > enum {
> > MSTP721, MSTP720,
> > - MSTP304,
> > + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311,
>
> Should have broken this line here.
Don't think so.
> > MSTP305, MSTP304,
> > MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> > MSTP_NR
> > };
>
> WBR, Sergei
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
2013-05-18 14:38 ` Sergei Shtylyov
2013-05-18 15:02 ` Guennadi Liakhovetski
@ 2013-05-18 15:28 ` Sergei Shtylyov
2013-05-18 15:34 ` Guennadi Liakhovetski
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sergei Shtylyov @ 2013-05-18 15:28 UTC (permalink / raw)
To: linux-sh
Hello.
On 18-05-2013 19:02, Guennadi Liakhovetski wrote:
>>> Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
>>> interfaces on r8a7790 (H2).
>>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
>>> ---
>>> arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
>>> 1 files changed, 19 insertions(+), 7 deletions(-)
>>> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
>>> b/arch/arm/mach-shmobile/clock-r8a7790.c
>>> index b393592..53a13b4 100644
>>> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
>>> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
>>> @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
>>> /* MSTP */
>>> enum {
>>> MSTP721, MSTP720,
>>> - MSTP304,
>>> + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311,
>> Should have broken this line here.
> Don't think so.
At least breaking the lines at numerical tens of MSTPxxx values was
a tradition so far (although ten values don't fit in one line :-).
>>> MSTP305, MSTP304,
WBR, Sergei
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
` (2 preceding siblings ...)
2013-05-18 15:28 ` Sergei Shtylyov
@ 2013-05-18 15:34 ` Guennadi Liakhovetski
2013-05-19 16:09 ` Sergei Shtylyov
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-18 15:34 UTC (permalink / raw)
To: linux-sh
On Sat, 18 May 2013, Sergei Shtylyov wrote:
> Hello.
>
> On 18-05-2013 19:02, Guennadi Liakhovetski wrote:
>
> > > > Add MSTP clock definitions and fix aliases for the two MMCIF and four
> > > > SDHI
> > > > interfaces on r8a7790 (H2).
>
> > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > > ---
> > > > arch/arm/mach-shmobile/clock-r8a7790.c | 26
> > > > +++++++++++++++++++-------
> > > > 1 files changed, 19 insertions(+), 7 deletions(-)
>
> > > > diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
> > > > b/arch/arm/mach-shmobile/clock-r8a7790.c
> > > > index b393592..53a13b4 100644
> > > > --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> > > > +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> > > > @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
> > > > /* MSTP */
> > > > enum {
> > > > MSTP721, MSTP720,
> > > > - MSTP304,
> > > > + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311,
>
> > > Should have broken this line here.
>
> > Don't think so.
>
> At least breaking the lines at numerical tens of MSTPxxx values was a
> tradition so far (although ten values don't fit in one line :-).
Look at the following MSTP2xx line.
> > > > MSTP305, MSTP304,
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
` (3 preceding siblings ...)
2013-05-18 15:34 ` Guennadi Liakhovetski
@ 2013-05-19 16:09 ` Sergei Shtylyov
2013-06-12 7:55 ` Guennadi Liakhovetski
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sergei Shtylyov @ 2013-05-19 16:09 UTC (permalink / raw)
To: linux-sh
Hello.
On 18-05-2013 19:34, Guennadi Liakhovetski wrote:
>>>>> Add MSTP clock definitions and fix aliases for the two MMCIF and four
>>>>> SDHI
>>>>> interfaces on r8a7790 (H2).
>>>>> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
>>>>> ---
>>>>> arch/arm/mach-shmobile/clock-r8a7790.c | 26
>>>>> +++++++++++++++++++-------
>>>>> 1 files changed, 19 insertions(+), 7 deletions(-)
>>>>> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
>>>>> b/arch/arm/mach-shmobile/clock-r8a7790.c
>>>>> index b393592..53a13b4 100644
>>>>> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
>>>>> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
>>>>> @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
>>>>> /* MSTP */
>>>>> enum {
>>>>> MSTP721, MSTP720,
>>>>> - MSTP304,
>>>>> + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311,
>>>> Should have broken this line here.
>>> Don't think so.
>> At least breaking the lines at numerical tens of MSTPxxx values was a
>> tradition so far (although ten values don't fit in one line :-).
> Look at the following MSTP2xx line.
Indeed, I've overlooked that. Apparently the mentioned tradition
hasn't been maintained in this file.
>>>>> MSTP305, MSTP304,
WBR, Sergei
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
` (4 preceding siblings ...)
2013-05-19 16:09 ` Sergei Shtylyov
@ 2013-06-12 7:55 ` Guennadi Liakhovetski
2013-06-12 8:12 ` Simon Horman
2013-06-12 14:07 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Guennadi Liakhovetski @ 2013-06-12 7:55 UTC (permalink / raw)
To: linux-sh
Hi Simon
Same as the other one: there haven't been any unclarified replies to this
patch, your patchwork status says "changes requested." Does anything
really has to be changed here or can we apply this patch, please?
Thanks
Guennadi
On Fri, 17 May 2013, Guennadi Liakhovetski wrote:
> Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
> interfaces on r8a7790 (H2).
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> ---
> arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
> 1 files changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index b393592..53a13b4 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
> /* MSTP */
> enum {
> MSTP721, MSTP720,
> - MSTP304,
> + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
> MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> MSTP_NR
> };
> @@ -189,6 +189,12 @@ enum {
> static struct clk mstp_clks[MSTP_NR] = {
> [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
> [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
> + [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
> + [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
> + [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
> + [MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SD2], SMSTPCR3, 12, 0), /* SDHI2 */
> + [MSTP311] = SH_CLK_MSTP32(&div6_clks[DIV6_SD3], SMSTPCR3, 11, 0), /* SDHI3 */
> + [MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1], SMSTPCR3, 5, 0), /* MMC1 */
> [MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */
> [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */
> [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */
> @@ -229,14 +235,8 @@ static struct clk_lookup lookups[] = {
>
> /* DIV4 */
> CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]),
> - CLKDEV_CON_ID("sd0", &div4_clks[DIV4_SD0]),
> - CLKDEV_CON_ID("sd1", &div4_clks[DIV4_SD1]),
>
> /* DIV6 */
> - CLKDEV_CON_ID("sd2", &div6_clks[DIV6_SD2]),
> - CLKDEV_CON_ID("sd3", &div6_clks[DIV6_SD3]),
> - CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]),
> - CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]),
> CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]),
> CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),
>
> @@ -249,6 +249,18 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),
> CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),
> CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
> + CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
> + CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
> + CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
> + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
> + CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
> + CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
> + CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
> + CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
> + CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),
> + CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
> + CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
> + CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
> };
>
> #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
> --
> 1.7.2.5
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
` (5 preceding siblings ...)
2013-06-12 7:55 ` Guennadi Liakhovetski
@ 2013-06-12 8:12 ` Simon Horman
2013-06-12 14:07 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-06-12 8:12 UTC (permalink / raw)
To: linux-sh
On Wed, Jun 12, 2013 at 09:55:55AM +0200, Guennadi Liakhovetski wrote:
> Hi Simon
>
> Same as the other one: there haven't been any unclarified replies to this
> patch, your patchwork status says "changes requested." Does anything
> really has to be changed here or can we apply this patch, please?
There were changes requested to other patches in the series and
my expectation was that you would re-spin the series, thus
I marked all patches in the series as "changes requested."
However, now you mention it this patch does seem fine and I will see
about applying it.
> Thanks
> Guennadi
>
> On Fri, 17 May 2013, Guennadi Liakhovetski wrote:
>
> > Add MSTP clock definitions and fix aliases for the two MMCIF and four SDHI
> > interfaces on r8a7790 (H2).
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > ---
> > arch/arm/mach-shmobile/clock-r8a7790.c | 26 +++++++++++++++++++-------
> > 1 files changed, 19 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> > index b393592..53a13b4 100644
> > --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> > +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> > @@ -181,7 +181,7 @@ static struct clk div6_clks[DIV6_NR] = {
> > /* MSTP */
> > enum {
> > MSTP721, MSTP720,
> > - MSTP304,
> > + MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
> > MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> > MSTP_NR
> > };
> > @@ -189,6 +189,12 @@ enum {
> > static struct clk mstp_clks[MSTP_NR] = {
> > [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
> > [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
> > + [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
> > + [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
> > + [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
> > + [MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SD2], SMSTPCR3, 12, 0), /* SDHI2 */
> > + [MSTP311] = SH_CLK_MSTP32(&div6_clks[DIV6_SD3], SMSTPCR3, 11, 0), /* SDHI3 */
> > + [MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1], SMSTPCR3, 5, 0), /* MMC1 */
> > [MSTP304] = SH_CLK_MSTP32(&cp_clk, SMSTPCR3, 4, 0), /* TPU0 */
> > [MSTP216] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 16, 0), /* SCIFB2 */
> > [MSTP207] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 7, 0), /* SCIFB1 */
> > @@ -229,14 +235,8 @@ static struct clk_lookup lookups[] = {
> >
> > /* DIV4 */
> > CLKDEV_CON_ID("sdh", &div4_clks[DIV4_SDH]),
> > - CLKDEV_CON_ID("sd0", &div4_clks[DIV4_SD0]),
> > - CLKDEV_CON_ID("sd1", &div4_clks[DIV4_SD1]),
> >
> > /* DIV6 */
> > - CLKDEV_CON_ID("sd2", &div6_clks[DIV6_SD2]),
> > - CLKDEV_CON_ID("sd3", &div6_clks[DIV6_SD3]),
> > - CLKDEV_CON_ID("mmc0", &div6_clks[DIV6_MMC0]),
> > - CLKDEV_CON_ID("mmc1", &div6_clks[DIV6_MMC1]),
> > CLKDEV_CON_ID("ssp", &div6_clks[DIV6_SSP]),
> > CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),
> >
> > @@ -249,6 +249,18 @@ static struct clk_lookup lookups[] = {
> > CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]),
> > CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]),
> > CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
> > + CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
> > + CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
> > + CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
> > + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
> > + CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
> > + CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
> > + CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
> > + CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
> > + CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),
> > + CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
> > + CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
> > + CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
> > };
> >
> > #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \
> > --
> > 1.7.2.5
> >
>
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
` (6 preceding siblings ...)
2013-06-12 8:12 ` Simon Horman
@ 2013-06-12 14:07 ` Simon Horman
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-06-12 14:07 UTC (permalink / raw)
To: linux-sh
On Wed, Jun 12, 2013 at 05:12:52PM +0900, Simon Horman wrote:
> On Wed, Jun 12, 2013 at 09:55:55AM +0200, Guennadi Liakhovetski wrote:
> > Hi Simon
> >
> > Same as the other one: there haven't been any unclarified replies to this
> > patch, your patchwork status says "changes requested." Does anything
> > really has to be changed here or can we apply this patch, please?
>
> There were changes requested to other patches in the series and
> my expectation was that you would re-spin the series, thus
> I marked all patches in the series as "changes requested."
>
> However, now you mention it this patch does seem fine and I will see
> about applying it.
I have queued this up for v3.11 in the soc2 branch.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-06-12 14:07 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-17 14:55 [PATCH 4/9] ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI Guennadi Liakhovetski
2013-05-18 14:38 ` Sergei Shtylyov
2013-05-18 15:02 ` Guennadi Liakhovetski
2013-05-18 15:28 ` Sergei Shtylyov
2013-05-18 15:34 ` Guennadi Liakhovetski
2013-05-19 16:09 ` Sergei Shtylyov
2013-06-12 7:55 ` Guennadi Liakhovetski
2013-06-12 8:12 ` Simon Horman
2013-06-12 14:07 ` 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).