* [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
@ 2014-10-29 14:19 ` Geert Uytterhoeven
2014-10-30 1:06 ` Simon Horman
2014-10-30 10:22 ` Laurent Pinchart
2014-10-29 14:19 ` [PATCH 2/6] ARM: shmobile: r8a7740 dtsi: Change to using clock-indices Geert Uytterhoeven
` (5 subsequent siblings)
6 siblings, 2 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree, linux-sh, Geert Uytterhoeven
Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
clock-indices") forgot to mark "renesas,clock-indices" deprecated in
the driver-specific binding documentation.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
.../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index a5f52238c80d5f9b..26ab9fc499f51113 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@ -26,11 +26,12 @@ Required Properties:
must appear in the same order as the output clocks.
- #clock-cells: Must be 1
- clock-output-names: The name of the clocks as free-form strings
- - renesas,clock-indices: Indices of the gate clocks into the group (0 to 31)
+ - clock-indices: Indices of the gate clocks into the group (0 to 31)
+ ("renesas,clock-indices" is deprecated)
-The clocks, clock-output-names and renesas,clock-indices properties contain one
-entry per gate clock. The MSTP groups are sparsely populated. Unimplemented
-gate clocks must not be declared.
+The clocks, clock-output-names and clock-indices properties contain one entry
+per gate clock. The MSTP groups are sparsely populated. Unimplemented gate
+clocks must not be declared.
Example
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices
2014-10-29 14:19 ` [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices Geert Uytterhoeven
@ 2014-10-30 1:06 ` Simon Horman
2014-10-30 1:46 ` Simon Horman
2014-10-30 10:22 ` Laurent Pinchart
1 sibling, 1 reply; 12+ messages in thread
From: Simon Horman @ 2014-10-30 1:06 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Mike Turquette, Magnus Damm, Ben Dooks, devicetree, linux-sh
On Wed, Oct 29, 2014 at 03:19:08PM +0100, Geert Uytterhoeven wrote:
> Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
> clock-indices") forgot to mark "renesas,clock-indices" deprecated in
> the driver-specific binding documentation.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks Geert.
Mike, this documentation update reflects the implementation.
I'd appreciate it if you could pick this up (or at least indicate that
you intend to) so I can pick up the remaining in this series that
make use of the new binding.
> ---
> .../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> index a5f52238c80d5f9b..26ab9fc499f51113 100644
> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> @@ -26,11 +26,12 @@ Required Properties:
> must appear in the same order as the output clocks.
> - #clock-cells: Must be 1
> - clock-output-names: The name of the clocks as free-form strings
> - - renesas,clock-indices: Indices of the gate clocks into the group (0 to 31)
> + - clock-indices: Indices of the gate clocks into the group (0 to 31)
> + ("renesas,clock-indices" is deprecated)
>
> -The clocks, clock-output-names and renesas,clock-indices properties contain one
> -entry per gate clock. The MSTP groups are sparsely populated. Unimplemented
> -gate clocks must not be declared.
> +The clocks, clock-output-names and clock-indices properties contain one entry
> +per gate clock. The MSTP groups are sparsely populated. Unimplemented gate
> +clocks must not be declared.
>
>
> Example
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices
2014-10-30 1:06 ` Simon Horman
@ 2014-10-30 1:46 ` Simon Horman
0 siblings, 0 replies; 12+ messages in thread
From: Simon Horman @ 2014-10-30 1:46 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Mike Turquette, Magnus Damm, Ben Dooks, devicetree, linux-sh
On Thu, Oct 30, 2014 at 10:06:20AM +0900, Simon Horman wrote:
> On Wed, Oct 29, 2014 at 03:19:08PM +0100, Geert Uytterhoeven wrote:
> > Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
> > clock-indices") forgot to mark "renesas,clock-indices" deprecated in
> > the driver-specific binding documentation.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Thanks Geert.
>
> Mike, this documentation update reflects the implementation.
>
> I'd appreciate it if you could pick this up (or at least indicate that
> you intend to) so I can pick up the remaining in this series that
> make use of the new binding.
Sorry, I forgot one thing:
Acked-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> > .../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 9 +++++----
> > 1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> > index a5f52238c80d5f9b..26ab9fc499f51113 100644
> > --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> > +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> > @@ -26,11 +26,12 @@ Required Properties:
> > must appear in the same order as the output clocks.
> > - #clock-cells: Must be 1
> > - clock-output-names: The name of the clocks as free-form strings
> > - - renesas,clock-indices: Indices of the gate clocks into the group (0 to 31)
> > + - clock-indices: Indices of the gate clocks into the group (0 to 31)
> > + ("renesas,clock-indices" is deprecated)
> >
> > -The clocks, clock-output-names and renesas,clock-indices properties contain one
> > -entry per gate clock. The MSTP groups are sparsely populated. Unimplemented
> > -gate clocks must not be declared.
> > +The clocks, clock-output-names and clock-indices properties contain one entry
> > +per gate clock. The MSTP groups are sparsely populated. Unimplemented gate
> > +clocks must not be declared.
> >
> >
> > Example
> > --
> > 1.9.1
> >
> --
> 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] 12+ messages in thread
* Re: [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices
2014-10-29 14:19 ` [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices Geert Uytterhoeven
2014-10-30 1:06 ` Simon Horman
@ 2014-10-30 10:22 ` Laurent Pinchart
1 sibling, 0 replies; 12+ messages in thread
From: Laurent Pinchart @ 2014-10-30 10:22 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Mike Turquette, Simon Horman, Magnus Damm, Ben Dooks, devicetree,
linux-sh
Hi Geert,
Thank you for the patch.
On Wednesday 29 October 2014 15:19:08 Geert Uytterhoeven wrote:
> Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
> clock-indices") forgot to mark "renesas,clock-indices" deprecated in
> the driver-specific binding documentation.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> .../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 9 ++++--
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git
> a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt index
> a5f52238c80d5f9b..26ab9fc499f51113 100644
> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> @@ -26,11 +26,12 @@ Required Properties:
> must appear in the same order as the output clocks.
> - #clock-cells: Must be 1
> - clock-output-names: The name of the clocks as free-form strings
> - - renesas,clock-indices: Indices of the gate clocks into the group (0 to
> 31)
> + - clock-indices: Indices of the gate clocks into the group (0 to 31)
> + ("renesas,clock-indices" is deprecated)
Nitpicking here, I would drop the reference to renesas,clock-indices
completely.
Apart from that, for the whole series,
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> -The clocks, clock-output-names and renesas,clock-indices properties contain
> one
> -entry per gate clock. The MSTP groups are sparsely populated. Unimplemented
> -gate clocks must not be declared.
> +The clocks, clock-output-names and clock-indices properties contain one
> entry
> +per gate clock. The MSTP groups are sparsely populated. Unimplemented gate
> +clocks must not be declared.
>
>
> Example
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/6] ARM: shmobile: r8a7740 dtsi: Change to using clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
2014-10-29 14:19 ` [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices Geert Uytterhoeven
@ 2014-10-29 14:19 ` Geert Uytterhoeven
2014-10-29 14:19 ` [PATCH 3/6] ARM: shmobile: r8a7779 " Geert Uytterhoeven
` (4 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree, linux-sh, Geert Uytterhoeven
With the addition of clock-indices in commit 8e33f91a0b84ae19 ("clk:
shmobile: clk-mstp: change to using clock-indices"), we can change the
DTSes to use the generic property instead of the deprecated
vendor-specific property.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7740.dtsi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index aec8da89ef9ac766..62f6de252d09c604 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -453,7 +453,7 @@
reg = <0xe6150080 4>;
clocks = <&sub_clk>, <&sub_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7740_CLK_SUBCK R8A7740_CLK_SUBCK2
>;
clock-output-names @@ -468,7 +468,7 @@
<&sub_clk>, <&sub_clk>,
<&cpg_clocks R8A7740_CLK_B>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7740_CLK_CEU21 R8A7740_CLK_CEU20 R8A7740_CLK_TMU0
R8A7740_CLK_LCDC1 R8A7740_CLK_IIC0 R8A7740_CLK_TMU1
R8A7740_CLK_LCDC0
@@ -489,7 +489,7 @@
<&sub_clk>, <&sub_clk>, <&sub_clk>,
<&sub_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7740_CLK_SCIFA6 R8A7740_CLK_INTCA
R8A7740_CLK_SCIFA7
R8A7740_CLK_DMAC1 R8A7740_CLK_DMAC2
@@ -518,7 +518,7 @@
<&cpg_clocks R8A7740_CLK_HP>,
<&cpg_clocks R8A7740_CLK_HP>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7740_CLK_CMT1 R8A7740_CLK_FSI R8A7740_CLK_IIC1
R8A7740_CLK_USBF R8A7740_CLK_SDHI0 R8A7740_CLK_SDHI1
R8A7740_CLK_MMC R8A7740_CLK_GETHER R8A7740_CLK_TPU0
@@ -535,7 +535,7 @@
<&cpg_clocks R8A7740_CLK_HP>,
<&cpg_clocks R8A7740_CLK_HP>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7740_CLK_USBH R8A7740_CLK_SDHI2
R8A7740_CLK_USBFUNC R8A7740_CLK_USBPHY
>;
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/6] ARM: shmobile: r8a7779 dtsi: Change to using clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
2014-10-29 14:19 ` [PATCH 1/6] clk: shmobile: Deprecate renesas,clock-indices Geert Uytterhoeven
2014-10-29 14:19 ` [PATCH 2/6] ARM: shmobile: r8a7740 dtsi: Change to using clock-indices Geert Uytterhoeven
@ 2014-10-29 14:19 ` Geert Uytterhoeven
[not found] ` <1414592353-24044-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
` (3 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree, linux-sh, Geert Uytterhoeven
With the addition of clock-indices in commit 8e33f91a0b84ae19 ("clk:
shmobile: clk-mstp: change to using clock-indices"), we can change the
DTSes to use the generic property instead of the deprecated
vendor-specific property.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7779.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index ede9a29e4bc601ae..e3846af833e1d532 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -475,7 +475,7 @@
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_P>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7779_CLK_HSPI R8A7779_CLK_TMU2
R8A7779_CLK_TMU1 R8A7779_CLK_TMU0
R8A7779_CLK_HSCIF1 R8A7779_CLK_HSCIF0
@@ -506,7 +506,7 @@
<&cpg_clocks R8A7779_CLK_P>,
<&cpg_clocks R8A7779_CLK_S>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7779_CLK_USB01 R8A7779_CLK_USB2
R8A7779_CLK_DU R8A7779_CLK_VIN2
R8A7779_CLK_VIN1 R8A7779_CLK_VIN0
@@ -527,7 +527,7 @@
clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
<&s4_clk>, <&s4_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7779_CLK_SDHI3 R8A7779_CLK_SDHI2
R8A7779_CLK_SDHI1 R8A7779_CLK_SDHI0
R8A7779_CLK_MMC1 R8A7779_CLK_MMC0
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread[parent not found: <1414592353-24044-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>]
* [PATCH 4/6] ARM: shmobile: r8a7790 dtsi: Change to using clock-indices
[not found] ` <1414592353-24044-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
@ 2014-10-29 14:19 ` Geert Uytterhoeven
2014-10-29 14:19 ` [PATCH 6/6] ARM: shmobile: r8a7794 " Geert Uytterhoeven
1 sibling, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-sh-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven
From: Ben Dooks <ben.dooks@codethink.co.uk>
With the addition of clock-indices in commit 8e33f91a0b84ae19 ("clk:
shmobile: clk-mstp: change to using clock-indices"), we can change the
DTSes to use the generic property instead of the deprecated
vendor-specific property.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[geert: Extracted r8a7790-specific part, rebased, reworded]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 34f22587555a95ae..7add12c3750aa2fb 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -990,7 +990,7 @@
reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
clocks = <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7790_CLK_MSIOF0>;
+ clock-indices = <R8A7790_CLK_MSIOF0>;
clock-output-names = "msiof0";
};
mstp1_clks: mstp1_clks@e6150134 {
@@ -1001,7 +1001,7 @@
<&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
<&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_VCP1 R8A7790_CLK_VCP0 R8A7790_CLK_VPC1
R8A7790_CLK_VPC0 R8A7790_CLK_JPU R8A7790_CLK_SSP1
R8A7790_CLK_TMU1 R8A7790_CLK_3DG R8A7790_CLK_2DDMAC
@@ -1023,7 +1023,7 @@
<&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&zs_clk>,
<&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_SCIFA2 R8A7790_CLK_SCIFA1 R8A7790_CLK_SCIFA0
R8A7790_CLK_MSIOF2 R8A7790_CLK_SCIFB0 R8A7790_CLK_SCIFB1
R8A7790_CLK_MSIOF1 R8A7790_CLK_MSIOF3 R8A7790_CLK_SCIFB2
@@ -1041,7 +1041,7 @@
<&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>,
<&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0
R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
@@ -1056,7 +1056,7 @@
reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
clocks = <&extal_clk>, <&p_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;
+ clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;
clock-output-names = "thermal", "pwm";
};
mstp7_clks: mstp7_clks@e615014c {
@@ -1066,7 +1066,7 @@
<&p_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>,
<&zx_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_EHCI R8A7790_CLK_HSUSB R8A7790_CLK_HSCIF1
R8A7790_CLK_HSCIF0 R8A7790_CLK_SCIF1 R8A7790_CLK_SCIF0
R8A7790_CLK_DU2 R8A7790_CLK_DU1 R8A7790_CLK_DU0
@@ -1082,7 +1082,7 @@
clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
<&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_VIN3 R8A7790_CLK_VIN2 R8A7790_CLK_VIN1
R8A7790_CLK_VIN0 R8A7790_CLK_ETHER R8A7790_CLK_SATA1
R8A7790_CLK_SATA0
@@ -1098,7 +1098,7 @@
<&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>, <&cp_clk>,
<&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7790_CLK_GPIO5 R8A7790_CLK_GPIO4 R8A7790_CLK_GPIO3
R8A7790_CLK_GPIO2 R8A7790_CLK_GPIO1 R8A7790_CLK_GPIO0
R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_QSPI_MOD R8A7790_CLK_IICDVFS
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] ARM: shmobile: r8a7794 dtsi: Change to using clock-indices
[not found] ` <1414592353-24044-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-10-29 14:19 ` [PATCH 4/6] ARM: shmobile: r8a7790 " Geert Uytterhoeven
@ 2014-10-29 14:19 ` Geert Uytterhoeven
1 sibling, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-sh-u79uwXL29TY76Z2rM5mHXA, Geert Uytterhoeven
With the addition of clock-indices in commit 8e33f91a0b84ae19 ("clk:
shmobile: clk-mstp: change to using clock-indices"), we can change the
DTSes to use the generic property instead of the deprecated
vendor-specific property.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7794.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 088e79c6551ca4b8..b9539fea92392140 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -455,7 +455,7 @@
reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
clocks = <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7794_CLK_MSIOF0>;
+ clock-indices = <R8A7794_CLK_MSIOF0>;
clock-output-names = "msiof0";
};
mstp1_clks: mstp1_clks@e6150134 {
@@ -465,7 +465,7 @@
<&cp_clk>,
<&zs_clk>, <&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_TMU1 R8A7794_CLK_TMU3 R8A7794_CLK_TMU2
R8A7794_CLK_CMT0 R8A7794_CLK_TMU0
>;
@@ -478,7 +478,7 @@
clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
<&mp_clk>, <&mp_clk>, <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_SCIFA2 R8A7794_CLK_SCIFA1 R8A7794_CLK_SCIFA0
R8A7794_CLK_MSIOF2 R8A7794_CLK_SCIFB0 R8A7794_CLK_SCIFB1
R8A7794_CLK_MSIOF1 R8A7794_CLK_SCIFB2
@@ -492,7 +492,7 @@
reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
clocks = <&rclk_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_CMT1
>;
clock-output-names @@ -504,7 +504,7 @@
clocks = <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>,
<&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5
R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0
R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1
@@ -519,7 +519,7 @@
reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
clocks = <&p_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_ETHER
>;
clock-output-names @@ -530,7 +530,7 @@
reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7794_CLK_SCIFA3 R8A7794_CLK_SCIFA4 R8A7794_CLK_SCIFA5
>;
clock-output-names = "scifa3", "scifa4", "scifa5";
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/6] ARM: shmobile: r8a7791 dtsi: Change to using clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
` (3 preceding siblings ...)
[not found] ` <1414592353-24044-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
@ 2014-10-29 14:19 ` Geert Uytterhoeven
2014-10-30 0:10 ` [PATCH 0/6] ARM: shmobile: " Kuninori Morimoto
2014-10-30 20:40 ` Ben Dooks
6 siblings, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2014-10-29 14:19 UTC (permalink / raw)
To: Mike Turquette, Simon Horman, Magnus Damm
Cc: Ben Dooks, devicetree, linux-sh, Geert Uytterhoeven
From: Ben Dooks <ben.dooks@codethink.co.uk>
With the addition of clock-indices in commit 8e33f91a0b84ae19 ("clk:
shmobile: clk-mstp: change to using clock-indices"), we can change the
DTSes to use the generic property instead of the deprecated
vendor-specific property.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[geert: Extracted r8a7791-specific part, rebased, reworded]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7791.dtsi | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 73e4c8eb5d8ca338..41a636167c0e6a8c 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -999,7 +999,7 @@
reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
clocks = <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7791_CLK_MSIOF0>;
+ clock-indices = <R8A7791_CLK_MSIOF0>;
clock-output-names = "msiof0";
};
mstp1_clks: mstp1_clks@e6150134 {
@@ -1010,7 +1010,7 @@
<&p_clk>, <&rclk_clk>, <&cp_clk>, <&zs_clk>, <&zs_clk>,
<&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_VCP0 R8A7791_CLK_VPC0 R8A7791_CLK_JPU
R8A7791_CLK_SSP1 R8A7791_CLK_TMU1 R8A7791_CLK_3DG
R8A7791_CLK_2DDMAC R8A7791_CLK_FDP1_1 R8A7791_CLK_FDP1_0
@@ -1030,7 +1030,7 @@
<&mp_clk>, <&mp_clk>, <&mp_clk>,
<&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_SCIFA2 R8A7791_CLK_SCIFA1 R8A7791_CLK_SCIFA0
R8A7791_CLK_MSIOF2 R8A7791_CLK_SCIFB0 R8A7791_CLK_SCIFB1
R8A7791_CLK_MSIOF1 R8A7791_CLK_SCIFB2
@@ -1047,7 +1047,7 @@
clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
<&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_TPU0 R8A7791_CLK_SDHI2 R8A7791_CLK_SDHI1 R8A7791_CLK_SDHI0
R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_PCIEC R8A7791_CLK_IIC1
R8A7791_CLK_SSUSB R8A7791_CLK_CMT1
@@ -1061,7 +1061,7 @@
reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
clocks = <&extal_clk>, <&p_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;
+ clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;
clock-output-names = "thermal", "pwm";
};
mstp7_clks: mstp7_clks@e615014c {
@@ -1071,7 +1071,7 @@
<&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
<&zx_clk>, <&zx_clk>, <&zx_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_EHCI R8A7791_CLK_HSUSB R8A7791_CLK_HSCIF2 R8A7791_CLK_SCIF5
R8A7791_CLK_SCIF4 R8A7791_CLK_HSCIF1 R8A7791_CLK_HSCIF0
R8A7791_CLK_SCIF3 R8A7791_CLK_SCIF2 R8A7791_CLK_SCIF1
@@ -1088,7 +1088,7 @@
clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>, <&zs_clk>,
<&zs_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_VIN2 R8A7791_CLK_VIN1 R8A7791_CLK_VIN0
R8A7791_CLK_ETHER R8A7791_CLK_SATA1 R8A7791_CLK_SATA0
>;
@@ -1104,7 +1104,7 @@
<&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>,
<&hp_clk>, <&hp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_GPIO7 R8A7791_CLK_GPIO6 R8A7791_CLK_GPIO5 R8A7791_CLK_GPIO4
R8A7791_CLK_GPIO3 R8A7791_CLK_GPIO2 R8A7791_CLK_GPIO1 R8A7791_CLK_GPIO0
R8A7791_CLK_RCAN1 R8A7791_CLK_RCAN0 R8A7791_CLK_QSPI_MOD R8A7791_CLK_I2C5
@@ -1154,7 +1154,7 @@
reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <
+ clock-indices = <
R8A7791_CLK_SCIFA3 R8A7791_CLK_SCIFA4 R8A7791_CLK_SCIFA5
>;
clock-output-names = "scifa3", "scifa4", "scifa5";
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/6] ARM: shmobile: Change to using clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
` (4 preceding siblings ...)
2014-10-29 14:19 ` [PATCH 5/6] ARM: shmobile: r8a7791 " Geert Uytterhoeven
@ 2014-10-30 0:10 ` Kuninori Morimoto
2014-10-30 20:40 ` Ben Dooks
6 siblings, 0 replies; 12+ messages in thread
From: Kuninori Morimoto @ 2014-10-30 0:10 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Mike Turquette, Simon Horman, Magnus Damm, Ben Dooks, devicetree,
linux-sh
Hi
> Hi Mike, Simon, Magnus,
>
> This patch series finalizes the conversion from the vendor-specific
> "renesas,clock-indices" to the generic "clock-indices", started by Ben Dooks.
>
> The patches for r8a7790 and r8a7791 were extracted from a patch that Ben sent
> before ("[PATCH 2/3] renesas: change to using clock-indices"), but it was never
> split/updated.
>
> Thanks for applying!
>
> Ben Dooks (2):
> ARM: shmobile: r8a7790 dtsi: Change to using clock-indices
> ARM: shmobile: r8a7791 dtsi: Change to using clock-indices
>
> Geert Uytterhoeven (4):
> clk: shmobile: Deprecate renesas,clock-indices
> ARM: shmobile: r8a7740 dtsi: Change to using clock-indices
> ARM: shmobile: r8a7779 dtsi: Change to using clock-indices
> ARM: shmobile: r8a7794 dtsi: Change to using clock-indices
>
> .../bindings/clock/renesas,cpg-mstp-clocks.txt | 9 +++++----
> arch/arm/boot/dts/r8a7740.dtsi | 10 +++++-----
> arch/arm/boot/dts/r8a7779.dtsi | 6 +++---
> arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++++--------
> arch/arm/boot/dts/r8a7791.dtsi | 18 +++++++++---------
> arch/arm/boot/dts/r8a7794.dtsi | 14 +++++++-------
> 6 files changed, 37 insertions(+), 36 deletions(-)
I have been thought that we need this !
For all patches
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/6] ARM: shmobile: Change to using clock-indices
2014-10-29 14:19 [PATCH 0/6] ARM: shmobile: Change to using clock-indices Geert Uytterhoeven
` (5 preceding siblings ...)
2014-10-30 0:10 ` [PATCH 0/6] ARM: shmobile: " Kuninori Morimoto
@ 2014-10-30 20:40 ` Ben Dooks
6 siblings, 0 replies; 12+ messages in thread
From: Ben Dooks @ 2014-10-30 20:40 UTC (permalink / raw)
To: Geert Uytterhoeven, Mike Turquette, Simon Horman, Magnus Damm
Cc: devicetree, linux-sh
On 29/10/14 14:19, Geert Uytterhoeven wrote:
> Hi Mike, Simon, Magnus,
>
> This patch series finalizes the conversion from the vendor-specific
> "renesas,clock-indices" to the generic "clock-indices", started by Ben Dooks.
>
> The patches for r8a7790 and r8a7791 were extracted from a patch that Ben sent
> before ("[PATCH 2/3] renesas: change to using clock-indices"), but it was never
> split/updated.
>
> Thanks for applying!
Thanks for following this up, i've not had time to look at any of this
code recently.
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
^ permalink raw reply [flat|nested] 12+ messages in thread