From patchwork Mon May 22 14:02:00 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: 9740573 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 18857601C2 for ; Mon, 22 May 2017 14:09:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08F2F284F3 for ; Mon, 22 May 2017 14:09:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1FB228697; Mon, 22 May 2017 14:09:04 +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 6EDC9284F3 for ; Mon, 22 May 2017 14:09:04 +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=w9NFCtmIAeg6kDl+b7W+mXxN4DFFl++SH/O82Ipv4ww=; b=BbTnwBL6EoIxhPJi/NF1Brvk+h Kv56npfvBpqg/Lv1z74BB6/1Qztk5dKp+1NLr5A724Sx5zSSftmMMFhM7RqwWWN5G/tmPfShN73qF FVqZsspxAqQl+sjYnTvLzy5H8mONHnWlcJlzoSv37lExVlJyjAKDEAq/EiB59S2MGAaStbw+c8fZ4 GA73r+0+gEDGhfdqTfLSYrcntgu8fezNlYZIXch7PQqEwX788t8H/baUU6IZVunXKZ/amPNWnnizu THRF4Y6nLyEO/1qyKxVkb0EChGfl+l5HzPDFgWlYVeTisrMMNMV4tvsBRRhoFy4wfq+cFjQ4ElhQ7 VdKcMb1g==; 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 1dCo18-0005Fk-EX; Mon, 22 May 2017 14:09:02 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCnvW-0005x8-MK for linux-arm-kernel@bombadil.infradead.org; Mon, 22 May 2017 14:03:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=U23VV3SRecIBjRInYkKuFqN+zsA4AHtJPHoeWCqPwqs=; b=X0b2SZ0kiTC+j+77w1moCPw+6 hJWhkSmJk8xAuu6clTgBjz5PdZWpKFdD26sGTwYLRUb1WkUrVa4T0xkP6TEHP/fByGqj2OmI64TJx R5zHPOTaMYHODLoMxoliX+m8/EHmUfXAG/Pc4K+lzYBE/6URbHl+S+/cEPK0/U8atrJXe2iyCWRGb racb09UhYfRvWsYFK52aT72fLH+vULjgtBTrdMp8KnL6oBw9vdOHAiGafJJ2KeVGFOHzI38zwxfbZ 5/zVKj1NXyDifzawQDqbjyRhF74lUJl+s8B424TpUs1lyfIGLozArXYoYHLwEBrZUUOg5y2OvF2Qz Gvj1P63/w==; Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCnvQ-0007Ex-6A for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2017 14:03:14 +0000 Received: by mail-wr0-x241.google.com with SMTP id 6so7056652wrb.1 for ; Mon, 22 May 2017 07:02:48 -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=U23VV3SRecIBjRInYkKuFqN+zsA4AHtJPHoeWCqPwqs=; b=twxkWSKtErjpJu2RA86xBfOsHupLge3enoYqj9IWEiI6SSMtHVDlCbcSJKsj0xtwFD DReF6BXoMOO7Fwoxhi3gbgxHyj281F37U0dKaMbHl20Wmb8cA8+s91HSqujV9ZTrwfsr YFcsGy14acxpnzDHQE2Afo0SQvmoWth0GbbsLzds7bPryrkpGmVhGz/vqiZJQlZyJRj6 1DW+FOtu02PAJhdFy6iQlbtHzUjVcYicvq6jQbyCBw6LniZKMnkqRxFFHo2I/B6lIJyI 71YkF8iegFzoUKhvTHDC11NnfF3Il6PwDDHU6+G5Yn12mJrCYwXtFfQOTXEcXAxfPAh2 c+rw== 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=U23VV3SRecIBjRInYkKuFqN+zsA4AHtJPHoeWCqPwqs=; b=ql3bcCc4v/JBgSfeAEHOxX6V5XONN/3wxcIHGG5SkIFALssWyjCnkUB76sTDJ1hPKI g045VUlPHHFAUrFUff2lrL72Qr0mOoDRNnvSQEvR42VKTotHj9Osd15Laweb6NX+/M3V uGzTA0M0X0oPmo+F6jNR10jfOVk9N4Ib0PK7W3o/x6rBMtXF73vOz3aKKdbVzKuwiQqY Pms/PPpgxvI8sjcpsq0uSIleLpbsvUXANgEhNndkZYwtLmFbx5hKkTdyAGA51+f/eaL9 uyiCPe2blZDmf0yLZrv+3aH3U67baKzu/SoJzNkSCjRXOQcA+ArvE7+2jwsS5dhqcgtK pLkw== X-Gm-Message-State: AODbwcDuqj8DXd6MBP4MuIWTngGD837U/9sfotbsvw2aYVX67Wme+068 VOQqV94I+QcBtfmE X-Received: by 10.223.169.34 with SMTP id u31mr14277687wrc.46.1495461766241; Mon, 22 May 2017 07:02:46 -0700 (PDT) Received: from localhost.localdomain ([90.68.25.6]) by smtp.gmail.com with ESMTPSA id m191sm33821774wmg.30.2017.05.22.07.02.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 07:02:45 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH v4 12/20] ARM: dts: uniphier: Add generic compatible string for I2C EEPROM Date: Mon, 22 May 2017 16:02:00 +0200 Message-Id: <20170522140208.24652-13-javier@dowhile0.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170522140208.24652-1-javier@dowhile0.org> References: <20170522140208.24652-1-javier@dowhile0.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170522_100308_398892_58BED8EC X-CRM114-Status: GOOD ( 16.04 ) 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 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..30ed82b2e90d 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 = "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..42d0ea85a1e1 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 = "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..f2368107699e 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 = "atmel,24c64"; reg = <0x54>; pagesize = <32>; };