Renesas clock clk-mstp updates for clock-indices

With the addition of clock-indices, we need to change the renesas clock implementation to use these instead of the local definition.

Signed-off-by Ben Dooks <[email protected]>

---
 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
 drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +1 -1

index 5992dce..02a25d9 100644
@@ -43,7 +43,7 @@ Example
 		clock-output-names =
 			"tpu0", "mmcif1", "sdhi3", "sdhi2",
 			 "sdhi1", "sdhi0", "mmcif0";
-		renesas,clock-indices = <
+		clock-indices = <
 			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
 			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
 			R8A7790_CLK_MMCIF0

drivers/clk/shmobile/clk-mstp.c +0 -0

index 42d5912..95a2aa7 100644

Quoted 29 lines · Ben Dooks

With the addition of clock-indices, we need to change the renesas clock implementation to use these instead of the local definition.

Signed-off-by Ben Dooks <[email protected]>

---
  Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
  drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +1 -1

index 5992dce..02a25d9 100644
@@ -43,7 +43,7 @@ Example
  		clock-output-names =
  			"tpu0", "mmcif1", "sdhi3", "sdhi2",
  			 "sdhi1", "sdhi0", "mmcif0";
-		renesas,clock-indices = <
+		clock-indices = <
  			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
  			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
  			R8A7790_CLK_MMCIF0

drivers/clk/shmobile/clk-mstp.c +0 -0

index 42d5912..95a2aa7 100644
@@ -197,7 +197,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
  			continue;
 

drivers/clk/shmobile/clk-mstp.c static void __init cpg_mstp_clocks_init(struct device_node *np) · line 203

Quoted 6 lines

drivers/clk/shmobile/clk-mstp.c +1 -1

  		parent_name = of_clk_get_parent_name(np, i);
