The patch titled
Subject: dt-bindings: use isil prefix for Intersil
has been removed from the -mm tree. Its filename was
dt-bindings-use-isil-prefix-for-intersil.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Subject: dt-bindings: use isil prefix for Intersil
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.
This patch (of 7):
Fix DT documentation to reference isil (NASDAQ symbol and the most used
prefix inside the kernel) for all Intersil products.
It reverts b2ea3f82e798 ("dt-bindings: Document correct and deprecated
vendor-prefix with device isl29028").
Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Cc: Rob Herring <robh+dt@xxxxxxxxxx>
Cc: Pawel Moll <pawel.moll@xxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
Cc: Kumar Gala <galak@xxxxxxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
Cc: Uwe Kleine-Knig <uwe@xxxxxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Peter Huewe <peter.huewe@xxxxxxxxxxxx>
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Darshana Padmadas <darshanapadmadas@xxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxx>
Cc: Rob Landley <rob@xxxxxxxxxxx>
Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
Cc: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/trivial-devices.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN Documentation/devicetree/bindings/i2c/trivial-devices.txt~dt-bindings-use-isil-prefix-for-intersil Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt~dt-bindings-use-isil-prefix-for-intersil
+++ a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -59,9 +59,8 @@ fsl,sgtl5000 SGTL5000: Ultra Low-Power
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
_
Patches currently in -mm which might be from arno@xxxxxxxxxxxx are
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver.patch
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver-update.patch
rtc-rtc-isl12057-add-isilirq2-can-wakeup-machine-property-for-in-tree-users.patch
arm-mvebu-isl12057-rtc-chip-can-now-wake-up-rn102-rn102-and-rn2120.patch
of-add-vendor-prefix-for-abracon-corporation.patch
rtc-add-support-for-abracon-ab-rtcmc-32768khz-b5ze-s3-i2c-rtc-chip.patch
rtc-add-support-for-abracon-ab-rtcmc-32768khz-b5ze-s3-i2c-rtc-chip-v2.patch
rtc-rtc-ab-b5ze-s3-add-sub-minute-alarm-support.patch
linux-next.patch
rtc-isl12022-deprecate-use-of-isl-in-compatible-string-for-isil.patch
rtc-isl12057-deprecate-use-of-isl-in-compatible-string-for-isil.patch
staging-iio-isl29028-deprecate-use-of-isl-in-compatible-string-for-isil.patch
arm-dts-zynq-update-isl9305-compatible-string-to-use-isil-vendor-prefix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
