The patch titled Subject: regulator: isl9305: deprecate use of isl in compatible string for isil has been added to the -mm tree. Its filename is regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil.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: regulator: isl9305: deprecate use of isl in compatible string for isil "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@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/regulator/isl9305.txt | 4 ++-- drivers/regulator/isl9305.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff -puN Documentation/devicetree/bindings/regulator/isl9305.txt~regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil Documentation/devicetree/bindings/regulator/isl9305.txt --- a/Documentation/devicetree/bindings/regulator/isl9305.txt~regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil +++ a/Documentation/devicetree/bindings/regulator/isl9305.txt @@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regula 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 -puN drivers/regulator/isl9305.c~regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil drivers/regulator/isl9305.c --- a/drivers/regulator/isl9305.c~regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil +++ a/drivers/regulator/isl9305.c @@ -177,8 +177,10 @@ static int isl9305_i2c_probe(struct 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 _ Patches currently in -mm which might be from arno@xxxxxxxxxxxx are origin.patch 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 dt-bindings-use-isil-prefix-for-intersil.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 regulator-isl9305-deprecate-use-of-isl-in-compatible-string-for-isil.patch arm-dts-zynq-update-isl9305-compatible-string-to-use-isil-vendor-prefix.patch arm-dts-tegra-update-isl29028-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