-		ret = of_property_read_u32_index(np, "renesas,clock-indices", i,
+		ret = of_property_read_u32_index(np, "clock-indices", i,
  						 &clkidx);
  		if (parent_name == NULL || ret < 0)
  			break;

Won't this break compatibility with existing DTBs?

Quoted 30 lines · Simon Horman

Quoted 29 lines · Ben Dooks

With the addition of clock-indices, we need to change the renesas clock implementation to use these instead of the local definition.

Signed-off-by Ben Dooks <[email protected]>

---
 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
 drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +1 -1

index 5992dce..02a25d9 100644
@@ -43,7 +43,7 @@ Example
 		clock-output-names =
 			"tpu0", "mmcif1", "sdhi3", "sdhi2",
 			 "sdhi1", "sdhi0", "mmcif0";
-		renesas,clock-indices = <
+		clock-indices = <
 			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
 			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
 			R8A7790_CLK_MMCIF0

drivers/clk/shmobile/clk-mstp.c +0 -0

index 42d5912..95a2aa7 100644
@@ -197,7 +197,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
 			continue;
 

Quoted 8 lines

drivers/clk/shmobile/clk-mstp.c static void __init cpg_mstp_clocks_init(struct device_node *np) · line 203

Quoted 6 lines

drivers/clk/shmobile/clk-mstp.c +1 -1

 		parent_name = of_clk_get_parent_name(np, i);
-		ret = of_property_read_u32_index(np, "renesas,clock-indices", i,
+		ret = of_property_read_u32_index(np, "clock-indices", i,
 						 &clkidx);
 		if (parent_name == NULL || ret < 0)
 			break;

Won't this break compatibility with existing DTBs?

That was the point of patch 2.

Add comaptibiltiy for older device trees by checking to see if the clock-indices property is there and falling back to the older renesas,clock-indices field.

This can be removed once all device-trees are converted.

Signed-off-by Ben Dooks <[email protected]>

---
 drivers/clk/shmobile/clk-mstp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(quoted diff) +0 -0

b/drivers/clk/shmobile/clk-mstp.c index 95a2aa7..fe63d40 100644

drivers/clk/shmobile/clk-mstp.c +1 -0

@@ -156,6 +156,7 @@ cpg_mstp_clock_register(const char *name, const char
 *parent_name, static void __init cpg_mstp_clocks_init(struct device_node
 *np)
 {
 	struct mstp_clock_group *group;
+	const char *idxname;
 	struct clk **clks;
 	unsigned int i;

drivers/clk/shmobile/clk-mstp.c +5 -2

+		idxname = "clock-indices";
+	else
+		idxname = "renesas,clock-indices";
+
 	for (i = 0; i < MSTP_MAX_CLOCKS; ++i) {
 		const char *parent_name;
 		const char *name;

@@ -197,8 +203,7 @@ static void __init cpg_mstp_clocks_init(struct
 device_node *np) continue;
 
 		parent_name = of_clk_get_parent_name(np, i);
-		ret = of_property_read_u32_index(np, "clock-indices", i,
-						 &clkidx);
+		ret = of_property_read_u32_index(np, idxname, i, &clkidx);
 		if (parent_name == NULL || ret < 0)
 			break;

Add comaptibiltiy for older device trees by checking to see if the clock-indices property is there and falling back to the older renesas,clock-indices field.

This can be removed once all device-trees are converted.

Signed-off-by Ben Dooks <[email protected]>

---
 drivers/clk/shmobile/clk-mstp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

drivers/clk/shmobile/clk-mstp.c +1 -0

index 95a2aa7..fe63d40 100644
@@ -156,6 +156,7 @@ cpg_mstp_clock_register(const char *name, const char *parent_name,
 static void __init cpg_mstp_clocks_init(struct device_node *np)
 {
 	struct mstp_clock_group *group;
+	const char *idxname;
 	struct clk **clks;
 	unsigned int i;
 

drivers/clk/shmobile/clk-mstp.c +5 -2

+		idxname = "clock-indices";
+	else
+		idxname = "renesas,clock-indices";
+
 	for (i = 0; i < MSTP_MAX_CLOCKS; ++i) {
 		const char *parent_name;
 		const char *name;

@@ -197,8 +203,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
 			continue;
 
 		parent_name = of_clk_get_parent_name(np, i);
-		ret = of_property_read_u32_index(np, "clock-indices", i,
-						 &clkidx);
+		ret = of_property_read_u32_index(np, idxname, i, &clkidx);
 		if (parent_name == NULL || ret < 0)
 			break;
 

Signature · 7 lines

1.9.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 3 lines · Ben Dooks

Add comaptibiltiy for older device trees by checking to see if the clock-indices property is there and falling back to the older renesas,clock-indices field.

Why are these two separate patches? This temporarily breaks compatibility.

Add comaptibiltiy for older device trees by checking to see if

the clock-indices property is there and falling back to the older renesas,clock-indices field.

This can be removed once all device-trees are converted.

Signed-off-by Ben Dooks <[email protected]>

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

Hi Ben,

Quoted 4 lines · Ben Dooks

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Quoted 4 lines

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

As we now have "renesas,clock-indices" in v3.14, the question about backwards compatibility became moot.

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Quoted 13 lines · Geert Uytterhoeven

Quoted 9 lines · Ben Dooks

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

Quoted 3 lines

As we now have "renesas,clock-indices" in v3.14, the question about backwards
compatibility became moot.

Do you mean 'necessary'?

Quoted 8 lines

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Quoted 5 lines

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Wouldn't it be easier if we just got mike's ack and fixed it in one go?

Hi Ben,

Quoted 14 lines · Ben Dooks

Quoted 13 lines · Geert Uytterhoeven

Quoted 9 lines · Ben Dooks

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

Quoted 5 lines

Quoted 3 lines

As we now have "renesas,clock-indices" in v3.14, the question about backwards
compatibility became moot.

Do you mean 'necessary'?

Yes, now the backwards compatibility is necessary.

Quoted 14 lines

Quoted 13 lines

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Quoted 1 line

Wouldn't it be easier if we just got mike's ack and fixed it in one go?

That's another option. But if Mike doesn't apply it to his clk-next, this may cause a merge conflict later.

Mike, would you prefer an Ack for 1/2, have them both in via yourself (and revert 2/2 later) or have them as one patch and sort out fixing up later?

Quoted 39 lines · Geert Uytterhoeven

Hi Ben,

Quoted 14 lines · Ben Dooks

Quoted 13 lines · Geert Uytterhoeven

Quoted 9 lines · Ben Dooks

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

Quoted 5 lines

Quoted 3 lines

As we now have "renesas,clock-indices" in v3.14, the question about backwards
compatibility became moot.

Do you mean 'necessary'?

Yes, now the backwards compatibility is necessary.

Quoted 14 lines

Quoted 13 lines

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Quoted 4 lines

Quoted 1 line

Wouldn't it be easier if we just got mike's ack and fixed it in one go?

That's another option. But if Mike doesn't apply it to his clk-next, this may cause a merge conflict later.

Given there's not a lot of work going on with the mstp driver at the moment I don't see that there should be much room for conflicts if we are getting fixes in for 3.15-rc1.

Mike, would you prefer an Ack for 1/2, have them both in via yourself (and revert 2/2 later) or have them as one patch and sort out fixing up later?

Hi Ben,

Quoted 8 lines · Ben Dooks

Mike, following the commit to add the clock-indices field, the following pair of commits updates the shmboile clk-mstp driver to uses these over the local variant.

Since this is involves two separte trees which are in development, the decision is that we will fixup the renesas trees once they are merged and the development cycle is complete. Once this is done, patch 2/2 can be reverted (if people care about three lines of differrence)

As we now have "renesas,clock-indices" in v3.14, the question about backwards compatibility became moot.

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Does that sound like plan?

Quoted 16 lines

As we now have "renesas,clock-indices" in v3.14, the question about backwards compatibility became moot.

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Quoted 1 line

Does that sound like plan?

I think a better approach would be for me to use a branch of Mike's or an rc release as a basis for steps 2. and 3. Once such a branch or rc release is available.

Hi Simon,

Quoted 16 lines · Simon Horman

Quoted 16 lines

As we now have "renesas,clock-indices" in v3.14, the question about backwards compatibility became moot.

Can you please combine your two patches

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

into a single patch, and submit to Mike?

Once it's in Mike's clk-next, we can do the following to get everything in v3.15:
1. Simon cherry-picks Mike's commit into his fixes-for-v3.15 branch,
2. we fix arch/arm/boot/dts/r8a7790.dtsi and .../r8a7791.dtsi there,
3. fixes-for-v3.15 gets into mainline through arm-soc.

Quoted 5 lines

Quoted 1 line

Does that sound like plan?

I think a better approach would be for me to use a branch of Mike's or an rc release as a basis for steps 2. and 3. Once such a branch or rc release is available.

That would also work.

The reasons I proposed cherry-picking were:
1. A branch may be overkill for just one small commit, putting some burden on Mike,
2. An rc release assumes Mike plans to send another pull request soon.

Anyway, the goal is to get this fixed in v3.15, whatever approach ;-)