[v2] ARM: shmobile: r8a7794: Add I2C clocks to device tree

Commit Message

Simon Horman Dec. 15, 2014, 12:35 a.m. UTC

From: Koji Matsuoka <[e-mail]>

Signed-off-by: Koji Matsuoka <[e-mail]>
[horms: omitted device nodes and aliases; only add clocks]
Signed-off-by: Simon Horman <[e-mail]>

---
Based on the renesas-devel-20141212-v3.18 tag of my renesas tree

v2 [Simon Horman]
* Trimmed trailing garbage from changelog

v1 [Simon Horman]
* Removed portion of patch which adds device nodes and aliases
* Renamed patch from
  "ARM: shmobile: r8a7794: Add I2C driver to device tree" to
  "ARM: shmobile: r8a7794: Add I2C clocks to device tree"
---
 arch/arm/boot/dts/r8a7794.dtsi            | 12 +++++++++---
 include/dt-bindings/clock/r8a7794-clock.h |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

Comments

Geert Uytterhoeven Dec. 15, 2014, 1:17 p.m. UTC | #1

On Mon, Dec 15, 2014 at 1:35 AM, Simon Horman
<[e-mail]> wrote:
> From: Koji Matsuoka <[e-mail]>
>
> Signed-off-by: Koji Matsuoka <[e-mail]>
> [horms: omitted device nodes and aliases; only add clocks]
> Signed-off-by: Simon Horman <[e-mail]>

Acked-by: Geert Uytterhoeven <[e-mail]>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Simon Horman Dec. 17, 2014, 12:21 a.m. UTC | #2

On Mon, Dec 15, 2014 at 02:17:32PM +0100, Geert Uytterhoeven wrote:
> On Mon, Dec 15, 2014 at 1:35 AM, Simon Horman
> <[e-mail]> wrote:
> > From: Koji Matsuoka <[e-mail]>
> >
> > Signed-off-by: Koji Matsuoka <[e-mail]>
> > [horms: omitted device nodes and aliases; only add clocks]
> > Signed-off-by: Simon Horman <[e-mail]>
> 
> Acked-by: Geert Uytterhoeven <[e-mail]>

Thanks, I have queued up this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 068ca09..728d719 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -538,10 +538,16 @@ 
 		mstp9_clks: mstp9_clks@e6150994 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
-			clocks = <&cpg_clocks R8A7794_CLK_QSPI>;
+			clocks = <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
+				<&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
-			clock-indices = <R8A7794_CLK_QSPI_MOD>;
-			clock-output-names = "qspi_mod";
+			clock-indices = <
+				R8A7794_CLK_QSPI_MOD R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
+				R8A7794_CLK_I2C3 R8A7794_CLK_I2C2 R8A7794_CLK_I2C1
+				R8A7794_CLK_I2C0
+			>;
+			clock-output-names =
+				"qspi_mod", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
 		};
 		mstp11_clks: mstp11_clks@e615099c {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index fba89a4..94d9618 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -87,6 +87,12 @@ 
 #define R8A7794_CLK_GPIO1		11
 #define R8A7794_CLK_GPIO0		12
 #define R8A7794_CLK_QSPI_MOD		17
+#define R8A7794_CLK_I2C5		25
+#define R8A7794_CLK_I2C4		27
+#define R8A7794_CLK_I2C3		28
+#define R8A7794_CLK_I2C2		29
+#define R8A7794_CLK_I2C1		30
+#define R8A7794_CLK_I2C0		31
 
 /* MSTP11 */
 #define R8A7794_CLK_SCIFA3		6