From patchwork Fri Nov 14 23:07:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5310131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 81E91C11AC for ; Fri, 14 Nov 2014 23:08:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 866C020125 for ; Fri, 14 Nov 2014 23:08:13 +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 A1FD420123 for ; Fri, 14 Nov 2014 23:08:12 +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 1XpPwg-0006C2-5Z; Fri, 14 Nov 2014 23:06:26 +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 1XpPwa-0005zk-U3 for linux-arm-kernel@lists.infradead.org; Fri, 14 Nov 2014 23:06:21 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id DD3461700508; Sat, 15 Nov 2014 00:05:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416006337; bh=pL+CyHWJYgljLHVXn78dYrGwnw/v2TDwntisCc1IhqI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=HWfdokQIv1144qZsvq7bWvGZ63Wfn4lE6P77tuygsjIQ3lMlGA2ToM3dw+M5baFp2 mUsStmLdffaKTfK230CXK68egUP/JZSnwdbqWio+b7U+bASUpv2/11K+hHwwU9Qjhw WLFAPIXqgOf4fSlEstPliixBKhwA0b26X1d8WJIQ= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, 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 6902D1700477; Sat, 15 Nov 2014 00:03:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416006227; bh=pL+CyHWJYgljLHVXn78dYrGwnw/v2TDwntisCc1IhqI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=L5YK0z/CMUGbq2UXRMAU53svQfSvJ3MP/Mb7qis7Q6Lm4ZZDWlSxCkMV1R+oRi3/v BGJI/urVjmvJNqAvl93xY3FCSZrBZpZiDKvUushoRmx1O9N24Q93CJTJ1n5AuAZJyE vi456yt/pNv9SqVditBRSSX7ug0WjAxFZlifkt5s= X-Hashcash: 1:20:141114:mark.rutland@arm.com::00gimjREKVYNK7Lg:000000000000000000000000000000000000000004iq8 X-Hashcash: 1:20:141114:a.zummo@towertech.it::TNrllocFhHqyCzka:000000000000000000000000000000000000000004J9g X-Hashcash: 1:20:141114:peter.huewe@infineon.com::HicS4wimZqC5UOwQ:00000000000000000000000000000000000001x5k X-Hashcash: 1:20:141114:linus.walleij@linaro.org::LOmHW3cv0mDd2/rU:000000000000000000000000000000000000014Nc X-Hashcash: 1:20:141114:treding@nvidia.com::ujDoOcaJjt6Aal/u:00000000000000000000000000000000000000000001uTr X-Hashcash: 1:20:141114:broonie@kernel.org::jLXUd1Ue/etI+YcX:00000000000000000000000000000000000000000003ikY X-Hashcash: 1:20:141114:rob.herring@calxeda.com::cQExtlWMbm6OLjW+:000000000000000000000000000000000000000Bd5 X-Hashcash: 1:20:141114:pawel.moll@arm.com::ByZAbbEb2ZuSIqTA:00000000000000000000000000000000000000000003u3Z X-Hashcash: 1:20:141114:swarren@wwwdotorg.org::lE9JeE4He1ZL+NmR:00000000000000000000000000000000000000006mvk X-Hashcash: 1:20:141114:ijc+devicetree@hellion.org.uk::vQMHSfWmFVDs0Hnf:00000000000000000000000000000000961D X-Hashcash: 1:20:141114:grant.likely@linaro.org::YaOtlI/zzjbI0jTU:0000000000000000000000000000000000000019r+ X-Hashcash: 1:20:141114:devicetree@vger.kernel.org::Y9ex233jqBNHZhjJ:000000000000000000000000000000000008xzt X-Hashcash: 1:20:141114:linux-doc@vger.kernel.org::7xketi3fuHHdKKSI:00000000000000000000000000000000000062Nv X-Hashcash: 1:20:141114:rob@landley.net::FqEgCJSVNTl9MyM5:00ONey X-Hashcash: 1:20:141114:rtc-linux@googlegroups.com::nd3CAXFdrV8ksENh:000000000000000000000000000000000001nCn X-Hashcash: 1:20:141114:jason@lakedaemon.net::qoXryeJRGxuIkGWy:000000000000000000000000000000000000000001FCp X-Hashcash: 1:20:141114:linux@roeck-us.net::suLKpjjgXMu+K1Qc:00000000000000000000000000000000000000000000u8h X-Hashcash: 1:20:141114:jgunthorpe@obsidianresearch.com::aU7Lo9F6MrQkAaBD:0000000000000000000000000000008gbb X-Hashcash: 1:20:141114:galak@codeaurora.org::WJtJmEJ2zYTbe1hs:0000000000000000000000000000000000000000032BE X-Hashcash: 1:20:141114:linux-arm-kernel@lists.infradead.org::leta8GF9TB3MSb9W:0000000000000000000000000AWzj X-Hashcash: 1:20:141114:uwe@kleine-koenig.org::GY42GKZZEyzihjdV:00000000000000000000000000000000000000002qWV From: Arnaud Ebalard To: Mark Rutland , Alessandro Zummo , Peter Huewe , Linus Walleij , Thierry Reding , Mark Brown Subject: [PATCHv1 4/6] rtc: rtc-isl12057: fix isil vs isl naming for intersil In-Reply-To: References: Message-Id: <3dde5b6adfc9c953e0c943b0b40ccd2177508030.1416006090.git.arno@natisbad.org> Date: Sat, 15 Nov 2014 00:07:05 +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-20141114_150621_455262_43E0BC53 X-CRM114-Status: GOOD ( 13.16 ) X-Spam-Score: 0.3 (/) Cc: devicetree@vger.kernel.org, rtc-linux@googlegroups.com, Pawel Moll , Ian Campbell , Stephen Warren , linux-doc@vger.kernel.org, Rob Herring , Jason Gunthorpe , Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org, Rob Landley , Kumar Gala , Grant Likely , 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 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 --- 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 --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index fbde415078e6..edac97c0f756 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -55,7 +55,7 @@ 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,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 --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 723999d73744..84193ecdc41c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -77,7 +77,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 --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c index fe562820a54a..31eaa6a9c2b2 100644 --- a/drivers/rtc/rtc-isl12057.c +++ b/drivers/rtc/rtc-isl12057.c @@ -310,7 +310,8 @@ static int isl12057_probe(struct i2c_client *client, #ifdef CONFIG_OF static const struct of_device_id isl12057_dt_match[] = { - { .compatible = "isl,isl12057" }, + { .compatible = "isl,isl12057" }, /* obsolete */ + { .compatible = "isil,isl12057" }, { }, }; #endif