devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil
@ 2014-12-16  0:21 Arnaud Ebalard
       [not found] ` <cover.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
                   ` (6 more replies)
  0 siblings, 7 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:21 UTC (permalink / raw)
  To: Andrew Morton, Uwe Kleine-König, Mark Rutland,
	Alessandro Zummo, Peter Huewe, Linus Walleij, Thierry Reding,
	Mark Brown, Arnd Bergmann, Darshana Padmadas, Rob Herring,
	Pawel Moll, Stephen Warren, Ian Campbell, Grant Likely,
	devicetree, linux-doc, Rob Landley, rtc-linux, Jason Cooper,
	Guenter Roeck, Jason Gunthorpe, Kumar Gala

Hi,

As suggested by Jason on a v0, I made a specific series for that work,
which intend to remove all remaining 'isl' prefix for Intersil to only
have 'isil'. More details below.

When Intersil ISL12057 driver was introduced by commit 70e123373c05
("rtc: Add support for Intersil ISL12057 I2C RTC chip"), the vendor
prefix 'isl' was used instead of the expected 'isil' (Intersil
NASDAQ symbol) and documented in vendor-prefixes.txt.

Recently, a patch from Philip Zabel (7a6540ca856a, "ARM: mvebu:
Change vendor prefix for Intersil Corporation to isil") fixed that
prefix in ReadyNAS devices .dts files (AFAICT, the only users of
the driver).

Then, commits 7c75c1d5e72b ("dt-bindings: Document deprecated device
vendor name to fix related warning") and b2ea3f82e798 (dt-bindings:
Document correct and deprecated vendor-prefix with device isl29028)
decided to go the other way and deprecate isil in vendor-prefixes.txt
and in isl29028.c staging driver.

While trying and merge a fix I wrote for ISL12057 drivers to finish
Philip's work, it conflicted with the two recently introduced commits,
and revealed the issue: at the moment, there are various compatible
strings in drivers and .dts files for Intersil products which use
either isl or isil:

$ grep -R "isil," .
./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isil,isl29028           (deprecated, use isl)
./drivers/staging/iio/light/isl29028.c:   { .compatible = "isil,isl29028", },/* deprecated, don't use */
./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29018", },
./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29023", },
./drivers/staging/iio/light/isl29018.c:   { .compatible = "isil,isl29035", },
./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
./arch/powerpc/boot/dts/p1022rdk.dts:        compatible = "isil,zl6100";
./arch/arm/boot/dts/exynos5800-peach-pi.dts: compatible = "isil,isl29018";
./arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi: compatible = "isil,isl1208";
./arch/arm/boot/dts/tegra20-ventana.dts:     compatible = "isil,isl29018";
./arch/arm/boot/dts/tegra20-seaboard.dts:    compatible = "isil,isl29018";
./arch/arm/boot/dts/armada-xp-netgear-rn2120.dts: compatible = "isil,isl12057";
./arch/arm/boot/dts/armada-370-netgear-rn104.dts: compatible = "isil,isl12057";
./arch/arm/boot/dts/exynos5420-peach-pit.dts:     compatible = "isil,isl29018";
./arch/arm/boot/dts/armada-370-netgear-rn102.dts: compatible = "isil,isl12057";

$ grep -R "isl," .
./Documentation/devicetree/bindings/regulator/isl9305.txt:- compatible: "isl,isl9305" or "isl,isl9305h"
./Documentation/devicetree/bindings/regulator/isl9305.txt:              compatible = "isl,isl9305";
./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isl,isl12057      Intersil ISL12057 I2C RTC Chip
./Documentation/devicetree/bindings/i2c/trivial-devices.txt:isl,isl29028      Intersil ISL29028 Ambient Light ....
./drivers/regulator/isl9305.c:          { .compatible = "isl,isl9305" },
./drivers/regulator/isl9305.c:          { .compatible = "isl,isl9305h" },
./drivers/staging/iio/light/isl29028.c: { .compatible = "isl,isl29028", },
./drivers/rtc/rtc-isl12057.c:           { .compatible = "isl,isl12057" },
./drivers/rtc/rtc-isl12022.c:           { .compatible = "isl,isl12022" },
./arch/arm/boot/dts/tegra30-cardhu.dtsi:   compatible = "isl,isl29028";
./arch/arm/boot/dts/zynq-parallella.dts:   compatible = "isl,isl9305";

AFAICT, it seems it makes sense to *definitively* settle for isil as the
vendor prefix for Intersil, as Philip did in 7a6540ca856a: it's the NASDAQ
symbol and this choice requires less changes than opting for isl.

So, this series changes compatible strings in .dts files to use isil where
isl was found before, and modify drivers w/ compatible strings using isl
to add one using isil. In those cases, a comment is made that the old
compatible string is kept for backward compatibility (w/ out-fo-tree users
of those drivers). Additionally, it leaves only isil as prefix in
vendor-prefixes.txt. Those changes should prevent any new inclusion of
isl compatible strings for Intersil devices due to copy-and-paste.

Arnaud Ebalard (7):
  dt-bindings: use isil prefix for Intersil
  rtc: isl12022: deprecate use of isl in compatible string for isil
  rtc: isl12057: deprecate use of isl in compatible string for isil
  staging: iio: isl29028: deprecate use of isl in compatible string for isil
  regulator: isl9305: deprecate use of isl in compatible string for isil
  arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix
  arm: dts: tegra: update isl29028 compatible string to use isil vendor prefix

 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 5 ++---
 Documentation/devicetree/bindings/regulator/isl9305.txt   | 4 ++--
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 3 +--
 arch/arm/boot/dts/tegra30-cardhu.dtsi                     | 2 +-
 arch/arm/boot/dts/zynq-parallella.dts                     | 2 +-
 drivers/regulator/isl9305.c                               | 6 ++++--
 drivers/rtc/rtc-isl12022.c                                | 3 ++-
 drivers/rtc/rtc-isl12057.c                                | 3 ++-
 drivers/staging/iio/light/isl29028.c                      | 4 ++--
 9 files changed, 17 insertions(+), 15 deletions(-)

-- 
2.1.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCHv1 1/7] dt-bindings: use isil prefix for Intersil
       [not found] ` <cover.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
@ 2014-12-16  0:22   ` Arnaud Ebalard
       [not found]     ` <8e8a6eff40822083c0510f6c2787639ee819ef45.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
  0 siblings, 1 reply; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:22 UTC (permalink / raw)
  To: Wolfram Sang, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
	Kumar Gala, Heiko Stuebner, Shawn Guo, Mark Brown, Jason Cooper,
	Florian Vaussard, Andrew Lunn, Hayato Suzuki, Antony Pavlov,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton,
	Uwe Kleine-König


This patch fixes DT documentation to reference isil (NASDAQ symbol and
the most used prefix inside the kernel) for all Intersil products.

It reverts both 7c75c1d5e72b ("dt-bindings: Document deprecated device
vendor name to fix related warning") and b2ea3f82e798 ("dt-bindings:
Document correct and deprecated vendor-prefix with device isl29028").

Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
---
 Documentation/devicetree/bindings/i2c/trivial-devices.txt | 5 ++---
 Documentation/devicetree/bindings/vendor-prefixes.txt     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 9f4e3824e71e..0aaff72065bf 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -58,9 +58,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)
-isl,isl12057		Intersil ISL12057 I2C RTC Chip
-isil,isl29028           (deprecated, use isl)
-isl,isl29028            Intersil ISL29028 Ambient Light and Proximity Sensor
+isil,isl12057		Intersil ISL12057 I2C RTC Chip
+isil,isl29028           Intersil ISL29028 Ambient Light and Proximity Sensor
 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
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index cc6151c431c8..ba574e431c5a 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -79,8 +79,7 @@ innolux	Innolux Corporation
 intel	Intel Corporation
 intercontrol	Inter Control Group
 isee	ISEE 2007 S.L.
-isil    Intersil (deprecated, use isl)
-isl	Intersil
+isil	Intersil
 karo	Ka-Ro electronics GmbH
 keymile	Keymile GmbH
 lacie	LaCie
-- 
2.1.1


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

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 2/7] rtc: isl12022: deprecate use of isl in compatible string for isil
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
       [not found] ` <cover.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
