Skip to contentSkip to conversation

dts: keystone: Change "ti,davinci-i2c" compatible to "ti,keystone-i2c"

PATCH In review Alexander Sverdlin 2 participants 3 messages Aug 21, 2015 – Aug 24, 2015 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

Now as "i2c-davinci" driver has special handling for Keystone it's time to switch the device tree to use new "compatible" property.

---
 arch/arm/boot/dts/keystone.dtsi |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/keystone.dtsi +3 -3
index 72816d6..a846597 100644
@@ -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>;

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 19 lines · Alexander Sverdlin

Now as "i2c-davinci" driver has special handling for Keystone it's time to switch the device tree to use new "compatible" property.

---
 arch/arm/boot/dts/keystone.dtsi |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/keystone.dtsi +1 -1
index 72816d6..a846597 100644
@@ -106,7 +106,7 @@
 		};
 
 		i2c0: i2c@2530000 {
-			compatible = "ti,davinci-i2c";
+			compatible = "ti,keystone-i2c";
 
Quoted 1 line

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 devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw

Hello Mark,

Quoted 15 lines · ext Mark Rutland
Quoted 15 lines

Now as "i2c-davinci" driver has special handling for Keystone it's time to switch

Quoted 14 lines

the device tree to use new "compatible" property.

---
 arch/arm/boot/dts/keystone.dtsi |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/keystone.dtsi +0 -0
index 72816d6..a846597 100644
@@ -106,7 +106,7 @@
 		};
 
Quoted 6 lines
Quoted 4 lines

arch/arm/boot/dts/keystone.dtsi line 109

Quoted 3 lines
arch/arm/boot/dts/keystone.dtsi +1 -1
 		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.

Quoted 3 lines

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.

Quoted 2 lines

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.

Quoted 1 line

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

No, not in this case.

Signature · 2 lines
Best regards,
Alexander Sverdlin.