Renesas clock clk-mstp updates for clock-indices

Renesas clock clk-mstp updates for clock-indices

[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)

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices

[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 <ben.dooks@codethink.co.uk>
---
 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
 drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index 5992dce..02a25d9 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@ -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
diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
index 42d5912..95a2aa7 100644
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
@@ -197,7 +197,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, "renesas,clock-indices", i,
+		ret = of_property_read_u32_index(np, "clock-indices", i,
 						 &clkidx);
 		if (parent_name == NULL || ret < 0)
 			break;
-- 
1.9.0

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices

[Simon Horman]

On Fri, Mar 07, 2014 at 12:46:39PM +0000, Ben Dooks wrote:
> 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 <ben.dooks@codethink.co.uk>
> ---
>  Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
>  drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> index 5992dce..02a25d9 100644
> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> @@ -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
> diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
> index 42d5912..95a2aa7 100644
> --- a/drivers/clk/shmobile/clk-mstp.c
> +++ b/drivers/clk/shmobile/clk-mstp.c
> @@ -197,7 +197,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, "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?

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices

[Ben Dooks]

On 11/03/14 05:16, Simon Horman wrote:
> On Fri, Mar 07, 2014 at 12:46:39PM +0000, Ben Dooks wrote:
>> 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 <ben.dooks@codethink.co.uk>
>> ---
>>   Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
>>   drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
>> index 5992dce..02a25d9 100644
>> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
>> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
>> @@ -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
>> diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
>> index 42d5912..95a2aa7 100644
>> --- a/drivers/clk/shmobile/clk-mstp.c
>> +++ b/drivers/clk/shmobile/clk-mstp.c
>> @@ -197,7 +197,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, "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.


-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

[PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices

[Simon Horman]

On Tue, Mar 11, 2014 at 11:07:22AM +0000, Ben Dooks wrote:
> On 11/03/14 05:16, Simon Horman wrote:
> >On Fri, Mar 07, 2014 at 12:46:39PM +0000, Ben Dooks wrote:
> >>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 <ben.dooks@codethink.co.uk>
> >>---
> >>  Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
> >>  drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
> >>  2 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> >>index 5992dce..02a25d9 100644
> >>--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> >>+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
> >>@@ -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
> >>diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
> >>index 42d5912..95a2aa7 100644
> >>--- a/drivers/clk/shmobile/clk-mstp.c
> >>+++ b/drivers/clk/shmobile/clk-mstp.c
> >>@@ -197,7 +197,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, "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.

Thanks, sorry for missing that.

[PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

[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.

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

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 drivers/clk/shmobile/clk-mstp.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
index 95a2aa7..fe63d40 100644
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
@@ -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;
 
@@ -184,6 +185,11 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
 	for (i = 0; i < MSTP_MAX_CLOCKS; ++i)
 		clks[i] = ERR_PTR(-ENOENT);
 
+	if (of_find_property(np, "clock-indices", &i))
+		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;
 
-- 
1.9.0

[PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

[Laurent Pinchart]

Hi Ben,

Thank you for the patch.

On Friday 07 March 2014 12:46:40 Ben Dooks wrote:
> 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 <ben.dooks@codethink.co.uk>
> ---
>  drivers/clk/shmobile/clk-mstp.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/shmobile/clk-mstp.c
> b/drivers/clk/shmobile/clk-mstp.c index 95a2aa7..fe63d40 100644
> --- a/drivers/clk/shmobile/clk-mstp.c
> +++ b/drivers/clk/shmobile/clk-mstp.c
> @@ -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;
> 
> @@ -184,6 +185,11 @@ static void __init cpg_mstp_clocks_init(struct
> device_node *np) for (i = 0; i < MSTP_MAX_CLOCKS; ++i)
>  		clks[i] = ERR_PTR(-ENOENT);
> 
> +	if (of_find_property(np, "clock-indices", &i))

You can leave the last argument NULL.

> +		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;

-- 
Regards,

Laurent Pinchart

[PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

[Mark Rutland]

On Fri, Mar 07, 2014 at 12:46:40PM +0000, Ben Dooks wrote:
> 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.

> 
> This can be removed once all device-trees are converted.
> 
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> ---
>  drivers/clk/shmobile/clk-mstp.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
> index 95a2aa7..fe63d40 100644
> --- a/drivers/clk/shmobile/clk-mstp.c
> +++ b/drivers/clk/shmobile/clk-mstp.c
> @@ -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;
>  
> @@ -184,6 +185,11 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
>  	for (i = 0; i < MSTP_MAX_CLOCKS; ++i)
>  		clks[i] = ERR_PTR(-ENOENT);
>  
> +	if (of_find_property(np, "clock-indices", &i))

s/&i/NULL/ (or use of_property_read_bool).

Cheers,
Mark.

> +		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;
>  
> -- 
> 1.9.0
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

[Ben Dooks]

On 10/03/14 10:51, Mark Rutland wrote:
> On Fri, Mar 07, 2014 at 12:46:40PM +0000, Ben Dooks wrote:
>> 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.

Given I've not had time to change any of the device trees
for the renesas series it isn't currently an issue.

I left it separate to make it easier to remove once the changes
are through.


-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

[PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field

[Geert Uytterhoeven]

Hi Ben,

On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> Add comaptibiltiy for older device trees by checking to see if

compatibility (also in the subject line).

> 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 <ben.dooks@codethink.co.uk>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Renesas clock clk-mstp updates for clock-indices

[Kuninori Morimoto]

Hi all

These patches are very important for me.
But, could you please teach me currect status of these ??
Can I find these when -rc1 was released ?

> 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

Renesas clock clk-mstp updates for clock-indices

[Geert Uytterhoeven]

Hi Ben,

On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> 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?

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Renesas clock clk-mstp updates for clock-indices

[Ben Dooks]

On 15/04/14 10:26, Geert Uytterhoeven wrote:
> Hi Ben,
>
> On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
>> 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.

Do you mean 'necessary'?

> 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.

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

-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

Renesas clock clk-mstp updates for clock-indices

[Geert Uytterhoeven]

Hi Ben,

On Tue, Apr 15, 2014 at 1:43 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> On 15/04/14 10:26, Geert Uytterhoeven wrote:
>> On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk>
>> wrote:
>>>
>>> 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.
>
> Do you mean 'necessary'?

Yes, now the backwards compatibility is necessary.

>> 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.
>
> 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.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Renesas clock clk-mstp updates for clock-indices

[Ben Dooks]

On 15/04/14 12:46, Geert Uytterhoeven wrote:
> Hi Ben,
>
> On Tue, Apr 15, 2014 at 1:43 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
>> On 15/04/14 10:26, Geert Uytterhoeven wrote:
>>> On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk>
>>> wrote:
>>>>
>>>> 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.
>>
>> Do you mean 'necessary'?
>
> Yes, now the backwards compatibility is necessary.
>
>>> 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.
>>
>> 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?


-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

Renesas clock clk-mstp updates for clock-indices

[Geert Uytterhoeven]

Hi Ben,

On Tue, Apr 15, 2014 at 1:52 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> 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?

Having 1/2 and 2/2 separate breaks bisection, so it should be one patch.
I'm afraid we can't revert 2/2 later anymore, due to backwards compatibility.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Renesas clock clk-mstp updates for clock-indices

[Simon Horman]

On Tue, Apr 15, 2014 at 12:52:49PM +0100, Ben Dooks wrote:
> On 15/04/14 12:46, Geert Uytterhoeven wrote:
> >Hi Ben,
> >
> >On Tue, Apr 15, 2014 at 1:43 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> >>On 15/04/14 10:26, Geert Uytterhoeven wrote:
> >>>On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk>
> >>>wrote:
> >>>>
> >>>>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.
> >>
> >>Do you mean 'necessary'?
> >
> >Yes, now the backwards compatibility is necessary.
> >
> >>>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.
> >>
> >>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?

FWIW, that approach would be fine by me.

Renesas clock clk-mstp updates for clock-indices

[Simon Horman]

On Tue, Apr 15, 2014 at 11:26:20AM +0200, Geert Uytterhoeven wrote:
> Hi Ben,
> 
> On Fri, Mar 7, 2014 at 1:46 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> > 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?

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.

Renesas clock clk-mstp updates for clock-indices

[Geert Uytterhoeven]

Hi Simon,

On Wed, Apr 16, 2014 at 1:58 AM, Simon Horman <horms@verge.net.au> wrote:
>> 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?
>
> 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 ;-)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Renesas clock clk-mstp updates for clock-indices

[Simon Horman]

On Wed, Apr 16, 2014 at 09:12:15AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Wed, Apr 16, 2014 at 1:58 AM, Simon Horman <horms@verge.net.au> wrote:
> >> 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?
> >
> > 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 ;-)

Yes, that much we can all agree on :)