From patchwork Tue May 23 13:34:36 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: 9742629 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 868E560380 for ; Tue, 23 May 2017 13:36:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 764A7287D8 for ; Tue, 23 May 2017 13:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AED5287DC; Tue, 23 May 2017 13:36:36 +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 F1AE2287D8 for ; Tue, 23 May 2017 13:36:35 +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=QrPKQ+sm+UrsjS7qouTzuCczTJj77Kb9PPxLxMkkU6A=; b=sG3qDCn08O982E4UkQDavRREL3 TddLep+2gjNJ9DjSpXGYu6shPtgFjYh24ACh6K5ug6jqG3ZFiUwHOtpAblrvI8pMG1GGdOeZ0K+3l kjlgMVrphd6g4oVQ5djnjAvub/qerL6Ow00p56UBB6Lgh54IdpeHCCbRg6n3wErp9Tmxvod4nOgua sp67Q8bO3Kh9EnnsDnrrWbI8s3Rl9iylp52PYYd6v8SbeojJ9xGKLkW3M7sIKlV0EFu49rcMYUHtf YyaALobLQ+p4AJoCzzg7GyIjf2h67apxkIMlW0E7jBwx7ipRhP/rDt3DsOtf5Mv2iomgLPOx5MU77 lSiEvMvA==; 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 1dD9zF-0001w6-W0; Tue, 23 May 2017 13:36:34 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dD9yD-0000Ru-B8 for linux-arm-kernel@lists.infradead.org; Tue, 23 May 2017 13:35:34 +0000 Received: by mail-wm0-x243.google.com with SMTP id d127so39428553wmf.1 for ; Tue, 23 May 2017 06:35:12 -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=ZovvCoaBr8VXZ59jfm2HrvxN675ML8kOizdtifB68Ng=; b=WGey5b2pysgi0tjLgvVCCKaLYAkMTfT4MQW4ujwQqandc0vFD7EykZs1a709GTp3zr 2yUycJydotc7m4xh9YDd44oHH8cnCP8LPiZOUPorlWqUiIse6723azBMThuQGOaIUxX+ qykakxf24eE4684RHaSOAhdqKziKSjWU95Edjs8/Ct5JojGO0YnBjTisiIj9Dm5tH/tc A0L8RZC7lAbyn8ay59MpGDNjpo9jgFyBNrcEVO/NhaNrcJJeqt7IhJwhDaOxnpmY3lHh 7RQQhPUzJgk44jbTwbR6RP0VsKcemf4Bw8FxD9MCWqgC9Yebxk8eRTa0U46dWJT6CxfU sfiQ== 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=ZovvCoaBr8VXZ59jfm2HrvxN675ML8kOizdtifB68Ng=; b=L/YkASGH0ghmSIvwWZwu79v/3dKxCa1I89oJi5oEUoKgfOXnrWn9+y2Cf9gVDWtthQ RbMhmsRk7ynqXJ81HUI3g9LPxJsnxrheJIvo7iLVX0MGns1eWV2kQk3yX30MIB4ko8Yx sSn/DcAo0WSbxUtuBAh0veOTwJUsG5KRHhwWzqKnm//Ltzwiqi47Vaf+Ke4y8DMDFX/4 C+iWXkSZ0+8hPDkr5T+9KcJT+RycRY1Or3wIlE4kSt6/v0VslLKsIkOfI47HXjMred+D 5W2pAPbeRJGEw+UWsyvO7BnGfZVqluEtF/f47bnUdkJd/yj+481JtxJE5uzu22gtQpLR Iy8w== X-Gm-Message-State: AODbwcDvbn3lLbw5P+kq+/f41vq8F7jS8pwAgkDrkAayOdgebKDVkCW/ IAHNsX4HuhUFFobh X-Received: by 10.223.177.140 with SMTP id q12mr14687750wra.68.1495546511016; Tue, 23 May 2017 06:35:11 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id a136sm960657wme.26.2017.05.23.06.35.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 06:35:10 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH v5 08/20] ARM: dts: lpc18xx: Add generic compatible string for I2C EEPROM Date: Tue, 23 May 2017 15:34:36 +0200 Message-Id: <20170523133448.4794-9-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_063529_897281_88A9C389 X-CRM114-Status: GOOD ( 15.58 ) 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, Joachim Eastwood , Wolfram Sang , Russell King , 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/lpc4337-ciaa.dts | 6 +++--- arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 +- arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/lpc4337-ciaa.dts b/arch/arm/boot/dts/lpc4337-ciaa.dts index 7c16d639a1b4..beddaba85393 100644 --- a/arch/arm/boot/dts/lpc4337-ciaa.dts +++ b/arch/arm/boot/dts/lpc4337-ciaa.dts @@ -174,17 +174,17 @@ clock-frequency = <400000>; eeprom@50 { - compatible = "microchip,24c512"; + compatible = "microchip,24c512", "atmel,24c512"; reg = <0x50>; }; eeprom@51 { - compatible = "microchip,24c02"; + compatible = "microchip,24c02", "atmel,24c02"; reg = <0x51>; }; eeprom@54 { - compatible = "microchip,24c512"; + compatible = "microchip,24c512", "atmel,24c512"; reg = <0x54>; }; }; diff --git a/arch/arm/boot/dts/lpc4350-hitex-eval.dts b/arch/arm/boot/dts/lpc4350-hitex-eval.dts index 874c75d44013..8b973f537d3a 100644 --- a/arch/arm/boot/dts/lpc4350-hitex-eval.dts +++ b/arch/arm/boot/dts/lpc4350-hitex-eval.dts @@ -429,7 +429,7 @@ }; eeprom@50 { - compatible = "nxp,24c02"; + compatible = "nxp,24c02", "atmel,24c02"; reg = <0x50>; }; diff --git a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts index 9b5fad622522..02b23fa29d75 100644 --- a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts +++ b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts @@ -490,7 +490,7 @@ }; eeprom@57 { - compatible = "microchip,24c64"; + compatible = "microchip,24c64", "atmel,24c64"; reg = <0x57>; }; };