[PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Geert Uytterhoeven]

	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.

Changes in v2:
  - Drop the reference to "renesas,clock-indices" completely,
  - Add Acked-by.

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     |  8 ++++----
 arch/arm/boot/dts/r8a7740.dtsi                     | 10 +++++-----
 arch/arm/boot/dts/r8a7779.dtsi                     |  6 +++---
 arch/arm/boot/dts/r8a7790.dtsi                     | 20 +++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi                     | 22 ++++++++++++----------
 arch/arm/boot/dts/r8a7794.dtsi                     | 14 +++++++-------
 6 files changed, 42 insertions(+), 38 deletions(-)

-- 
1.9.1

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

[PATCH v2 1/6] clk: shmobile: Deprecate renesas,clock-indices

[Geert Uytterhoeven]

Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
clock-indices") forgot to replace all occurrences of
"renesas,clock-indices" in the driver-specific binding documentation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Drop the reference to "renesas,clock-indices" completely,
  - Add Acked-by.
---
 .../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt         | 8 ++++----
 1 file changed, 4 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 e566fb79af9e4d37..0a80fa70ca265c0f 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@ -27,11 +27,11 @@ 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)
 
-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

[PATCH v2 2/6] ARM: shmobile: r8a7740 dtsi: Change to using clock-indices