@ 2014-12-16  0:22 ` Arnaud Ebalard
  2014-12-16  0:23 ` [PATCHv1 3/7] rtc: isl12057: " Arnaud Ebalard
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:22 UTC (permalink / raw)
  To: Andrew Morton, Uwe Kleine-König, Alessandro Zummo,
	Mark Rutland


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version). The old compatible string is kept for backward compatibility.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 drivers/rtc/rtc-isl12022.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index ee3ba7e6b45e..f9b082784b90 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -275,7 +275,8 @@ static int isl12022_probe(struct i2c_client *client,
 
 #ifdef CONFIG_OF
 static const struct of_device_id isl12022_dt_match[] = {
-	{ .compatible = "isl,isl12022" },
+	{ .compatible = "isl,isl12022" }, /* for backward compat., don't use */
+	{ .compatible = "isil,isl12022" },
 	{ },
 };
 #endif
-- 
2.1.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 3/7] rtc: isl12057: deprecate use of isl in compatible string for isil
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
       [not found] ` <cover.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
  2014-12-16  0:22 ` [PATCHv1 2/7] rtc: isl12022: deprecate use of isl in compatible string for isil Arnaud Ebalard
@ 2014-12-16  0:23 ` Arnaud Ebalard
  2014-12-16  0:23 ` [PATCHv1 4/7] staging: iio: isl29028: " Arnaud Ebalard
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:23 UTC (permalink / raw)
  To: Andrew Morton, Uwe Kleine-König, Mark Rutland,
	Alessandro Zummo, Peter Huewe, Linus Walleij, Thierry Reding,
	Mark Brown, Arnd Bergmann, Darshana Padmadas, Rob Herring,
	Pawel Moll, Stephen Warren, Ian Campbell, Grant Likely,
	devicetree, linux-doc, Rob Landley, rtc-linux, Jason Cooper,
	Guenter Roeck, Jason Gunthorpe, Kumar Gala


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version). The old compatible string is kept for backward compatibility.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 drivers/rtc/rtc-isl12057.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c
index bd76c5e35fa5..cd6d8cc8c2c9 100644
--- a/drivers/rtc/rtc-isl12057.c
+++ b/drivers/rtc/rtc-isl12057.c
@@ -644,7 +644,8 @@ static SIMPLE_DEV_PM_OPS(isl12057_rtc_pm_ops, isl12057_rtc_suspend,
 
 #ifdef CONFIG_OF
 static const struct of_device_id isl12057_dt_match[] = {
-	{ .compatible = "isl,isl12057" },
+	{ .compatible = "isl,isl12057" }, /* for backward compat., don't use */
+	{ .compatible = "isil,isl12057" },
 	{ },
 };
 #endif
-- 
2.1.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 4/7] staging: iio: isl29028: deprecate use of isl in compatible string for isil
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
                   ` (2 preceding siblings ...)
  2014-12-16  0:23 ` [PATCHv1 3/7] rtc: isl12057: " Arnaud Ebalard
