[PATCH v3 0/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[PATCH v3 0/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Simon Horman]

Rather than requesting the shyway_clk call clk_get with
the device and a NULL con_id.

This is in keeping with the way that clk_get() is called
on other drivers used by Renesas Gen 1 SoCs. And I believe
it is compatible with supplying clocks via DT, unlike the current code.


This series supplies a fix for the r8a7778, a consumer of the driver,
so that the hspi clocks it supplies have the correct source.

And a fix for the sh-hspi driver to address the problem
described above.


Mark, as the first mach-shmobile patch is a run-time dependency for the
second SPI driver patch could you consider taking both of them?

I have checked and I do not expect any conflicts anywhere between
v3.14-rc1 and what I have queued up in the devel branch of my renesas tree.


Simon Horman (2):
  ARM: shmobile: r8a7778: Use clks as MSTP007 parent
  spi: sh-hspi: Do not specifically request shyway_clk clock

 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 drivers/spi/spi-sh-hspi.c              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.5.2

[PATCH v3 0/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Simon Horman]

Rather than requesting the shyway_clk call clk_get with
the device and a NULL con_id.

This is in keeping with the way that clk_get() is called
on other drivers used by Renesas Gen 1 SoCs. And I believe
it is compatible with supplying clocks via DT, unlike the current code.


This series supplies a fix for the r8a7778, a consumer of the driver,
so that the hspi clocks it supplies have the correct source.

And a fix for the sh-hspi driver to address the problem
described above.


Mark, as the first mach-shmobile patch is a run-time dependency for the
second SPI driver patch could you consider taking both of them?

I have checked and I do not expect any conflicts anywhere between
v3.14-rc1 and what I have queued up in the devel branch of my renesas tree.


Simon Horman (2):
  ARM: shmobile: r8a7778: Use clks as MSTP007 parent
  spi: sh-hspi: Do not specifically request shyway_clk clock

 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 drivers/spi/spi-sh-hspi.c              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.5.2

[PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Simon Horman]

According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---
v3
* Correct changelog to refer to r8a7778 instead of r8a7779

v2
* First post, as suggested by Laurent Pinchart
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 2009a9b..9989b1b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
 	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
 	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
-	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
+	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
 };
 
 static struct clk_lookup lookups[] = {
-- 
1.8.5.2

[PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Simon Horman]

According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Cc: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Signed-off-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>

---
v3
* Correct changelog to refer to r8a7778 instead of r8a7779

v2
* First post, as suggested by Laurent Pinchart
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 2009a9b..9989b1b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
 	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
 	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
-	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
+	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
 };
 
 static struct clk_lookup lookups[] = {
-- 
1.8.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 repost 1/2] ARM: shmobile: r8a7779: Use clks as MSTP007 parent

[Simon Horman]

According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

v2
* First post, as suggested by Laurent Pinchart
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 2009a9b..9989b1b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
 	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
 	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
-	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
+	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
 };
 
 static struct clk_lookup lookups[] = {
-- 
1.8.5.2

[PATCH v2 repost 1/2] ARM: shmobile: r8a7779: Use clks as MSTP007 parent

[Simon Horman]

According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Cc: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Signed-off-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>

---

v2
* First post, as suggested by Laurent Pinchart
---
 arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 2009a9b..9989b1b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
 	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
 	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
-	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
+	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
 };
 
 static struct clk_lookup lookups[] = {
-- 
1.8.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3 2/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Simon Horman]

Rather than requesting the shyway_clk call clk_get with
the device and a NULL con_id.

This is in keeping with the way that clk_get() is called
on other drivers used by Renesas Gen 1 SoCs. And I believe
it is compatible with supplying clocks via DT, unlike the current code.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

--

It appears to me that the two uses of this driver are
the r8a7778 and r8a7779 SoCs.

The r8a7779 already has clocks setup to allow this driver to continue to work
with this change applied.

The r8a7778 has clocks incorrectly setup to allow this driver to continue
to work with this change applied. This problem is addressed in
"ARM: shmobile: r8a7778: Use clks as MSTP007 parent" which is thus
a pre-requisite of this patch.

v2 - v3
* Update changelog
---
 drivers/spi/spi-sh-hspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 82d2f92..e975892 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -274,9 +274,9 @@ static int hspi_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	clk = clk_get(NULL, "shyway_clk");
+	clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(clk)) {
-		dev_err(&pdev->dev, "shyway_clk is required\n");
+		dev_err(&pdev->dev, "couldn't get clock\n");
 		ret = -EINVAL;
 		goto error0;
 	}
-- 
1.8.5.2

[PATCH v3 2/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Simon Horman]

