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: 421734 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 60DC21400D2 for ; Tue, 16 Dec 2014 11:22:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751416AbaLPAWL (ORCPT ); Mon, 15 Dec 2014 19:22:11 -0500 Received: from 36.223.133.77.rev.sfr.net ([77.133.223.36]:55113 "EHLO smtp.natisbad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbaLPAWK (ORCPT ); Mon, 15 Dec 2014 19:22:10 -0500 Received: by smtp.natisbad.org (Postfix, from userid 109) id E73081700DF9; Tue, 16 Dec 2014 01:22:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1418689327; bh=n6yopyB43hValLTT5YFXfhtm7INnreBLYIPKvs7rcQk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=2T/GY1rkHtyKDDAUDGXp+E/COd26Iy8ne31toSAjJ1svcb7aJhrKeUoziXEf83I1S CaHAnwnTroxvA2BMp9isWs6+P7PCjHrwKd3pob5QC0KlvZwO2+SEj2Ui/NF9Y1kGzy FOOERl8wZ1mPOOgGSiRLeCmesTj7vZawQ69tiNL0= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on humble X-Spam-Level: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,BAYES_00, T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 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?= Cc: Alessandro Zummo , Peter Huewe , Linus Walleij , Thierry Reding , Arnd Bergmann , Darshana Padmadas , Rob Herring , Stephen Warren , Grant Likely , devicetree@vger.kernel.org, linux-doc@vger.kernel.org, Rob Landley , rtc-linux@googlegroups.com, Jason Cooper , Guenter Roeck , Jason Gunthorpe , linux-arm-kernel@lists.infradead.org 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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org "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