Change vendor prefix for Intersil Corporation

RFC PATCH Superseded Philipp Zabel 4 participants 13 messages Aug 20, 2014 – Sep 8, 2014

Subsystems (4)

Device tree bindings PowerPC I2C subsystem host drivers Real time clock (RTC)

lore

Share & tools

lore

Philipp Zabel

author

2014-08-20 08:42 UTC #0 lore raw

cover Change vendor prefix for Intersil Corporation

Hi,

currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. I figure at this point it is still possible to change this to use "isil" everywhere without too much pain, but it might be preferred to keep the already documented "isl" prefix, even though it doesn't follow the convention to use the NASDAQ symbol where available.

The current users of the "isil" prefix are the following drivers and device trees, so we could just as well change those instead:

	arch/arm/boot/dts/tegra20-seaboard.dts
	arch/arm/boot/dts/tegra20-ventana.dts
	arch/arm/boot/dts/tegra30-cardhu.dtsi
	arch/powerpc/boot/dts/p1022rdk.dts
	drivers/staging/iio/light/isl29018.c
	drivers/staging/iio/light/isl29028.c

regards
Philipp

Philipp Zabel (6):
of: Change vendor prefix for Intersil Corporation to isil
Documentation: Add isl1208 and isl12022 to trivial-devices list
ARM: mvebu: Change vendor prefix for Intersil Corporation to isil powerpc/85xx: Change vendor prefix for Intersil Corporation to isil
rtc: rtc-isl12022: Change vendor prefix for Intersil Corporation to
isil
rtc: rtc-isl12057: Change vendor prefix for Intersil Corporation to
isil

 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 4 +++-
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts            | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts            | 2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts            | 2 +-
 arch/powerpc/boot/dts/ppa8548.dts                         | 2 +-
 drivers/rtc/rtc-isl12022.c                                | 3 ++-
 drivers/rtc/rtc-isl12057.c                                | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

Signature · 1 line

2.1.0.rc1

Philipp Zabel

author

2014-08-20 08:42 UTC #1 lore raw

RFC PATCH 1/6 of: Change vendor prefix for Intersil Corporation to isil

Signed-off-by Philipp Zabel <[email protected]>

---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 +-
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/i2c/trivial-devices.txt +1 -1

index 6af570e..6504297 100644
@@ -56,7 +56,7 @@ fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec
 gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
 infineon,slb9635tt	Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
 infineon,slb9645tt	Infineon SLB9645 I2C TPM (new protocol, max 400khz)
-isl,isl12057		Intersil ISL12057 I2C RTC Chip
+isil,isl12057		Intersil ISL12057 I2C RTC Chip
 maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator
 maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625		9-Bit/12-Bit Temperature Sensors with I?C-Compatible Serial Interface

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -1

index ac7269f..938e0ce 100644
@@ -68,7 +68,7 @@ img	Imagination Technologies Ltd.
 intel	Intel Corporation
 intercontrol	Inter Control Group
 isee	ISEE 2007 S.L.
-isl	Intersil
+isil	Intersil Corporation
 karo	Ka-Ro electronics GmbH
 keymile	Keymile GmbH
 lacie	LaCie

Signature · 1 line

2.1.0.rc1

Philipp Zabel

author

2014-08-20 08:43 UTC #2 lore raw

RFC PATCH 2/6 Documentation: Add isl1208 and isl12022 to trivial-devices list

In reply to Philipp Zabel

This patch adds the Intersil ISL1208 and ISL12022 I2C RTCs to the trivial-devices list.

Signed-off-by Philipp Zabel <[email protected]>

---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 ++
 1 file changed, 2 insertions(+)

Documentation/devicetree/bindings/i2c/trivial-devices.txt +2 -0

index 6504297..ec4c6b2 100644
@@ -56,6 +56,8 @@ fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec
 gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface
 infineon,slb9635tt	Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
 infineon,slb9645tt	Infineon SLB9645 I2C TPM (new protocol, max 400khz)
