The patch titled
Subject: drivers/rtc/rtc-isl12057.c: fix isil vs isl naming for intersil
has been added to the -mm tree. Its filename is
rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil.patch
echo and later at
echo http://ozlabs.org/~akpm/mmotm/broken-out/rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Subject: drivers/rtc/rtc-isl12057.c: fix isil vs isl naming 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).
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).
That patch completes that work to change the remaining values in:
- Intersil ISL12057 driver (compatible string) and also associated
Documentation/devicetree/bindings/i2c/trivial-devices.txt file
to reflect the changes introduced by previous commit from Philip
- Documentation/devicetree/bindings/vendor-prefixes.txt files to
avoid future mistakes
Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Peter Huewe <peter.huewe@xxxxxxxxxxxx>
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Thierry Reding <treding@xxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxx>
Cc: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/trivial-devices.txt | 2 +-
Documentation/devicetree/bindings/vendor-prefixes.txt | 2 +-
drivers/rtc/rtc-isl12057.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff -puN Documentation/devicetree/bindings/i2c/trivial-devices.txt~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil
+++ a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -55,7 +55,7 @@ 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,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
diff -puN Documentation/devicetree/bindings/vendor-prefixes.txt~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil Documentation/devicetree/bindings/vendor-prefixes.txt
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil
+++ a/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -78,7 +78,7 @@ innolux Innolux Corporation
intel Intel Corporation
intercontrol Inter Control Group
isee ISEE 2007 S.L.
-isl Intersil
+isil Intersil
karo Ka-Ro electronics GmbH
keymile Keymile GmbH
lacie LaCie
diff -puN drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil drivers/rtc/rtc-isl12057.c
--- a/drivers/rtc/rtc-isl12057.c~rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil
+++ a/drivers/rtc/rtc-isl12057.c
@@ -310,7 +310,8 @@ static int isl12057_probe(struct i2c_cli
#ifdef CONFIG_OF
static const struct of_device_id isl12057_dt_match[] = {
- { .compatible = "isl,isl12057" },
+ { .compatible = "isl,isl12057" }, /* obsolete */
+ { .compatible = "isil,isl12057" },
{ },
};
#endif
_
Patches currently in -mm which might be from arno@xxxxxxxxxxxx are
rtc-rtc-isl12057-fix-masking-of-register-values.patch
rtc-rtc-isl12057-add-support-for-century-bit.patch
rtc-rtc-isl12057-add-proper-handling-of-oscillator-failure-bit.patch
rtc-rtc-isl12057-fix-isil-vs-isl-naming-for-intersil.patch
rtc-rtc-isl12057-report-error-code-upon-failure-in-dev_err-calls.patch
rtc-rtc-isl12057-add-alarm-support-to-intersil-isl12057-rtc-driver.patch
linux-next.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