@ 2014-12-16  0:23 ` Arnaud Ebalard
  2014-12-16  0:24 ` [PATCHv1 5/7] regulator: isl9305: " Arnaud Ebalard
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:23 UTC (permalink / raw)
  To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald, Greg Kroah-Hartman, Darshana Padmadas, linux-iio,
	devel, Andrew Morton, Uwe Kleine-König
  Cc: Mark Rutland, Alessandro Zummo, Peter Huewe, Linus Walleij,
	Thierry Reding, Mark Brown, Arnd Bergmann, Rob Herring,
	Pawel Moll, Stephen Warren, Ian Campbell, Grant Likely,
	devicetree, linux-doc, Rob Landley, rtc-linux, Jason Cooper,
	Guenter Roeck, Jason Gunthorpe, Kumar Gala, linux-arm-kernel


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version). The old compatible string is kept for backward compatibility.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 drivers/staging/iio/light/isl29028.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index e969107ddb47..6440e3b293ca 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -537,8 +537,8 @@ static const struct i2c_device_id isl29028_id[] = {
 MODULE_DEVICE_TABLE(i2c, isl29028_id);
 
 static const struct of_device_id isl29028_of_match[] = {
-	{ .compatible = "isl,isl29028", },
-	{ .compatible = "isil,isl29028", },/* deprecated, don't use */
+	{ .compatible = "isl,isl29028", }, /* for backward compat., don't use */
+	{ .compatible = "isil,isl29028", },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, isl29028_of_match);
-- 
2.1.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 5/7] regulator: isl9305: deprecate use of isl in compatible string for isil
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
                   ` (3 preceding siblings ...)
  2014-12-16  0:23 ` [PATCHv1 4/7] staging: iio: isl29028: " Arnaud Ebalard
