* [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
@ 2014-01-20 11:44 Ben Dooks
2014-01-20 11:54 ` Laurent Pinchart
2014-01-21 0:47 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Ben Dooks @ 2014-01-20 11:44 UTC (permalink / raw)
To: linux-sh
The R8A7790's dtsi file i2c0, i2c1, i2c2, and i2c3 nodes have clock
references to the mstp3_clks clock node, however these clocks are in the
mstp9_clks node.
The error was introducted in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
Reference clocks") which is in Simon's current development tree.
This patch fixes the following error:
of_clk_src_onecell_get: invalid clock index 31
i2c-rcar e6508000.i2c: cannot get clock
i2c-rcar: probe of e6508000.i2c failed with error -2
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
Cc: horms+renesas@verge.net.au
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: linux-sh@vger.kernel.org
---
arch/arm/boot/dts/r8a7790.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 3cc834b..15e2a97 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -198,7 +198,7 @@
reg = <0 0xe6508000 0 0x40>;
interrupt-parent = <&gic>;
interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
+ clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
status = "disabled";
};
@@ -209,7 +209,7 @@
reg = <0 0xe6518000 0 0x40>;
interrupt-parent = <&gic>;
interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
+ clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
status = "disabled";
};
@@ -220,7 +220,7 @@
reg = <0 0xe6530000 0 0x40>;
interrupt-parent = <&gic>;
interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
+ clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
status = "disabled";
};
@@ -231,7 +231,7 @@
reg = <0 0xe6540000 0 0x40>;
interrupt-parent = <&gic>;
interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
+ clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
status = "disabled";
};
--
1.8.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
2014-01-20 11:44 [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference Ben Dooks
@ 2014-01-20 11:54 ` Laurent Pinchart
2014-01-21 0:47 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2014-01-20 11:54 UTC (permalink / raw)
To: linux-sh
On Monday 20 January 2014 11:44:21 Ben Dooks wrote:
> The R8A7790's dtsi file i2c0, i2c1, i2c2, and i2c3 nodes have clock
> references to the mstp3_clks clock node, however these clocks are in the
> mstp9_clks node.
>
> The error was introducted in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
> Reference clocks") which is in Simon's current development tree.
>
> This patch fixes the following error:
>
> of_clk_src_onecell_get: invalid clock index 31
> i2c-rcar e6508000.i2c: cannot get clock
> i2c-rcar: probe of e6508000.i2c failed with error -2
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Cc: horms+renesas@verge.net.au
> Cc: laurent.pinchart+renesas@ideasonboard.com
> Cc: linux-sh@vger.kernel.org
> ---
> arch/arm/boot/dts/r8a7790.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index 3cc834b..15e2a97 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -198,7 +198,7 @@
> reg = <0 0xe6508000 0 0x40>;
> interrupt-parent = <&gic>;
> interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
> + clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
> status = "disabled";
> };
>
> @@ -209,7 +209,7 @@
> reg = <0 0xe6518000 0 0x40>;
> interrupt-parent = <&gic>;
> interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
> + clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
> status = "disabled";
> };
>
> @@ -220,7 +220,7 @@
> reg = <0 0xe6530000 0 0x40>;
> interrupt-parent = <&gic>;
> interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
> + clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
> status = "disabled";
> };
>
> @@ -231,7 +231,7 @@
> reg = <0 0xe6540000 0 0x40>;
> interrupt-parent = <&gic>;
> interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
> + clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
> status = "disabled";
> };
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference
2014-01-20 11:44 [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference Ben Dooks
2014-01-20 11:54 ` Laurent Pinchart
@ 2014-01-21 0:47 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2014-01-21 0:47 UTC (permalink / raw)
To: linux-sh
On Mon, Jan 20, 2014 at 12:54:49PM +0100, Laurent Pinchart wrote:
> On Monday 20 January 2014 11:44:21 Ben Dooks wrote:
> > The R8A7790's dtsi file i2c0, i2c1, i2c2, and i2c3 nodes have clock
> > references to the mstp3_clks clock node, however these clocks are in the
> > mstp9_clks node.
> >
> > The error was introducted in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
> > Reference clocks") which is in Simon's current development tree.
> >
> > This patch fixes the following error:
> >
> > of_clk_src_onecell_get: invalid clock index 31
> > i2c-rcar e6508000.i2c: cannot get clock
> > i2c-rcar: probe of e6508000.i2c failed with error -2
> >
> > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Thanks, I will queue this up as a fix for v3.14.
And it should appear in linux-next in the not too distant future.
>
> > ---
> > Cc: horms+renesas@verge.net.au
> > Cc: laurent.pinchart+renesas@ideasonboard.com
> > Cc: linux-sh@vger.kernel.org
> > ---
> > arch/arm/boot/dts/r8a7790.dtsi | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> > index 3cc834b..15e2a97 100644
> > --- a/arch/arm/boot/dts/r8a7790.dtsi
> > +++ b/arch/arm/boot/dts/r8a7790.dtsi
> > @@ -198,7 +198,7 @@
> > reg = <0 0xe6508000 0 0x40>;
> > interrupt-parent = <&gic>;
> > interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
> > - clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
> > + clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
> > status = "disabled";
> > };
> >
> > @@ -209,7 +209,7 @@
> > reg = <0 0xe6518000 0 0x40>;
> > interrupt-parent = <&gic>;
> > interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
> > - clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
> > + clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
> > status = "disabled";
> > };
> >
> > @@ -220,7 +220,7 @@
> > reg = <0 0xe6530000 0 0x40>;
> > interrupt-parent = <&gic>;
> > interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
> > - clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
> > + clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
> > status = "disabled";
> > };
> >
> > @@ -231,7 +231,7 @@
> > reg = <0 0xe6540000 0 0x40>;
> > interrupt-parent = <&gic>;
> > interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
> > - clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
> > + clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
> > status = "disabled";
> > };
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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
end of thread, other threads:[~2014-01-21 0:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-20 11:44 [PATCH] [V4] ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference Ben Dooks
2014-01-20 11:54 ` Laurent Pinchart
2014-01-21 0:47 ` 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).