From patchwork Sun Dec 14 01:43:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5487091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D40439F30B for ; Sun, 14 Dec 2014 01:46:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DA7120A07 for ; Sun, 14 Dec 2014 01:46:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F2CD20A06 for ; Sun, 14 Dec 2014 01:46:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XzyEj-00009n-4V; Sun, 14 Dec 2014 01:44:41 +0000 Received: from 36.223.133.77.rev.sfr.net ([77.133.223.36] helo=smtp.natisbad.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XzyEd-0008Kf-5m for linux-arm-kernel@lists.infradead.org; Sun, 14 Dec 2014 01:44:36 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 8DDF31700D55; Sun, 14 Dec 2014 02:43:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1418521430; bh=A22AUkyfNqN9JK76MKKOcPoA2AOXzSs6uSLkoVk+lr8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=MYjOk92ZL+9FFNgjiUN+aOj4Cvm002kxsaZ6Tp9IG/yz0xB4aM7sEcXsY7YJmJYct gVECJmaZBd7AZi3gGWZmeabfapV981+LOYJiRe7v01jlnrQFJJeHC4I3Y9cOjNPqf/ 6FXgZIQeagqIyRM8y5TfWZ/9iWHCfwW/P0LuyQnU= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id AB54717003F0; Sun, 14 Dec 2014 02:39:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1418521177; bh=A22AUkyfNqN9JK76MKKOcPoA2AOXzSs6uSLkoVk+lr8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Em5vTmT0PRZ+Q0IHdNsjAKExBPTQsrTmLCdwxI0T8QgodEdDNPwHu6Z1cWHvonOXj umzGF1WOIzc1U28jqOzkzMNdKv37gOfInRqiupb1R78mz3mCDLgsGakE9NQd0AiSmm 6yior0nFwUVixp3hDuzpqu7whQrcJpJkMPzlvU98= X-Hashcash: 1:20:141214:akpm@linux-foundation.org::3JEcpYTuBkb3v+xE:0000000000000000000000000000000000003ZWB X-Hashcash: 1:20:141214:uwe@kleine-koenig.org::Bo1iML8tw4CS4ycP:00000000000000000000000000000000000000005Cqy X-Hashcash: 1:20:141214:mark.rutland@arm.com::Iab7RWRCcY58BfKe:000000000000000000000000000000000000000000Knd X-Hashcash: 1:20:141214:a.zummo@towertech.it::RQGdBIB8Ba4vJRIU:000000000000000000000000000000000000000003YQz X-Hashcash: 1:20:141214:peter.huewe@infineon.com::y4PJkdxOjRGOG5oE:00000000000000000000000000000000000001k2z X-Hashcash: 1:20:141214:linus.walleij@linaro.org::754AlEop0aPFpDWu:00000000000000000000000000000000000000jgc X-Hashcash: 1:20:141214:treding@nvidia.com::qKKItZui9QTHxyfB:000000000000000000000000000000000000000000013V9 X-Hashcash: 1:20:141214:broonie@kernel.org::1aug8z04T4HSKEQy:000000000000000000000000000000000000000000015IT X-Hashcash: 1:20:141214:arnd@arndb.de::Qfv+URBkD+Y3v8OP:00005R3p X-Hashcash: 1:20:141214:darshanapadmadas@gmail.com::EvF1SmEJGV5vx1Ck:000000000000000000000000000000000009YZ1 X-Hashcash: 1:20:141214:rob.herring@calxeda.com::V5pt6yaMxyvC6P51:000000000000000000000000000000000000001D15 X-Hashcash: 1:20:141214:pawel.moll@arm.com::l10wy5bipH3Lojty:000000000000000000000000000000000000000000010GU X-Hashcash: 1:20:141214:swarren@wwwdotorg.org::jTE/6ajCjDvd1HBz:00000000000000000000000000000000000000000e4+ X-Hashcash: 1:20:141214:ijc+devicetree@hellion.org.uk::ogown/WyiOGjNTMh:000000000000000000000000000000004al8 X-Hashcash: 1:20:141214:grant.likely@linaro.org::r7HbxZIeokaxWS7I:0000000000000000000000000000000000000054p1 X-Hashcash: 1:20:141214:devicetree@vger.kernel.org::AKpwVMWrdT3UWWUr:000000000000000000000000000000000000oE9 X-Hashcash: 1:20:141214:linux-doc@vger.kernel.org::R8vVg3fn/gxb2ZS2:000000000000000000000000000000000000FE56 X-Hashcash: 1:20:141214:rob@landley.net::n9o9dR8gAwsJm2YX:00BDW3 X-Hashcash: 1:20:141214:rtc-linux@googlegroups.com::oMOLlpCCu7GNn3Io:000000000000000000000000000000000000vdw X-Hashcash: 1:20:141214:jason@lakedaemon.net::XVhyqRWmxACknIGY:000000000000000000000000000000000000000005aiX X-Hashcash: 1:20:141214:linux@roeck-us.net::MKagfJiPc18DQSqg:00000000000000000000000000000000000000000004i8S X-Hashcash: 1:20:141214:jgunthorpe@obsidianresearch.com::Od9WaU7d8xIknDZq:0000000000000000000000000000001YRa X-Hashcash: 1:20:141214:galak@codeaurora.org::NT8GbRC9tvtLIdaY:000000000000000000000000000000000000000000HYj X-Hashcash: 1:20:141214:linux-arm-kernel@lists.infradead.org::5LWf3CXm8Qs3u2UO:0000000000000000000000000467k From: Arnaud Ebalard To: Andrew Morton , Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= Subject: [PATCHv0 5/5] dt-bindings: fix isl vs isil prefix issue for Intersil In-Reply-To: References: Message-Id: Date: Sun, 14 Dec 2014 02:43:15 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141213_174435_524233_86F8E91C X-CRM114-Status: GOOD ( 16.14 ) X-Spam-Score: 0.3 (/) Cc: Mark Rutland , linux-doc@vger.kernel.org, Linus Walleij , Arnd Bergmann , Ian Campbell , Jason Gunthorpe , rtc-linux@googlegroups.com, Thierry Reding , Guenter Roeck , devicetree@vger.kernel.org, Jason Cooper , Pawel Moll , Stephen Warren , Rob Herring , Grant Likely , Mark Brown , Peter Huewe , Darshana Padmadas , linux-arm-kernel@lists.infradead.org, Alessandro Zummo , Rob Landley , Kumar Gala X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 patch 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. Signed-off-by: Arnaud Ebalard --- 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(-) diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index 605dcca5dbec..213855bb419b 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -55,9 +55,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/Alarm 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/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/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 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 = ; 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 { 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 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 diff --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c index 98adc2c1bdb0..949121ed0255 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 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);