@ 2014-12-16  0:24 ` Arnaud Ebalard
  2014-12-16  0:24 ` [PATCHv1 6/7] arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Arnaud Ebalard
  2014-12-16  0:24 ` [PATCHv1 7/7] arm: dts: tegra: update isl29028 " Arnaud Ebalard
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:24 UTC (permalink / raw)
  To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Liam Girdwood, Mark Brown, Andrew Morton, Uwe Kleine-König
  Cc: Alessandro Zummo, Peter Huewe, Linus Walleij, Thierry Reding,
	Arnd Bergmann, Darshana Padmadas, Rob Herring, Stephen Warren,
	Grant Likely, devicetree, linux-doc, Rob Landley, rtc-linux,
	Jason Cooper, Guenter Roeck, Jason Gunthorpe, linux-arm-kernel


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version). The old compatible string is kept for backward compatibility.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 Documentation/devicetree/bindings/regulator/isl9305.txt | 4 ++--
 drivers/regulator/isl9305.c                             | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/isl9305.txt b/Documentation/devicetree/bindings/regulator/isl9305.txt
index a626fc1bbf0d..d6e7c9ec9413 100644
--- a/Documentation/devicetree/bindings/regulator/isl9305.txt
+++ b/Documentation/devicetree/bindings/regulator/isl9305.txt
@@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regulator
 
 Required properties:
 
-- compatible: "isl,isl9305" or "isl,isl9305h"
+- compatible: "isil,isl9305" or "isil,isl9305h"
 - reg: I2C slave address, usually 0x68.
 - regulators: A node that houses a sub-node for each regulator within the
   device. Each sub-node is identified using the node's name, with valid
@@ -19,7 +19,7 @@ Optional properties:
 Example
 
 	pmic: isl9305@68 {
-		compatible = "isl,isl9305";
+		compatible = "isil,isl9305";
 		reg = <0x68>;
 
 		VINDCD1-supply = <&system_power>;
diff --git a/drivers/regulator/isl9305.c b/drivers/regulator/isl9305.c
index 92fefd98da58..6e3a15fe00f1 100644
--- a/drivers/regulator/isl9305.c
+++ b/drivers/regulator/isl9305.c
@@ -177,8 +177,10 @@ static int isl9305_i2c_probe(struct i2c_client *i2c,
 
 #ifdef CONFIG_OF
 static const struct of_device_id isl9305_dt_ids[] = {
-	{ .compatible = "isl,isl9305" },
-	{ .compatible = "isl,isl9305h" },
+	{ .compatible = "isl,isl9305" }, /* for backward compat., don't use */
+	{ .compatible = "isil,isl9305" },
+	{ .compatible = "isl,isl9305h" }, /* for backward compat., don't use */
+	{ .compatible = "isil,isl9305h" },
 	{},
 };
 #endif
-- 
2.1.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 6/7] arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
                   ` (4 preceding siblings ...)
  2014-12-16  0:24 ` [PATCHv1 5/7] regulator: isl9305: " Arnaud Ebalard
@ 2014-12-16  0:24 ` Arnaud Ebalard
  2014-12-16  0:24 ` [PATCHv1 7/7] arm: dts: tegra: update isl29028 " Arnaud Ebalard
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:24 UTC (permalink / raw)
  To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Russell King, Michal Simek, Sören Brinkmann, devicetree,
	linux-arm-kernel, Andrew Morton, Uwe Kleine-König
  Cc: Alessandro Zummo, Peter Huewe, Linus Walleij, Thierry Reding,
	Mark Brown, Arnd Bergmann, Darshana Padmadas, Stephen Warren,
	Grant Likely, linux-doc, Rob Landley, rtc-linux, Jason Cooper,
	Guenter Roeck, Jason Gunthorpe


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version).

Note: isl9305 is an I2C device so the patch does not in fact currently
depend on the introduction of "isil"-based compatible string in isl9305
driver (provided by another patch) because I2C core does not check the
prefix yet.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 arch/arm/boot/dts/zynq-parallella.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index ab1dc0a56cdd..174571232ea5 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -58,7 +58,7 @@
 	status = "okay";
 
 	isl9305: isl9305@68 {
-		compatible = "isl,isl9305";
+		compatible = "isil,isl9305";
 		reg = <0x68>;
 
 		regulators {
-- 
2.1.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCHv1 7/7] arm: dts: tegra: update isl29028 compatible string to use isil vendor prefix
  2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
                   ` (5 preceding siblings ...)
  2014-12-16  0:24 ` [PATCHv1 6/7] arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Arnaud Ebalard
@ 2014-12-16  0:24 ` Arnaud Ebalard
  6 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16  0:24 UTC (permalink / raw)
  To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Russell King, Stephen Warren, Thierry Reding, Alexandre Courbot,
	devicetree, linux-arm-kernel, linux-tegra, Andrew Morton,
	Uwe Kleine-König
  Cc: Alessandro Zummo, Peter Huewe, Linus Walleij, Mark Brown,
	Arnd Bergmann, Darshana Padmadas, Grant Likely, linux-doc,
	Rob Landley, rtc-linux, Jason Cooper, Guenter Roeck,
	Jason Gunthorpe


