From patchwork Tue May 23 13:34:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 9742649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C803360380 for ; Tue, 23 May 2017 13:37:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B794A27852 for ; Tue, 23 May 2017 13:37:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC57C2811A; Tue, 23 May 2017 13:37:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 063B22785D for ; Tue, 23 May 2017 13:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=yrFnYg/FiyKo5jHpaeMho60w2SVI4S07HsxKsJkkfVc=; b=DuRVI2OkUP8ixCIq8ouwy1keUH 3jOTwG4KH4wR2vaXlJ+B2Ylyo5N4u8L3TkgrMkMZqrsYTF/oaJwBBQDZzamdEcQYu7Jz2hpJl5Z+l u811Sdm6uGPvM+/zVuIJwkEBwyCHN/IdsQtS2mr3cEuspnULxAg8OS/Ma+s7b8eqVHxWL2byo4w5g 8JIEmBz+xZKN5XNb/LyEPT0nk9yZ3lyL6uWD4PzThe2D+TH1CzDZoil0DZxSOlZc+NMepGoRK4NvP bs2o68Z2c5ob7/0vnyRHIEypcHpYzZjYd9gqc7wJVp5Gm8CbymORhBEa6O9qWugQkVUT+dqgDvuat G9n2iPMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDA0P-0003Ra-Ba; Tue, 23 May 2017 13:37:45 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dD9yN-0000TC-Hl for linux-arm-kernel@lists.infradead.org; Tue, 23 May 2017 13:35:41 +0000 Received: by mail-wm0-x242.google.com with SMTP id g15so19847052wmc.2 for ; Tue, 23 May 2017 06:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dowhile0-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KMqxHIGJ3mAiTFHgQYw7pyyexE4fLOr4pV/MJApswp4=; b=DvqzM1I0dfiY4a3bWcPYq1c0bRS+/irkpmv/s4R7dayu+Nl2z72W/djimPb8WuvD16 LGmSxf1w8bBi+JBggckHwLJ9iABxC4m8e2oY3QN3zfXxeYDDibK0l8YCY10/Kf9QFuN2 5VU6d01X4AcTUale+9nVwcSlLFxj7qcbOP8FIf7CR1DTllHPUYQGPuYJ8hjM3SHOvAkg /z/7Z057m0z2LZAp7Fd6+U0gMzaaxDAxstUQoMdwALkzuAyeAzVz6Nllho5sLqodhVIL pIQMcqtNYMHiVMzXhDlVHN1QsmxLofX3AGvB5PQtsXwdMpOyXGB0I3iC/NQvcmN9eqcp OIyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KMqxHIGJ3mAiTFHgQYw7pyyexE4fLOr4pV/MJApswp4=; b=S5R9Vh8d8zZm3HYUYlUbBPXC/hWxHtuyjNCEAgvvnlNyotbLzZaTAvnIK7Vb5uRgQW 96vW+Jr/pg2wbRJ6CsWBLXXrntSLGwNDtt+gHdoMYqhS+URsZGmQ5vSCnzdJDzUtJPs0 hedrwfBuBE5m3JWwQTPx0+FY9YR8/Jyq22DuPSOUlBFD2bQGa8VhyOQwUEM/Pq10NUDd ZtVn7eh5GtYuZVlK5Y97JmLgJe5/MtTOOE2U/JJFFEPMCsC+hkZ6QpzXxbMgvMuIb8Zl h+MFySKapvyun2ffWy/RI7knhagRt6cw7zPDt+O8s00irfeRlP5QWkWtMH6b3gQ2INdo +REA== X-Gm-Message-State: AODbwcB+fRqcl1dRbW1j7gBjebeJkF0UEv6+kgdot0A0X9btIil0aXcy g6rUC9Tro01f+MHs X-Received: by 10.223.175.17 with SMTP id z17mr15108710wrc.11.1495546518473; Tue, 23 May 2017 06:35:18 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id a136sm960657wme.26.2017.05.23.06.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 06:35:17 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH v5 12/20] ARM: dts: uniphier: Add generic compatible string for I2C EEPROM Date: Tue, 23 May 2017 15:34:40 +0200 Message-Id: <20170523133448.4794-13-javier@dowhile0.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170523133448.4794-1-javier@dowhile0.org> References: <20170523133448.4794-1-javier@dowhile0.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170523_063539_830074_7286E100 X-CRM114-Status: GOOD ( 15.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Rob Herring , devicetree@vger.kernel.org, Wolfram Sang , Russell King , Masahiro Yamada , Rob Herring , Javier Martinez Canillas , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 The at24 driver allows to register I2C EEPROM chips using different vendor and devices, but the I2C subsystem does not take the vendor into account when matching using the I2C table since it only has device entries. But when matching using an OF table, both the vendor and device has to be taken into account so the driver defines only a set of compatible strings using the "atmel" vendor as a generic fallback for compatible I2C devices. So add this generic fallback to the device node compatible string to make the device to match the driver using the OF device ID table. Signed-off-by: Javier Martinez Canillas --- Changes in v5: - Only replace atmel variant but keep other EEPROM vendors (Geert Uytterhoeven). Changes in v4: - Only use the atmel manufacturer in the compatible string instead of keeping the deprecated ones (Rob Herring). Changes in v3: None Changes in v2: None arch/arm/boot/dts/uniphier-pro4-ace.dts | 2 +- arch/arm/boot/dts/uniphier-pro4-sanji.dts | 2 +- arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts index fefc89149234..b9a4919d7c93 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts @@ -88,7 +88,7 @@ status = "okay"; eeprom@54 { - compatible = "st,24c64"; + compatible = "st,24c64", "atmel,24c64"; reg = <0x54>; pagesize = <32>; }; diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts index 6c63c8bad825..3950baa8d55d 100644 --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts @@ -83,7 +83,7 @@ status = "okay"; eeprom@54 { - compatible = "st,24c64"; + compatible = "st,24c64", "atmel,24c64"; reg = <0x54>; pagesize = <32>; }; diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts index cccc86658d20..afba587ffbbc 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts @@ -80,7 +80,7 @@ status = "okay"; eeprom@54 { - compatible = "st,24c64"; + compatible = "st,24c64", "atmel,24c64"; reg = <0x54>; pagesize = <32>; };