+isil,isl1208		Intersil ISL1208 I2C RTC Chip
+isil,isl12022		Intersil ISL12022 I2C RTC Chip
 isil,isl12057		Intersil ISL12057 I2C RTC Chip
 maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator
 maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

Signature · 1 line

2.1.0.rc1

Philipp Zabel

author

2014-08-20 08:43 UTC #3 lore raw

RFC PATCH 3/6 ARM: mvebu: Change vendor prefix for Intersil Corporation to isil

In reply to Philipp Zabel

Signed-off-by Philipp Zabel <[email protected]>

---
 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

arch/arm/boot/dts/armada-370-netgear-rn102.dts +1 -1

index d6d572e..edc381c 100644
@@ -122,7 +122,7 @@
 				status = "okay";
 
 				isl12057: isl12057 at 68 {
-					compatible = "isl,isl12057";
+					compatible = "isil,isl12057";
 					reg = <0x68>;
 				};

arch/arm/boot/dts/armada-370-netgear-rn104.dts +1 -1

index c5fe8b5..7367b4c 100644
@@ -117,7 +117,7 @@
 				status = "okay";
 
 				isl12057: isl12057 at 68 {
-					compatible = "isl,isl12057";
+					compatible = "isil,isl12057";
 					reg = <0x68>;
 				};

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +1 -1

index 0cf999a..252def8 100644
@@ -174,7 +174,7 @@
 				status = "okay";
 
 				isl12057: isl12057 at 68 {
-					compatible = "isl,isl12057";
+					compatible = "isil,isl12057";
 					reg = <0x68>;
 				};

Signature · 1 line

2.1.0.rc1

Philipp Zabel

author

2014-08-20 08:43 UTC #4 lore raw

RFC PATCH 4/6 powerpc/85xx: Change vendor prefix for Intersil Corporation to isil

In reply to Philipp Zabel

Signed-off-by Philipp Zabel <[email protected]>

---
 arch/powerpc/boot/dts/ppa8548.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/boot/dts/ppa8548.dts +1 -1

