From patchwork Tue Dec 16 00:24:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5498691 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 876F49F326 for ; Tue, 16 Dec 2014 00:26:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B287A20A14 for ; Tue, 16 Dec 2014 00:26:15 +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 E2ABA20A01 for ; Tue, 16 Dec 2014 00:26:14 +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 1Y0fvD-0002Yt-Pt; Tue, 16 Dec 2014 00:23:27 +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 1Y0fuV-0001w4-BT for linux-arm-kernel@lists.infradead.org; Tue, 16 Dec 2014 00:22:44 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 75D501700698; Tue, 16 Dec 2014 01:21:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1418689318; bh=n6yopyB43hValLTT5YFXfhtm7INnreBLYIPKvs7rcQk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=fuBknmCDG4Zg+B1+CB2V5vCMUH/uozh3+jrdqdyNhYLXB/pIx2u3ncqYZqtqhh2SN exuNPIdEgIGN7DA7dmfz+yBWwy4yBW2IvCSjAOhTE1ZjgkEHQmzlvoZFcAd3cFodLb dRqIVjMPiM3YE8F7FgrkK+dCTv6qPAejjd4cw4bk= 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=unavailable version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id 91C6D17004FE; Tue, 16 Dec 2014 01:20:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1418689212; bh=n6yopyB43hValLTT5YFXfhtm7INnreBLYIPKvs7rcQk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=1TsJIYpRpyuBWEcYcF1vLSCIkPZjq/pmxyjrv5G5iRMgkUokY37bAoPoLrloDmgYl wRA7CcAxcJf5qpEVXFZ6MkBXG7ctKxqOkM3PB3+Ee07fhfvHQhjgpkeOEgxvAAm5QT lNJzgErk2uepedI2yACQHkEh7HJRGSkxuyX7kF1w= X-Hashcash: 1:20:141216:robh@kernel.org::wLozfcgKLrPCINmx:001/Em X-Hashcash: 1:20:141216:a.zummo@towertech.it::6d4684kWG6lNRksG:0000000000000000000000000000000000000000006/L X-Hashcash: 1:20:141216:peter.huewe@infineon.com::PJ4YJqFhsz8Dstxy:000000000000000000000000000000000000075bo X-Hashcash: 1:20:141216:linus.walleij@linaro.org::edP7fRjXvK3Vhh0x:000000000000000000000000000000000000038sE X-Hashcash: 1:20:141216:treding@nvidia.com::u2/fsEylRuPd+g47:00000000000000000000000000000000000000000000gSU X-Hashcash: 1:20:141216:arnd@arndb.de::WkjdS9msQitDWYsI:00005Iyi X-Hashcash: 1:20:141216:darshanapadmadas@gmail.com::DIxcadAMIpuUmtxk:000000000000000000000000000000000000+Iq X-Hashcash: 1:20:141216:rob.herring@calxeda.com::ylP3pW8quk9ud/gU:00000000000000000000000000000000000000DXkn X-Hashcash: 1:20:141216:swarren@wwwdotorg.org::Y1f+La4mMHUfepp4:000000000000000000000000000000000000000045C7 X-Hashcash: 1:20:141216:grant.likely@linaro.org::F24/8u9mOwuhVxe6:000000000000000000000000000000000000000pPO X-Hashcash: 1:20:141216:devicetree@vger.kernel.org::K/vCo1kIFhlZGDY2:000000000000000000000000000000000002eKC X-Hashcash: 1:20:141216:linux-doc@vger.kernel.org::Nd4U8jlrtgAvoxD6:0000000000000000000000000000000000001TAd X-Hashcash: 1:20:141216:rob@landley.net::5GRSDoQ2l1a6WRyB:000HA3 X-Hashcash: 1:20:141216:rtc-linux@googlegroups.com::zkB84mhJ7oMTXepV:000000000000000000000000000000000004jXs X-Hashcash: 1:20:141216:jason@lakedaemon.net::57kUp/K1YuDBKdWP:000000000000000000000000000000000000000008I0e X-Hashcash: 1:20:141216:linux@roeck-us.net::wFsy/OWtzxU8Yh0q:00000000000000000000000000000000000000000002NJa X-Hashcash: 1:20:141216:jgunthorpe@obsidianresearch.com::IOi0uFzAYb8KklVz:0000000000000000000000000000000ObG X-Hashcash: 1:20:141216:linux-arm-kernel@lists.infradead.org::8aN74WOxgvLCa5Ma:00000000000000000000000000gPk From: Arnaud Ebalard To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Liam Girdwood , Mark Brown , Andrew Morton , Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= Subject: [PATCHv1 5/7] regulator: isl9305: deprecate use of isl in compatible string for isil In-Reply-To: References: Message-Id: <910bc2f86cac0eb42e3df671c28da74542f8ba61.1418688043.git.arno@natisbad.org> Date: Tue, 16 Dec 2014 01:24:01 +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-20141215_162243_787619_30F98AFD X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: 0.3 (/) Cc: Alessandro Zummo , rtc-linux@googlegroups.com, Arnd Bergmann , Stephen Warren , Linus Walleij , linux-doc@vger.kernel.org, Rob Herring , Jason Gunthorpe , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rob Landley , Grant Likely , Peter Huewe , Thierry Reding , Darshana Padmadas , Guenter Roeck , Jason Cooper 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 "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 --- 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