Rather than requesting the shyway_clk call clk_get with
the device and a NULL con_id.

This is in keeping with the way that clk_get() is called
on other drivers used by Renesas Gen 1 SoCs. And I believe
it is compatible with supplying clocks via DT, unlike the current code.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

--

It appears to me that the two uses of this driver are
the r8a7778 and r8a7779 SoCs.

The r8a7779 already has clocks setup to allow this driver to continue to work
with this change applied.

The r8a7778 has clocks incorrectly setup to allow this driver to continue
to work with this change applied. This problem is addressed in
"ARM: shmobile: r8a7778: Use clks as MSTP007 parent" which is thus
a pre-requisite of this patch.

v2 - v3
* Update changelog
---
 drivers/spi/spi-sh-hspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 82d2f92..e975892 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -274,9 +274,9 @@ static int hspi_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	clk = clk_get(NULL, "shyway_clk");
+	clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(clk)) {
-		dev_err(&pdev->dev, "shyway_clk is required\n");
+		dev_err(&pdev->dev, "couldn't get clock\n");
 		ret = -EINVAL;
 		goto error0;
 	}
-- 
1.8.5.2

Re: [PATCH v2 repost 1/2] ARM: shmobile: r8a7779: Use clks as MSTP007 parent

[Simon Horman]

On Mon, Apr 14, 2014 at 10:41:37AM +0900, Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.
> 
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Sorry for the mess, please ignore this patch, it is a repost of
a version with an incorrect changelog.

Re: [PATCH v2 repost 1/2] ARM: shmobile: r8a7779: Use clks as MSTP007 parent

[Simon Horman]

On Mon, Apr 14, 2014 at 10:41:37AM +0900, Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.
> 
> Cc: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> Signed-off-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>

Sorry for the mess, please ignore this patch, it is a repost of
a version with an incorrect changelog.
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Monday 14 April 2014 10:41:36 Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.
> 
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v3
> * Correct changelog to refer to r8a7778 instead of r8a7779
> 
> v2
> * First post, as suggested by Laurent Pinchart
> ---
>  arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c
> b/arch/arm/mach-shmobile/clock-r8a7778.c index 2009a9b..9989b1b 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7778.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7778.c
> @@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
>  	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
>  	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
>  	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
> -	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
> +	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
>  };
> 
>  static struct clk_lookup lookups[] = {

-- 
Regards,

Laurent Pinchart

Re: [PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Laurent Pinchart]

Hi Simon,

Thank you for the patch.

On Monday 14 April 2014 10:41:36 Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.
> 
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v3
> * Correct changelog to refer to r8a7778 instead of r8a7779
> 
> v2
> * First post, as suggested by Laurent Pinchart
> ---
>  arch/arm/mach-shmobile/clock-r8a7778.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c
> b/arch/arm/mach-shmobile/clock-r8a7778.c index 2009a9b..9989b1b 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7778.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7778.c
> @@ -170,7 +170,7 @@ static struct clk mstp_clks[MSTP_NR] = {
>  	[MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
>  	[MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
>  	[MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
> -	[MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
> +	[MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
>  };
> 
>  static struct clk_lookup lookups[] = {

-- 
Regards,

Laurent Pinchart

Re: [PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

On Mon, Apr 14, 2014 at 10:41:36AM +0900, Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v3 1/2] ARM: shmobile: r8a7778: Use clks as MSTP007 parent

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

On Mon, Apr 14, 2014 at 10:41:36AM +0900, Simon Horman wrote:
> According to the documentation the parent clock of
> MSTP007 should be clks not clkp.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v3 2/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

On Mon, Apr 14, 2014 at 10:41:38AM +0900, Simon Horman wrote:
> Rather than requesting the shyway_clk call clk_get with
> the device and a NULL con_id.
> 
> This is in keeping with the way that clk_get() is called
> on other drivers used by Renesas Gen 1 SoCs. And I believe
> it is compatible with supplying clocks via DT, unlike the current code.

Applied, thanks.

> --

I think you were looking for --- there, though I just included
everything in the changelog anyway.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v3 2/2] spi: sh-hspi: Do not specifically request shyway_clk clock

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

On Mon, Apr 14, 2014 at 10:41:38AM +0900, Simon Horman wrote:
> Rather than requesting the shyway_clk call clk_get with
> the device and a NULL con_id.
> 
> This is in keeping with the way that clk_get() is called
> on other drivers used by Renesas Gen 1 SoCs. And I believe
> it is compatible with supplying clocks via DT, unlike the current code.

Applied, thanks.

> --

I think you were looking for --- there, though I just included
everything in the changelog anyway.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]