Patchwork [RFC,2/3,RFC] ARM: shmobile: r7s72100: Add clock for r7s72100-gether

login
register
mail settings
Submitter Simon Horman
Date Dec. 15, 2013, 8:24 a.m.
Message ID <1387095886-15163-3-git-send-email-horms+renesas@verge.net.au>
Download mbox | patch
Permalink /patch/301321/
State RFC
Delegated to: David Miller
Headers show

Comments

Simon Horman - Dec. 15, 2013, 8:24 a.m.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/clock-r7s72100.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Sergei Shtylyov - Dec. 15, 2013, 8:18 p.m.
Hello.

On 12/15/2013 11:24 AM, Simon Horman wrote:

> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>   arch/arm/mach-shmobile/clock-r7s72100.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)

> diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
> index 7b457ae..7bce0c1 100644
> --- a/arch/arm/mach-shmobile/clock-r7s72100.c
> +++ b/arch/arm/mach-shmobile/clock-r7s72100.c
[...]
> @@ -145,9 +146,10 @@ struct clk div4_clks[DIV4_NR] = {
>   };
>
>   enum { MSTP47, MSTP46, MSTP45, MSTP44, MSTP43, MSTP42, MSTP41, MSTP40,
> -	MSTP33,	MSTP_NR };
> +	MSTP33,	MSTP74, MSTP_NR };

    Shouldn't MSTP74 be on a line of its own at the start of the *enum*?

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman - Dec. 16, 2013, 1:31 a.m.
On Sun, Dec 15, 2013 at 11:18:51PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 12/15/2013 11:24 AM, Simon Horman wrote:
> 
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> >---
> >  arch/arm/mach-shmobile/clock-r7s72100.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> >diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
> >index 7b457ae..7bce0c1 100644
> >--- a/arch/arm/mach-shmobile/clock-r7s72100.c
> >+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
> [...]
> >@@ -145,9 +146,10 @@ struct clk div4_clks[DIV4_NR] = {
> >  };
> >
> >  enum { MSTP47, MSTP46, MSTP45, MSTP44, MSTP43, MSTP42, MSTP41, MSTP40,
> >-	MSTP33,	MSTP_NR };
> >+	MSTP33,	MSTP74, MSTP_NR };
> 
>    Shouldn't MSTP74 be on a line of its own at the start of the *enum*?

Yes, thanks, I will fix that.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index 7b457ae..7bce0c1 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -27,6 +27,7 @@ 
 #define FRQCR2		0xfcfe0014
 #define STBCR3		0xfcfe0420
 #define STBCR4		0xfcfe0424
+#define STBCR7		0xfcfe0430
 
 #define PLL_RATE 30
 
@@ -145,9 +146,10 @@  struct clk div4_clks[DIV4_NR] = {
 };
 
 enum { MSTP47, MSTP46, MSTP45, MSTP44, MSTP43, MSTP42, MSTP41, MSTP40,
-	MSTP33,	MSTP_NR };
+	MSTP33,	MSTP74, MSTP_NR };
 
 static struct clk mstp_clks[MSTP_NR] = {
+	[MSTP74] = SH_CLK_MSTP8(&peripheral1_clk, STBCR7, 4, 0), /* GEther */
 	[MSTP47] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 7, 0), /* SCIF0 */
 	[MSTP46] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 6, 0), /* SCIF1 */
 	[MSTP45] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 5, 0), /* SCIF2 */
@@ -170,6 +172,7 @@  static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
 	/* MSTP clocks */
+	CLKDEV_DEV_ID("r7s72100-gether", &mstp_clks[MSTP74]),
 	CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),
 
 	/* ICK */