From patchwork Thu Jun 15 18:54:11 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: 9789991 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 CD9356038E for ; Thu, 15 Jun 2017 19:04:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE6712843F for ; Thu, 15 Jun 2017 19:04:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B341B2848D; Thu, 15 Jun 2017 19:04:32 +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=unavailable 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 43E57284BB for ; Thu, 15 Jun 2017 19:04:32 +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=tLdL/fdysxtXYIIlYTYAeLc+Wb oaFFE2ypkcd67/BnuRQOjvQTnQ4wBBmnuBVywiYA5zMJaZRIEtk3Yc4t+LnbHKxX55WF53Z2nb++S Oaq3Vz+9SnYnlQCUEvhRL2vsxSgd+n/H9x+FTDA9rcMNzq9QQLo0L+tsnMGV76D6Ruxh1OTIq65ub Xs9C4nHG55cksiS1e9lnro7o4980wO3R4M101egOFpszGwuN8lkcdvXXyoWXYIUDBPutT/iRu56Ty lmbLezOKH+SebjpoGqGj5xgJDnODSX4gIJ82AuJNYqD13CJI6J/R28jl9RCwQWCeRd8I2U2nGqkqP bckjIuHw==; 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 1dLa4B-0002d8-Lt; Thu, 15 Jun 2017 19:04:27 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dLZv8-0005zl-FJ for linux-arm-kernel@lists.infradead.org; Thu, 15 Jun 2017 18:55:11 +0000 Received: by mail-wm0-x244.google.com with SMTP id 70so1278330wme.1 for ; Thu, 15 Jun 2017 11:54:45 -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=poNqMVsPf/reMeeBRIJfPuRnRuXXWfH6rtgsCZjBtkRIsMKvlYZQaVPyIShfYQ83PC m7B9DMQ8gaxBsEWp6WwuJeQm+BZ1LtZoTct1thbfG0GciGAD66DUIIDD6nI5/CRFgqVS 4Af5ek/en5m4w2M6g+0qiauuQYUcFsvMc3HJKRinXv3MMJ+B0pFxMLKgN2Y6FGc4pttZ xwYzyVLXJWWATeuqcQpwEhBazEwnRmE0T+plqXRjxV2nq3zxE7smxToR52u0dc9u1EfB zlmDZb1Oaw8qXUidmG2cWdPAfmvKMc4NNQMNBSWf3beKefNmjrN7xR70hGboau6l4daX 29eA== 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=XbmUQUSbXEz1Rv56L2S9Mfw+VHiX3k7694YyinA9hxtzOwfwXwevppflYDffdoBhw4 EBRpwlnnL/vKOtm49WuNvvteW/5U9ms8sBN6CcYlEI4K6co/V0lmObXdvmEjzUPEy58i SoJhZLq9R0CUsALGx2bCN5PyUYDxFgXo+pp5cOCLGjfqWrbwQKcYY9Mg327b1jNzG76P oddP9veF0JWWzuxIdsoN4uN3WVB6f7QP7FZydSp6U42ZY5M4zOHuwLDc2sq7abZPg7ur iaujs48qD1ocVTvM8RXsm2toxNssaAehpKX1OmFSbe9jWRdWE4tHg0DosnDnxb9shTXX J15Q== X-Gm-Message-State: AKS2vOzOn5zAjDunkV8Ihv6fp9Krbbe2IGFuUAFX5s9X0aOYx3mHW8k7 T5i4hLVXdzUw//VpGzo= X-Received: by 10.28.52.195 with SMTP id b186mr4762846wma.122.1497552884069; Thu, 15 Jun 2017 11:54:44 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id 3sm39252wru.50.2017.06.15.11.54.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 11:54:43 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [RESEND PATCH v5 09/16] ARM: dts: uniphier: Add generic compatible string for I2C EEPROM Date: Thu, 15 Jun 2017 20:54:11 +0200 Message-Id: <20170615185418.13980-10-javier@dowhile0.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170615185418.13980-1-javier@dowhile0.org> References: <20170615185418.13980-1-javier@dowhile0.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170615_115507_088340_9D3226E7 X-CRM114-Status: GOOD ( 14.72 ) 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>; };