[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>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Add Acked-by
---
 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 e2c9496c2c325a1f..95723764431a3e5d 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -485,7 +485,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 =
@@ -500,7 +500,7 @@
 				 <&cpg_clocks R8A7740_CLK_HPP>, <&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
@@ -521,7 +521,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
@@ -550,7 +550,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
@@ -567,7 +567,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

[PATCH v2 3/6] ARM: shmobile: r8a7779 dtsi: Change to using clock-indices

[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>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Add Acked-by
---
 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

[PATCH v2 4/6] ARM: shmobile: r8a7790 dtsi: Change to using clock-indices

[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>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Add Acked-by
---
 arch/arm/boot/dts/r8a7790.dtsi | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a17f5630bcc22bec..46d6898de290d2d0 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1046,7 +1046,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 {
@@ -1057,7 +1057,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
@@ -1079,7 +1079,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
@@ -1097,7 +1097,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
@@ -1112,8 +1112,10 @@
 			reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
 			clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;
 			#clock-cells = <1>;
-			renesas,clock-indices = <R8A7790_CLK_AUDIO_DMAC0 R8A7790_CLK_AUDIO_DMAC1
-						 R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;
+			clock-indices = <
+				R8A7790_CLK_AUDIO_DMAC0 R8A7790_CLK_AUDIO_DMAC1
+				R8A7790_CLK_THERMAL R8A7790_CLK_PWM
+			>;
 			clock-output-names = "audmac0", "audmac1", "thermal", "pwm";
 		};
 		mstp7_clks: mstp7_clks@e615014c {
@@ -1123,7 +1125,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
@@ -1139,7 +1141,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
@@ -1155,7 +1157,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

[PATCH v2 5/6] ARM: shmobile: r8a7791 dtsi: Change to using clock-indices

[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>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Add Acked-by
---
 arch/arm/boot/dts/r8a7791.dtsi | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 142c3ed5fb7a4d68..feb6b9a26e1ce73f 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1056,7 +1056,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 {
@@ -1067,7 +1067,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
@@ -1087,7 +1087,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
@@ -1104,7 +1104,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
@@ -1118,8 +1118,10 @@
 			reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
 			clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;
 			#clock-cells = <1>;
-			renesas,clock-indices = <R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1
-						 R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;
+			clock-indices = <
+				R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1
+				R8A7791_CLK_THERMAL R8A7791_CLK_PWM
+			>;
 			clock-output-names = "audmac0", "audmac1", "thermal", "pwm";
 		};
 		mstp7_clks: mstp7_clks@e615014c {
@@ -1129,7 +1131,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
@@ -1146,7 +1148,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
 			>;
@@ -1162,7 +1164,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
@@ -1212,7 +1214,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

[PATCH v2 6/6] ARM: shmobile: r8a7794 dtsi: Change to using clock-indices

[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>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v2:
  - Add Acked-by
---
 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 95f656d22fdeca80..3259d82dd5577269 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 = <&zg_clk>, <&zg_clk>, <&p_clk>;
 			#clock-cells = <1>;
-			renesas,clock-indices = <
+			clock-indices = <
 				R8A7794_CLK_VIN1 R8A7794_CLK_VIN0 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

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Wolfram Sang]

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

On Mon, Nov 10, 2014 at 07:49:33PM +0100, 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.

Cool!

Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


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

Re: [PATCH v2 1/6] clk: shmobile: Deprecate renesas,clock-indices

[Mike Turquette]

Quoting Geert Uytterhoeven (2014-11-10 10:49:34)
> Commit 8e33f91a0b84ae19 ("clk: shmobile: clk-mstp: change to using
> clock-indices") forgot to replace all occurrences of
> "renesas,clock-indices" in the driver-specific binding documentation.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Simon Horman <horms+renesas@verge.net.au>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Applied to clk-next.

Regards,
Mike

> ---
> v2:
>   - Drop the reference to "renesas,clock-indices" completely,
>   - Add Acked-by.
> ---
>  .../devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt         | 8 ++++----
>  1 file changed, 4 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 e566fb79af9e4d37..0a80fa70ca265c0f 100644
> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> @@ -27,11 +27,11 @@ 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)
>  
> -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
> 

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Geert Uytterhoeven]

Hi Simon,

On Mon, Nov 10, 2014 at 7:49 PM, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
> 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.
>
> Changes in v2:
>   - Drop the reference to "renesas,clock-indices" completely,
>   - Add Acked-by.
>
> Thanks for applying!

As Mike has accepted the bindings update in clk-next, can you please apply
the dtsi updates?

Thanks!

> 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     |  8 ++++----
>  arch/arm/boot/dts/r8a7740.dtsi                     | 10 +++++-----
>  arch/arm/boot/dts/r8a7779.dtsi                     |  6 +++---
>  arch/arm/boot/dts/r8a7790.dtsi                     | 20 +++++++++++---------
>  arch/arm/boot/dts/r8a7791.dtsi                     | 22 ++++++++++++----------
>  arch/arm/boot/dts/r8a7794.dtsi                     | 14 +++++++-------
>  6 files changed, 42 insertions(+), 38 deletions(-)

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

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Simon Horman]

On Wed, Dec 03, 2014 at 12:27:13PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Nov 10, 2014 at 7:49 PM, Geert Uytterhoeven
> <geert+renesas@glider.be> wrote:
> > 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.
> >
> > Changes in v2:
> >   - Drop the reference to "renesas,clock-indices" completely,
> >   - Add Acked-by.
> >
> > Thanks for applying!
> 
> As Mike has accepted the bindings update in clk-next, can you please apply
> the dtsi updates?

Sure, I will look into doing so; most likely tomorrow.

> Thanks!
> 
> > 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     |  8 ++++----
> >  arch/arm/boot/dts/r8a7740.dtsi                     | 10 +++++-----
> >  arch/arm/boot/dts/r8a7779.dtsi                     |  6 +++---
> >  arch/arm/boot/dts/r8a7790.dtsi                     | 20 +++++++++++---------
> >  arch/arm/boot/dts/r8a7791.dtsi                     | 22 ++++++++++++----------
> >  arch/arm/boot/dts/r8a7794.dtsi                     | 14 +++++++-------
> >  6 files changed, 42 insertions(+), 38 deletions(-)
> 
> 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
> 

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Simon Horman]

On Thu, Dec 04, 2014 at 01:11:44PM +0900, Simon Horman wrote:
> On Wed, Dec 03, 2014 at 12:27:13PM +0100, Geert Uytterhoeven wrote:
> > Hi Simon,
> > 
> > On Mon, Nov 10, 2014 at 7:49 PM, Geert Uytterhoeven
> > <geert+renesas@glider.be> wrote:
> > > 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.
> > >
> > > Changes in v2:
> > >   - Drop the reference to "renesas,clock-indices" completely,
> > >   - Add Acked-by.
> > >
> > > Thanks for applying!
> > 
> > As Mike has accepted the bindings update in clk-next, can you please apply
> > the dtsi updates?
> 
> Sure, I will look into doing so; most likely tomorrow.

Thanks, I have now done so.

There was some fuzz when applying most of the patches,
I'd appreciate it if you could check that I got things right.

> > Thanks!
> > 
> > > 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     |  8 ++++----
> > >  arch/arm/boot/dts/r8a7740.dtsi                     | 10 +++++-----
> > >  arch/arm/boot/dts/r8a7779.dtsi                     |  6 +++---
> > >  arch/arm/boot/dts/r8a7790.dtsi                     | 20 +++++++++++---------
> > >  arch/arm/boot/dts/r8a7791.dtsi                     | 22 ++++++++++++----------
> > >  arch/arm/boot/dts/r8a7794.dtsi                     | 14 +++++++-------
> > >  6 files changed, 42 insertions(+), 38 deletions(-)
> > 
> > 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
> > 
> --
> 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
> 

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Geert Uytterhoeven]

Hi Simon,

On Thu, Dec 4, 2014 at 8:00 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Dec 04, 2014 at 01:11:44PM +0900, Simon Horman wrote:
>> On Wed, Dec 03, 2014 at 12:27:13PM +0100, Geert Uytterhoeven wrote:
>> > On Mon, Nov 10, 2014 at 7:49 PM, Geert Uytterhoeven
>> > <geert+renesas@glider.be> wrote:
>> > > 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.
>> >
>> > As Mike has accepted the bindings update in clk-next, can you please apply
>> > the dtsi updates?
>>
>> Sure, I will look into doing so; most likely tomorrow.
>
> Thanks, I have now done so.
>
> There was some fuzz when applying most of the patches,
> I'd appreciate it if you could check that I got things right.

Thanks, the result looks fine, both in devel and dt-for-v3.20.

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

Re: [PATCH v2 0/6] ARM: shmobile: Change to using clock-indices

[Simon Horman]

On Thu, Dec 04, 2014 at 11:22:04AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Thu, Dec 4, 2014 at 8:00 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Dec 04, 2014 at 01:11:44PM +0900, Simon Horman wrote:
> >> On Wed, Dec 03, 2014 at 12:27:13PM +0100, Geert Uytterhoeven wrote:
> >> > On Mon, Nov 10, 2014 at 7:49 PM, Geert Uytterhoeven
> >> > <geert+renesas@glider.be> wrote:
> >> > > 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.
> >> >
> >> > As Mike has accepted the bindings update in clk-next, can you please apply
> >> > the dtsi updates?
> >>
> >> Sure, I will look into doing so; most likely tomorrow.
> >
> > Thanks, I have now done so.
> >
> > There was some fuzz when applying most of the patches,
> > I'd appreciate it if you could check that I got things right.
> 
> Thanks, the result looks fine, both in devel and dt-for-v3.20.

Thanks for checking.