From patchwork Mon Sep 8 09:19:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 4860721 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 7DD1EC0338 for ; Mon, 8 Sep 2014 09:22:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C1462012D for ; Mon, 8 Sep 2014 09:22:40 +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 D94D7200EC for ; Mon, 8 Sep 2014 09:22:38 +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 1XQv7a-0000NC-2t; Mon, 08 Sep 2014 09:20:26 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XQv7K-0007be-1G for linux-arm-kernel@lists.infradead.org; Mon, 08 Sep 2014 09:20:11 +0000 Received: from paszta.hi.4.pengutronix.de ([10.1.0.120] helo=paszta.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XQv6g-00010G-Gh; Mon, 08 Sep 2014 11:19:30 +0200 From: Philipp Zabel To: devicetree@vger.kernel.org Subject: [PATCH v2 1/5] of: Change vendor prefix for Intersil Corporation to isil Date: Mon, 8 Sep 2014 11:19:16 +0200 Message-Id: <1410167960-554-2-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1410167960-554-1-git-send-email-p.zabel@pengutronix.de> References: <1410167960-554-1-git-send-email-p.zabel@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 10.1.0.120 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140908_022010_312861_FA098EF2 X-CRM114-Status: GOOD ( 12.55 ) X-Spam-Score: -1.7 (-) Cc: Mark Rutland , Alessandro Zummo , Russell King , Pawel Moll , Ian Campbell , Benjamin Herrenschmidt , Mark Brown , Wolfram Sang , Rob Herring , Paul Mackerras , Michael Ellerman , Philipp Zabel , Kumar Gala , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently there is a wild mixture of isl, isil, and intersil compatibles in the kernel. At this point, changing the vendor symbol to the most often used variant, which is equal to the NASDAQ symbol, isil, should not hurt. This patch marks both intersil and isl prefix as deprecated and documents the isil prefix in the vendor prefix list. Signed-off-by: Philipp Zabel --- Changes since v1: - Added deprecated entries that are still in use --- Documentation/devicetree/bindings/i2c/trivial-devices.txt | 3 ++- Documentation/devicetree/bindings/vendor-prefixes.txt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt index 6af570e..72e399c 100644 --- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -56,7 +56,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,isl12057 Intersil ISL12057 I2C RTC Chip +isl,isl12057 Intersil ISL12057 I2C RTC Chip (deprecated, use isil,isl12057) 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 ac7269f..4941ac2 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -68,7 +68,9 @@ img Imagination Technologies Ltd. intel Intel Corporation intercontrol Inter Control Group isee ISEE 2007 S.L. -isl Intersil +intersil Intersil Corporation (deprecated, use isil) +isil Intersil Corporation +isl Intersil Corporation (deprecated, use isil) karo Ka-Ro electronics GmbH keymile Keymile GmbH lacie LaCie