From patchwork Thu Jun 15 18:54:07 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: 9789989 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 0B41E60325 for ; Thu, 15 Jun 2017 19:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFEA12843F for ; Thu, 15 Jun 2017 19:04:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E487C284DB; Thu, 15 Jun 2017 19:04:17 +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 7B5E52843F for ; Thu, 15 Jun 2017 19:04:17 +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=JvXFwGYij92ASY2cLxtM10xTUG tUn4ILyyiuAdvy4OCxpDW2FEOgYIMgQPUZ/A4obWztw8igBcEnFGxAoD0YfRDqubcJl9TaCK12wD2 y1lgN4jMIlK+tXLSfR2289WUOoZsozUT7umMTXzTU1kIwjRMHS1pHy/j3iwltuSDJw3s06yTjST+T l4F2x132jVX4Z83lwGiPCmS2ypxRsjRq5YF8XnSmu105b4sceYK8g1Du+BuuJxVDItqAfXNTUBpYE ScXZt9iMLUprgxOVMFMMWewHQyuyLfuCdei01iu0xTBWrroD4pdaZyzfzf2L90uFy3ft3y2gpRVhM 2/RezkqQ==; 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 1dLa3u-0002BI-Ei; Thu, 15 Jun 2017 19:04:10 +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 1dLZuv-0005zd-Nx for linux-arm-kernel@lists.infradead.org; Thu, 15 Jun 2017 18:54:55 +0000 Received: by mail-wm0-x243.google.com with SMTP id d64so1274523wmf.2 for ; Thu, 15 Jun 2017 11:54:37 -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=u8uke0fN/bTrgzk+BSPsvp4D8823fLFg0Oodu7UzQbrWCOaBqm/hUbixpzieIYmG7t 1wjX1BkxUK6yvxkNIGDFBIhwIOu2UlKGn6UUe5dmE/WobY5u42A8EI7U4qNJaKzU7Nmu 4cL9CzttwoHbKu6vViPcVXGQ441eyOgEFEWY+uBZEIh7DL7sOLjXkmsXU2XC44/1LACw 5I0L4yN/XYkXwHZtwfka021s9ToExPDiDFfbGHH5deNoDbX8Z4G0WFIQQVRvhWc3as+X lbHFqatENlN7pxncVT0xKxftgio8JY8ej4SRJsF/qQGoW92089WdcHR+RUzvjOga+3tC Yf3Q== 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=Ejgi9nF+y6b7gvnSF5H/xDcRh/zh6RnJ34cgDEA6wzrp1hITtGL330cYcvWKs8NEEv sZerLJsy08iwBBHhZ08JQO3NJdyga9Ne4CqwjXs63p6yPhsqTbr60+DN6NeeqF0ufpH5 ZLpDcJ3ImK0PSHr+5i0Pv16PtEMK0QC2yU/hqfXxS1l8jtEfbfQsYVCsvSG4EDkjlkmi ZtUWNIK+XShZdw52kdIQjccaUXxJras7VowjkUVIX1WIAq3TYOg+Ojtle2EOu6nn/0Fb q7KzlzS8KDjuqrLbdviS2jUyI7cJwyQsl3/DKYQdEwXEpwgFls9MEGZJ7X+P6qgnHLqk LK4A== X-Gm-Message-State: AKS2vOxlJ3dWTH6nO+MU44taUzdj0m7Za/XVycDySAnUxTf2LADmiJyz 1scXiu89SCHt3WiI X-Received: by 10.28.109.220 with SMTP id b89mr4561994wmi.97.1497552876082; Thu, 15 Jun 2017 11:54:36 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id 3sm39252wru.50.2017.06.15.11.54.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 11:54:35 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [RESEND PATCH v5 05/16] ARM: dts: lpc18xx: Add generic compatible string for I2C EEPROM Date: Thu, 15 Jun 2017 20:54:07 +0200 Message-Id: <20170615185418.13980-6-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_115453_982981_6D8A3063 X-CRM114-Status: GOOD ( 15.03 ) 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>; }; };