diff mbox

[2/2] dts: keystone: Change "ti,davinci-i2c" compatible to "ti,keystone-i2c"

Message ID 55D6F39A.2030402@nokia.com
State Superseded
Headers show

Commit Message

Alexander A Sverdlin Aug. 21, 2015, 9:47 a.m. UTC
Now as "i2c-davinci" driver has special handling for Keystone it's time to switch
the device tree to use new "compatible" property.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
 arch/arm/boot/dts/keystone.dtsi |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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

Comments

Mark Rutland Aug. 21, 2015, 6:25 p.m. UTC | #1
On Fri, Aug 21, 2015 at 10:47:06AM +0100, Alexander Sverdlin wrote:
> Now as "i2c-davinci" driver has special handling for Keystone it's time to switch
> the device tree to use new "compatible" property.
> 
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> ---
>  arch/arm/boot/dts/keystone.dtsi |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
> index 72816d6..a846597 100644
> --- a/arch/arm/boot/dts/keystone.dtsi
> +++ b/arch/arm/boot/dts/keystone.dtsi
> @@ -106,7 +106,7 @@
>  		};
>  
>  		i2c0: i2c@2530000 {
> -			compatible = "ti,davinci-i2c";
> +			compatible = "ti,keystone-i2c";

From what I understand of the previous patch, this is effectively an
optimisation, and things worked to some extent with the "ti,davinci-i2c"
string.

So could you leave that as a fallback, i.e. have:

	compatible = "ti,keystone-i2c", "ti,davinci-i2c";

That way an old kernel still functions with this DT, which among other things
makes debugging and bisecting far easier.

Or are things actually broken with the "ti,davinci-i2c" string?

Thanks,
Mark
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander A Sverdlin Aug. 24, 2015, 7:17 a.m. UTC | #2
Hello Mark,

On 21/08/15 20:25, ext Mark Rutland wrote:
>> Now as "i2c-davinci" driver has special handling for Keystone it's time to switch
>> > the device tree to use new "compatible" property.
>> > 
>> > Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
>> > ---
>> >  arch/arm/boot/dts/keystone.dtsi |    6 +++---
>> >  1 files changed, 3 insertions(+), 3 deletions(-)
>> > 
>> > diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
>> > index 72816d6..a846597 100644
>> > --- a/arch/arm/boot/dts/keystone.dtsi
>> > +++ b/arch/arm/boot/dts/keystone.dtsi
>> > @@ -106,7 +106,7 @@
>> >  		};
>> >  
>> >  		i2c0: i2c@2530000 {
>> > -			compatible = "ti,davinci-i2c";
>> > +			compatible = "ti,keystone-i2c";
>>From what I understand of the previous patch, this is effectively an
> optimisation, and things worked to some extent with the "ti,davinci-i2c"
> string.

Indeed this is an optimization.

> So could you leave that as a fallback, i.e. have:
> 
> 	compatible = "ti,keystone-i2c", "ti,davinci-i2c";

And I have no problem leaving fallback compatible.

> That way an old kernel still functions with this DT, which among other things
> makes debugging and bisecting far easier.

I've just thought, that we do not care about backwards-compatibility for the DT in
the kernel tree, because one always have the correct one linked to the kernel.
And this evaluation module never has it flashed to some persistent storage outside
of kernel image, so version mismatch is impossible.

> Or are things actually broken with the "ti,davinci-i2c" string?

No, not in this case.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 72816d6..a846597 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -106,7 +106,7 @@ 
 		};
 
 		i2c0: i2c@2530000 {
-			compatible = "ti,davinci-i2c";
+			compatible = "ti,keystone-i2c";
 			reg = <0x02530000 0x400>;
 			clock-frequency = <100000>;
 			clocks = <&clki2c>;
@@ -116,7 +116,7 @@ 
 		};
 
 		i2c1: i2c@2530400 {
-			compatible = "ti,davinci-i2c";
+			compatible = "ti,keystone-i2c";
 			reg = <0x02530400 0x400>;
 			clock-frequency = <100000>;
 			clocks = <&clki2c>;
@@ -126,7 +126,7 @@ 
 		};
 
 		i2c2: i2c@2530800 {
-			compatible = "ti,davinci-i2c";
+			compatible = "ti,keystone-i2c";
 			reg = <0x02530800 0x400>;
 			clock-frequency = <100000>;
 			clocks = <&clki2c>;