"isil" and "isl" prefixes are used at various locations inside the kernel
to reference Intersil corporation. This patch is part of a series fixing
those locations were "isl" is used in compatible strings to use the now
expected "isil" prefix instead (NASDAQ symbol for Intersil and most used
version).

Note: isl29028 is an I2C device so the patch does not in fact currently
depend on the introduction of "isil"-based compatible string in isl29028
driver because I2C core does not check the prefix yet.

Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
 arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index cbf5a1ae0ca7..a1b682ea01bd 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -189,7 +189,7 @@
 
 		/* ALS and Proximity sensor */
 		isl29028@44 {
-			compatible = "isl,isl29028";
+			compatible = "isil,isl29028";
 			reg = <0x44>;
 			interrupt-parent = <&gpio>;
 			interrupts = <TEGRA_GPIO(L, 0) IRQ_TYPE_LEVEL_HIGH>;
-- 
2.1.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCHv1 1/7] dt-bindings: use isil prefix for Intersil
       [not found]     ` <8e8a6eff40822083c0510f6c2787639ee819ef45.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
@ 2014-12-16  8:19       ` Uwe Kleine-König
       [not found]         ` <20141216081913.GC13486-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
  0 siblings, 1 reply; 10+ messages in thread
From: Uwe Kleine-König @ 2014-12-16  8:19 UTC (permalink / raw)
  To: Arnaud Ebalard
  Cc: Wolfram Sang, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
	Kumar Gala, Heiko Stuebner, Shawn Guo, Mark Brown, Jason Cooper,
	Florian Vaussard, Andrew Lunn, Hayato Suzuki, Antony Pavlov,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton,
	Uwe Kleine-König

Hello Arnaud,

On Tue, Dec 16, 2014 at 01:22:27AM +0100, Arnaud Ebalard wrote:
> This patch fixes DT documentation to reference isil (NASDAQ symbol and
> the most used prefix inside the kernel) for all Intersil products.
> 
> It reverts both 7c75c1d5e72b ("dt-bindings: Document deprecated device
> vendor name to fix related warning") and b2ea3f82e798 ("dt-bindings:
> Document correct and deprecated vendor-prefix with device isl29028").
Unrelated to this patch I wonder if checkpatch could be improved to not
warn about unknown vendor prefixes in compatibility strings that only
exist for compatibility. This assumes that it's not necessary to also
document deprecated vendor prefixes, not sure about this one. Thoughts?

> Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/i2c/trivial-devices.txt | 5 ++---
>  Documentation/devicetree/bindings/vendor-prefixes.txt     | 3 +--
I guess it's OK to keep the two changes in one patch, but formally they
are maintained by different people. Should this patch be split?

>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
> index 9f4e3824e71e..0aaff72065bf 100644
> --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
> +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
> @@ -58,9 +58,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)
> -isl,isl12057		Intersil ISL12057 I2C RTC Chip
> -isil,isl29028           (deprecated, use isl)
> -isl,isl29028            Intersil ISL29028 Ambient Light and Proximity Sensor
> +isil,isl12057		Intersil ISL12057 I2C RTC Chip
> +isil,isl29028           Intersil ISL29028 Ambient Light and Proximity Sensor
Here is some tab vs space issue. The surrounding lines (in the context)
all use tab.

>  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

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCHv1 1/7] dt-bindings: use isil prefix for Intersil
       [not found]         ` <20141216081913.GC13486-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
