* [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description
@ 2015-01-21 16:20 Ulrich Hecht
2015-01-22 10:58 ` Geert Uytterhoeven
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ulrich Hecht @ 2015-01-21 16:20 UTC (permalink / raw)
To: linux-sh
Declares all r8a7778 clocks supported by the legacy clock framework,
plus tmu2.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 +
arch/arm/boot/dts/r8a7778.dtsi | 181 +++++++++++++++++++++
2 files changed, 182 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index 0a80fa7..e163092 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@ -13,6 +13,7 @@ Required Properties:
- "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
- "renesas,r8a73a4-mstp-clocks" for R8A73A4 (R-Mobile APE6) MSTP gate clocks
- "renesas,r8a7740-mstp-clocks" for R8A7740 (R-Mobile A1) MSTP gate clocks
+ - "renesas,r8a7778-mstp-clocks" for R8A7778 (R-Car M1) MSTP gate clocks
- "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
- "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
- "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index ef85339..0a5c5ad 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -16,6 +16,7 @@
/include/ "skeleton.dtsi"
+#include <dt-bindings/clock/r8a7778-clock.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ {
@@ -294,4 +295,184 @@
#size-cells = <0>;
status = "disabled";
};
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ /* Special CPG clocks */
+ cpg_clocks: cpg_clocks@ffc80000 {
+ compatible = "renesas,r8a7778-cpg-clocks";
+ reg = <0xffc80000 0x80>;
+ #clock-cells = <1>;
+ clock-output-names = "extal", "plla", "pllb", "b",
+ "out", "p", "s", "s1";
+ };
+
+ /* Audio clocks; frequencies are set by boards if applicable. */
+ audio_clk_a: audio_clk_a {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-output-names = "audio_clk_a";
+ };
+ audio_clk_b: audio_clk_b {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-output-names = "audio_clk_b";
+ };
+ audio_clk_c: audio_clk_c {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-output-names = "audio_clk_c";
+ };
+
+ /* Fixed ratio clocks */
+ g_clk: g_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7778_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <12>;
+ clock-mult = <1>;
+ clock-output-names = "g";
+ };
+ i_clk: i_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7778_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <1>;
+ clock-mult = <1>;
+ clock-output-names = "i";
+ };
+ s3_clk: s3_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7778_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <4>;
+ clock-mult = <1>;
+ clock-output-names = "s3";
+ };
+ s4_clk: s4_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7778_CLK_PLLA>;
+ #clock-cells = <0>;
+ clock-div = <8>;
+ clock-mult = <1>;
+ clock-output-names = "s4";
+ };
+ z_clk: z_clk {
+ compatible = "fixed-factor-clock";
+ clocks = <&cpg_clocks R8A7778_CLK_PLLB>;
+ #clock-cells = <0>;
+ clock-div = <1>;
+ clock-mult = <1>;
+ clock-output-names = "z";
+ };
+
+ /* Gate clocks */
+ mstp0_clks: mstp0_clks@ffc80030 {
+ compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0xffc80030 4>;
+ clocks = <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_S>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7778_CLK_I2C0 R8A7778_CLK_I2C1
+ R8A7778_CLK_I2C2 R8A7778_CLK_I2C3
+ R8A7778_CLK_SCIF0 R8A7778_CLK_SCIF1
+ R8A7778_CLK_SCIF2 R8A7778_CLK_SCIF3
+ R8A7778_CLK_SCIF4 R8A7778_CLK_SCIF5
+ R8A7778_CLK_TMU0 R8A7778_CLK_TMU1
+ R8A7778_CLK_TMU2 R8A7778_CLK_SSI0
+ R8A7778_CLK_SSI1 R8A7778_CLK_SSI2
+ R8A7778_CLK_SSI3 R8A7778_CLK_SRU
+ R8A7778_CLK_HSPI
+ >;
+ clock-output-names + "i2c0", "i2c1", "i2c2", "i2c3", "scif0",
+ "scif1", "scif2", "scif3", "scif4", "scif5",
+ "tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
+ "ssi2", "ssi3", "sru", "hspi";
+ };
+ mstp1_clks: mstp1_clks@ffc80034 {
+ compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0xffc80034 4>, <0xffc80044 4>;
+ clocks = <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_S>,
+ <&cpg_clocks R8A7778_CLK_S>,
+ <&cpg_clocks R8A7778_CLK_P>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7778_CLK_ETHER R8A7778_CLK_VIN0
+ R8A7778_CLK_VIN1 R8A7778_CLK_USB
+ >;
+ clock-output-names + "ether", "vin0", "vin1", "usb";
+ };
+ mstp3_clks: mstp3_clks@ffc8003c {
+ compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0xffc8003c 4>;
+ clocks = <&s4_clk>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7778_CLK_MMC R8A7778_CLK_SDHI0
+ R8A7778_CLK_SDHI1 R8A7778_CLK_SDHI2
+ R8A7778_CLK_SSI4 R8A7778_CLK_SSI5
+ R8A7778_CLK_SSI6 R8A7778_CLK_SSI7
+ R8A7778_CLK_SSI8
+ >;
+ clock-output-names + "mmc", "sdhi0", "sdhi1", "sdhi2", "ssi4",
+ "ssi5", "ssi6", "ssi7", "ssi8";
+ };
+ mstp5_clks: mstp5_clks@ffc80054 {
+ compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0xffc80054 4>;
+ clocks = <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>,
+ <&cpg_clocks R8A7778_CLK_P>;
+ #clock-cells = <1>;
+ clock-indices = <
+ R8A7778_CLK_SCU0 R8A7778_CLK_SCU1
+ R8A7778_CLK_SCU2 R8A7778_CLK_SCU3
+ R8A7778_CLK_SCU4 R8A7778_CLK_SCU5
+ R8A7778_CLK_SCU6 R8A7778_CLK_SCU7
+ R8A7778_CLK_SCU8
+ >;
+ clock-output-names + "scu0", "scu1", "scu2", "scu3", "scu4",
+ "scu5", "scu6", "scu7", "scu8";
+ };
+ };
};
--
2.2.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description
2015-01-21 16:20 [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description Ulrich Hecht
@ 2015-01-22 10:58 ` Geert Uytterhoeven
2015-01-23 0:49 ` Kuninori Morimoto
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2015-01-22 10:58 UTC (permalink / raw)
To: linux-sh
Hi Ulrich,
On Wed, Jan 21, 2015 at 5:20 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Declares all r8a7778 clocks supported by the legacy clock framework,
> plus tmu2.
Thanks!
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> + mstp0_clks: mstp0_clks@ffc80030 {
> + compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0xffc80030 4>;
> + clocks = <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_S>;
> + #clock-cells = <1>;
> + clock-indices = <
> + R8A7778_CLK_I2C0 R8A7778_CLK_I2C1
> + R8A7778_CLK_I2C2 R8A7778_CLK_I2C3
> + R8A7778_CLK_SCIF0 R8A7778_CLK_SCIF1
> + R8A7778_CLK_SCIF2 R8A7778_CLK_SCIF3
> + R8A7778_CLK_SCIF4 R8A7778_CLK_SCIF5
> + R8A7778_CLK_TMU0 R8A7778_CLK_TMU1
> + R8A7778_CLK_TMU2 R8A7778_CLK_SSI0
> + R8A7778_CLK_SSI1 R8A7778_CLK_SSI2
> + R8A7778_CLK_SSI3 R8A7778_CLK_SRU
> + R8A7778_CLK_HSPI
> + >;
> + clock-output-names > + "i2c0", "i2c1", "i2c2", "i2c3", "scif0",
> + "scif1", "scif2", "scif3", "scif4", "scif5",
> + "tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
> + "ssi2", "ssi3", "sru", "hspi";
On r8a7790, we use "ssi%u", on r8a7791, we use "ssi.%u"?
> + mstp3_clks: mstp3_clks@ffc8003c {
> + compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0xffc8003c 4>;
> + clocks = <&s4_clk>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>;
> + #clock-cells = <1>;
> + clock-indices = <
> + R8A7778_CLK_MMC R8A7778_CLK_SDHI0
> + R8A7778_CLK_SDHI1 R8A7778_CLK_SDHI2
> + R8A7778_CLK_SSI4 R8A7778_CLK_SSI5
> + R8A7778_CLK_SSI6 R8A7778_CLK_SSI7
> + R8A7778_CLK_SSI8
> + >;
> + clock-output-names > + "mmc", "sdhi0", "sdhi1", "sdhi2", "ssi4",
> + "ssi5", "ssi6", "ssi7", "ssi8";
On r8a7790, we use "ssi%u", on r8a7791, we use "ssi.%u"?
> + mstp5_clks: mstp5_clks@ffc80054 {
> + compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
> + reg = <0xffc80054 4>;
> + clocks = <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>,
> + <&cpg_clocks R8A7778_CLK_P>;
> + #clock-cells = <1>;
> + clock-indices = <
> + R8A7778_CLK_SCU0 R8A7778_CLK_SCU1
> + R8A7778_CLK_SCU2 R8A7778_CLK_SCU3
> + R8A7778_CLK_SCU4 R8A7778_CLK_SCU5
> + R8A7778_CLK_SCU6 R8A7778_CLK_SCU7
> + R8A7778_CLK_SCU8
R8A7778_CLK_SRU_SRCx
> + >;
> + clock-output-names > + "scu0", "scu1", "scu2", "scu3", "scu4",
> + "scu5", "scu6", "scu7", "scu8";
On r8a7790, we use "scu-src%u", on r8a7791, we use "src.%u"?
Shall we use "sru-src%u" or "src.%u" here?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description
2015-01-21 16:20 [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description Ulrich Hecht
2015-01-22 10:58 ` Geert Uytterhoeven
@ 2015-01-23 0:49 ` Kuninori Morimoto
2015-01-23 9:09 ` Geert Uytterhoeven
2015-01-26 1:10 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2015-01-23 0:49 UTC (permalink / raw)
To: linux-sh
Hi Geert, Ulrich,
> > --- a/arch/arm/boot/dts/r8a7778.dtsi
> > +++ b/arch/arm/boot/dts/r8a7778.dtsi
>
> > + mstp0_clks: mstp0_clks@ffc80030 {
> > + compatible = "renesas,r8a7778-mstp-clocks", "renesas,cpg-mstp-clocks";
> > + reg = <0xffc80030 4>;
(snip)
> > + >;
> > + clock-output-names > > + "i2c0", "i2c1", "i2c2", "i2c3", "scif0",
> > + "scif1", "scif2", "scif3", "scif4", "scif5",
> > + "tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
> > + "ssi2", "ssi3", "sru", "hspi";
>
> On r8a7790, we use "ssi%u", on r8a7791, we use "ssi.%u"?
(snip)
> > + clock-output-names > > + "scu0", "scu1", "scu2", "scu3", "scu4",
> > + "scu5", "scu6", "scu7", "scu8";
>
> On r8a7790, we use "scu-src%u", on r8a7791, we use "src.%u"?
>
> Shall we use "sru-src%u" or "src.%u" here?
I guess
mstp node is using "ssi%u" / "scu-src%u"
sound node is using "ssi.%u" / "src.%u"
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description
2015-01-21 16:20 [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description Ulrich Hecht
2015-01-22 10:58 ` Geert Uytterhoeven
2015-01-23 0:49 ` Kuninori Morimoto
@ 2015-01-23 9:09 ` Geert Uytterhoeven
2015-01-26 1:10 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2015-01-23 9:09 UTC (permalink / raw)
To: linux-sh
Hi Morimoto-san,
On Fri, Jan 23, 2015 at 1:49 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
>> > + clock-output-names >> > + "i2c0", "i2c1", "i2c2", "i2c3", "scif0",
>> > + "scif1", "scif2", "scif3", "scif4", "scif5",
>> > + "tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
>> > + "ssi2", "ssi3", "sru", "hspi";
>>
>> On r8a7790, we use "ssi%u", on r8a7791, we use "ssi.%u"?
> (snip)
>> > + clock-output-names >> > + "scu0", "scu1", "scu2", "scu3", "scu4",
>> > + "scu5", "scu6", "scu7", "scu8";
>>
>> On r8a7790, we use "scu-src%u", on r8a7791, we use "src.%u"?
>>
>> Shall we use "sru-src%u" or "src.%u" here?
>
> I guess
> mstp node is using "ssi%u" / "scu-src%u"
> sound node is using "ssi.%u" / "src.%u"
Right, obviously I compared the wrong nodes. There are too many sound
parameters in DTS ;-)
So on r8a7778 it should be ssi%u" / "sru-src%u", right?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description
2015-01-21 16:20 [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description Ulrich Hecht
` (2 preceding siblings ...)
2015-01-23 9:09 ` Geert Uytterhoeven
@ 2015-01-26 1:10 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2015-01-26 1:10 UTC (permalink / raw)
To: linux-sh
Hi Geert
> >> > + clock-output-names > >> > + "i2c0", "i2c1", "i2c2", "i2c3", "scif0",
> >> > + "scif1", "scif2", "scif3", "scif4", "scif5",
> >> > + "tmu0", "tmu1", "tmu2", "ssi0", "ssi1",
> >> > + "ssi2", "ssi3", "sru", "hspi";
> >>
> >> On r8a7790, we use "ssi%u", on r8a7791, we use "ssi.%u"?
> > (snip)
> >> > + clock-output-names > >> > + "scu0", "scu1", "scu2", "scu3", "scu4",
> >> > + "scu5", "scu6", "scu7", "scu8";
> >>
> >> On r8a7790, we use "scu-src%u", on r8a7791, we use "src.%u"?
> >>
> >> Shall we use "sru-src%u" or "src.%u" here?
> >
> > I guess
> > mstp node is using "ssi%u" / "scu-src%u"
> > sound node is using "ssi.%u" / "src.%u"
>
> Right, obviously I compared the wrong nodes. There are too many sound
> parameters in DTS ;-)
>
> So on r8a7778 it should be ssi%u" / "sru-src%u", right?
Thanks, I think so
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-01-26 1:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-21 16:20 [PATCH 03/11] ARM: shmobile: r8a7778: Common clock framework DT description Ulrich Hecht
2015-01-22 10:58 ` Geert Uytterhoeven
2015-01-23 0:49 ` Kuninori Morimoto
2015-01-23 9:09 ` Geert Uytterhoeven
2015-01-26 1:10 ` Kuninori Morimoto
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.