index 27b0699..000262b 100644
@@ -89,7 +89,7 @@
 &soc {
 	i2c at 3000 {
 		rtc at 6f {
-			compatible = "intersil,isl1208";
+			compatible = "isil,isl1208";
 			reg = <0x6f>;
 		};
 	};

Signature · 1 line

2.1.0.rc1

Rob Herring

2014-08-22 03:12 UTC #5 lore raw

RFC PATCH 4/6 powerpc/85xx: Change vendor prefix for Intersil Corporation to isil

Quoted 16 lines · Philipp Zabel

Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt, since the isl1208 driver doesn't care either way.
Signed-off-by Philipp Zabel <[email protected]>
---
 arch/powerpc/boot/dts/ppa8548.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/boot/dts/ppa8548.dts +0 -0
index 27b0699..000262b 100644

arch/powerpc/boot/dts/ppa8548.dts line 92

Quoted 5 lines

arch/powerpc/boot/dts/ppa8548.dts +1 -1

@@ -89,7 +89,7 @@
 &soc {
        i2c at 3000 {
                rtc at 6f {
-                       compatible = "intersil,isl1208";
+                       compatible = "isil,isl1208";

This is a mature platform. You cannot change it. You can add the new string, but the dts and kernel need both strings.

I would just leave it all alone and add the new prefix and mark the others deprecated.

Rob

Quoted 6 lines

arch/powerpc/boot/dts/ppa8548.dts +0 -1

                        reg = <0x6f>;
                };
        };
--

2.1.0.rc1

Philipp Zabel

author

2014-08-20 08:43 UTC #6 lore raw

RFC PATCH 5/6 rtc: rtc-isl12022: Change vendor prefix for Intersil Corporation to isil

In reply to Philipp Zabel

Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt, since the isl1208 driver doesn't care either way.
Patch db04d6284e2a added device tree support using the then documented isl vendor prefix, so we keep that around for backwards compatibility.

Signed-off-by Philipp Zabel <[email protected]>

---
 drivers/rtc/rtc-isl12022.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/rtc/rtc-isl12022.c +2 -1

index aa55f08..df20f18 100644
@@ -275,7 +275,8 @@ static int isl12022_probe(struct i2c_client *client,
 
 #ifdef CONFIG_OF
 static struct of_device_id isl12022_dt_match[] = {
-	{ .compatible = "isl,isl12022" },
+	{ .compatible = "isil,isl12022" },
+	{ .compatible = "isl,isl12022" }, /* for backwards compatibility */
 	{ },
 };
 #endif

Signature · 1 line

2.1.0.rc1

Philipp Zabel

author

2014-08-22 08:57 UTC #7 lore raw

RFC PATCH 5/6 rtc: rtc-isl12022: Change vendor prefix for Intersil Corporation to isil

Am Mittwoch, den 20.08.2014, 10:43 +0200 schrieb Philipp Zabel:

Quoted 19 lines

Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt, since the isl1208 driver doesn't care either way.
Patch db04d6284e2a added device tree support using the then documented isl vendor prefix, so we keep that around for backwards compatibility.
Signed-off-by Philipp Zabel <[email protected]>
---
 drivers/rtc/rtc-isl12022.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-isl12022.c +0 -0
index aa55f08..df20f18 100644

drivers/rtc/rtc-isl12022.c static int isl12022_probe(struct i2c_client *client, · line 279

Quoted 6 lines

drivers/rtc/rtc-isl12022.c +2 -1

@@ -275,7 +275,8 @@ static int isl12022_probe(struct i2c_client *client,
 
 #ifdef CONFIG_OF
 static struct of_device_id isl12022_dt_match[] = {
-	{ .compatible = "isl,isl12022" },
+	{ .compatible = "isil,isl12022" },
+	{ .compatible = "isl,isl12022" }, /* for backwards compatibility */

Actually, is it even necessary to keep this around in here? If of_driver_match_device fails, i2c_device_match will continue to try i2c_match_id if driver->id_table is set, which matches against the result of of_modalias_node (dropping the vendor prefix altogether).

regards
Philipp

Philipp Zabel

author

2014-08-20 08:43 UTC #8 lore raw

RFC PATCH 6/6 rtc: rtc-isl12057: Change vendor prefix for Intersil Corporation to isil

In reply to Philipp Zabel

Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt, since the isl1208 driver doesn't care either way.
Patch 70e123373c05 added this driver with device tree support using the then documented isl vendor prefix, so we keep that around for backwards compatibility.

Signed-off-by Philipp Zabel <[email protected]>

---
 drivers/rtc/rtc-isl12057.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/rtc/rtc-isl12057.c +2 -1

index 455b601..8276bd6 100644
@@ -279,7 +279,8 @@ static int isl12057_probe(struct i2c_client *client,
 
 #ifdef CONFIG_OF
 static const struct of_device_id isl12057_dt_match[] = {
-	{ .compatible = "isl,isl12057" },
+	{ .compatible = "isil,isl12057" },
+	{ .compatible = "isl,isl12057" }, /* for backwards compatibility */
 	{ },
 };
 #endif

Signature · 1 line

2.1.0.rc1

Sergei Shtylyov

2014-08-20 12:40 UTC #9 lore raw

RFC PATCH 6/6 rtc: rtc-isl12057: Change vendor prefix for Intersil Corporation to isil

Hello.

Quoted 6 lines · Philipp Zabel

Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt, since the isl1208 driver doesn't care either way.
Patch 70e123373c05 added this driver with device tree support

Please also specify that commit's summary line in parens.

Quoted 4 lines

using the then documented isl vendor prefix, so we keep that around for backwards compatibility.
Signed-off-by Philipp Zabel <[email protected]>

WBR, Sergei

Jason Cooper

2014-08-20 12:16 UTC #10 lore raw

cover Change vendor prefix for Intersil Corporation

In reply to Philipp Zabel

Philipp,

Quoted 31 lines · Philipp Zabel

Hi,
currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. I figure at this point it is still possible to change this to use "isil" everywhere without too much pain, but it might be preferred to keep the already documented "isl" prefix, even though it doesn't follow the convention to use the NASDAQ symbol where available.
The current users of the "isil" prefix are the following drivers and device trees, so we could just as well change those instead:
	arch/arm/boot/dts/tegra20-seaboard.dts
	arch/arm/boot/dts/tegra20-ventana.dts
	arch/arm/boot/dts/tegra30-cardhu.dtsi
	arch/powerpc/boot/dts/p1022rdk.dts
	drivers/staging/iio/light/isl29018.c
	drivers/staging/iio/light/isl29028.c
regards
Philipp
Philipp Zabel (6):
of: Change vendor prefix for Intersil Corporation to isil
Documentation: Add isl1208 and isl12022 to trivial-devices list
ARM: mvebu: Change vendor prefix for Intersil Corporation to isil powerpc/85xx: Change vendor prefix for Intersil Corporation to isil
rtc: rtc-isl12022: Change vendor prefix for Intersil Corporation to
isil
rtc: rtc-isl12057: Change vendor prefix for Intersil Corporation to
isil

Quoted 9 lines

 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 4 +++-
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts            | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts            | 2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts            | 2 +-
 arch/powerpc/boot/dts/ppa8548.dts                         | 2 +-
 drivers/rtc/rtc-isl12022.c                                | 3 ++-
 drivers/rtc/rtc-isl12057.c                                | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

This looks good overall. My only nit is that I'd like to see the legacy name(s) captured in the binding docs.

I'll take the Armada dts changes through mvebu/arm-soc after a few days.

thx,

Jason.

Jason Cooper

2014-09-07 13:32 UTC #11 lore raw

cover Change vendor prefix for Intersil Corporation

Quoted 44 lines · Jason Cooper

Philipp,
Quoted 31 lines · Philipp Zabel
Hi,
currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. I figure at this point it is still possible to change this to use "isil" everywhere without too much pain, but it might be preferred to keep the already documented "isl" prefix, even though it doesn't follow the convention to use the NASDAQ symbol where available.
The current users of the "isil" prefix are the following drivers and device trees, so we could just as well change those instead:
	arch/arm/boot/dts/tegra20-seaboard.dts
	arch/arm/boot/dts/tegra20-ventana.dts
	arch/arm/boot/dts/tegra30-cardhu.dtsi
	arch/powerpc/boot/dts/p1022rdk.dts
	drivers/staging/iio/light/isl29018.c
	drivers/staging/iio/light/isl29028.c
regards
Philipp
Philipp Zabel (6):
of: Change vendor prefix for Intersil Corporation to isil
Documentation: Add isl1208 and isl12022 to trivial-devices list
ARM: mvebu: Change vendor prefix for Intersil Corporation to isil powerpc/85xx: Change vendor prefix for Intersil Corporation to isil
rtc: rtc-isl12022: Change vendor prefix for Intersil Corporation to
isil
rtc: rtc-isl12057: Change vendor prefix for Intersil Corporation to
isil
Quoted 9 lines
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 4 +++-
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts            | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts            | 2 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts            | 2 +-
 arch/powerpc/boot/dts/ppa8548.dts                         | 2 +-
 drivers/rtc/rtc-isl12022.c                                | 3 ++-
 drivers/rtc/rtc-isl12057.c                                | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

Quoted 4 lines

This looks good overall. My only nit is that I'd like to see the legacy name(s) captured in the binding docs.
I'll take the Armada dts changes through mvebu/arm-soc after a few days.

Just to dot our i's and cross our t's, would you mind sending out a non-rfc version of this series?

thx,

Jason.

Philipp Zabel

author

2014-09-08 09:20 UTC #12 lore raw

cover Change vendor prefix for Intersil Corporation

Hi Jason,

Am Sonntag, den 07.09.2014, 09:32 -0400 schrieb Jason Cooper:

Quoted 2 lines

Just to dot our i's and cross our t's, would you mind sending out a non-rfc version of this series?

Thank you for the reminder, I have sent an updated version.

regards
Philipp