@ 2014-12-16 18:44           ` Arnaud Ebalard
  0 siblings, 0 replies; 10+ messages in thread
From: Arnaud Ebalard @ 2014-12-16 18:44 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: Wolfram Sang, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
	Kumar Gala, Heiko Stuebner, Shawn Guo, Mark Brown, Jason Cooper,
	Florian Vaussard, Andrew Lunn, Hayato Suzuki, Antony Pavlov,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton,
	Uwe Kleine-König

Hello Uwe,

Uwe Kleine-König <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> writes:

> On Tue, Dec 16, 2014 at 01:22:27AM +0100, Arnaud Ebalard wrote:
>> This patch fixes DT documentation to reference isil (NASDAQ symbol and
>> the most used prefix inside the kernel) for all Intersil products.
>> 
>> It reverts both 7c75c1d5e72b ("dt-bindings: Document deprecated device
>> vendor name to fix related warning") and b2ea3f82e798 ("dt-bindings:
>> Document correct and deprecated vendor-prefix with device isl29028").
> Unrelated to this patch I wonder if checkpatch could be improved to not
> warn about unknown vendor prefixes in compatibility strings that only
> exist for compatibility. This assumes that it's not necessary to also
> document deprecated vendor prefixes, not sure about this
> one. Thoughts?

AFAICT, we want checkpatch to detect mistakes in patches which are about
to be merged. I think checkpatch will work as expected for those new
patches, i.e. warn someone if she tries and use an unknown vendor prefix
or a deprecated one ... as long as deprecated prefixes are not in
vendor-prefixes.txt. IMHO, that's the reason it is a bad idea to put
deprecated prefixes in vendor-prefixes.txt, it make checkpatch silent
about the use of a deprecated prefix.

For existing files, I think checkpatch can be useful in order to do the
work I did in this series (for Intersil) for unknown vendors. A quick
run gives a value of 237 vendors prefix issues on the 527 arm .dts
files ;-)


>> Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
>> ---
>>  Documentation/devicetree/bindings/i2c/trivial-devices.txt | 5 ++---
>>  Documentation/devicetree/bindings/vendor-prefixes.txt     | 3 +--
> I guess it's OK to keep the two changes in one patch, but formally they
> are maintained by different people. Should this patch be split?

I'll send a new batch for the space issue you point below. I will take
take the opportunity to split those.


>>  2 files changed, 3 insertions(+), 5 deletions(-)
>> 
>> diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
>> index 9f4e3824e71e..0aaff72065bf 100644
>> --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
>> +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
>> @@ -58,9 +58,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)
>> -isl,isl12057		Intersil ISL12057 I2C RTC Chip
>> -isil,isl29028           (deprecated, use isl)
>> -isl,isl29028            Intersil ISL29028 Ambient Light and Proximity Sensor
>> +isil,isl12057		Intersil ISL12057 I2C RTC Chip
>> +isil,isl29028           Intersil ISL29028 Ambient Light and Proximity Sensor
> Here is some tab vs space issue. The surrounding lines (in the context)
> all use tab.

will tabify those.


>>  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
>
> Best regards
> Uwe

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2014-12-16 18:44 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-16  0:21 [PATCHv1 0/7] from now on, use 'isil' as prefix for Intersil Arnaud Ebalard
     [not found] ` <cover.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
2014-12-16  0:22   ` [PATCHv1 1/7] dt-bindings: use isil " Arnaud Ebalard
     [not found]     ` <8e8a6eff40822083c0510f6c2787639ee819ef45.1418688042.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
2014-12-16  8:19       ` Uwe Kleine-König
     [not found]         ` <20141216081913.GC13486-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-12-16 18:44           ` Arnaud Ebalard
2014-12-16  0:22 ` [PATCHv1 2/7] rtc: isl12022: deprecate use of isl in compatible string for isil Arnaud Ebalard
2014-12-16  0:23 ` [PATCHv1 3/7] rtc: isl12057: " Arnaud Ebalard
2014-12-16  0:23 ` [PATCHv1 4/7] staging: iio: isl29028: " Arnaud Ebalard
2014-12-16  0:24 ` [PATCHv1 5/7] regulator: isl9305: " Arnaud Ebalard
2014-12-16  0:24 ` [PATCHv1 6/7] arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Arnaud Ebalard
2014-12-16  0:24 ` [PATCHv1 7/7] arm: dts: tegra: update isl29028 " Arnaud Ebalard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).