From patchwork Mon Aug 24 08:59:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 11732423 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F27013B1 for ; Mon, 24 Aug 2020 09:00:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E5ACE2072D for ; Mon, 24 Aug 2020 09:00:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MqBlbfpG"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="WEmp+VkC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5ACE2072D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=HP2QM4dGdFJkxi1fXGTzDePB19gRxAPhq2YcfhUDGxs=; b=MqBlbfpGFB5FKRc6M6uMj9KWxv JED5ugjNvw9jMuNB74tIFZA1E6VXoZGG2P34vFd07bxzl9cAd6N9FC4ETdAebTlcHtA7LEykQHbfR rJY/IJsaXok3TO9hrRT8PszXaiDdp5jiEvfT4sTbiKDTuYBfbLo7KEgVeMqDcy1pUsCaC73cwRrvR /U9y/dFmy8aD8fSvyrB/tTieuB5zHjYcBraOzrgU48oZd1NaE1fMTy+f1O1njW5a/KmMhD1Q7q5xp B1Tond25mBuEw4QGB2shsuAe8drc6jiyjUAq/rzZ10YvSBFkL7i+tqWI2siePguiNXTGAosi6gh1I RaeDDgqA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kA8K2-0004l8-Sz; Mon, 24 Aug 2020 08:59:23 +0000 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kA8Jx-0004kd-V2 for linux-arm-kernel@lists.infradead.org; Mon, 24 Aug 2020 08:59:18 +0000 Received: by mail-ej1-x643.google.com with SMTP id d26so763474ejr.1 for ; Mon, 24 Aug 2020 01:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h6Nyla3H0wUGAKmzWwi+k8dbGIe1ZX5kzFV4/Pz+xJc=; b=WEmp+VkCtcJ2WeYsttZRViQlwO9dCg57Qfm6bvcDqfm0CV17zAJa7ZFBpY1ZsPMakB 3tEOAsNwISWRBs4FESrd7zxUBzXUET0SNtX8ClxCex+zCeiOp/+BimZ6cUDWQByQW1h3 PUmRjWafkMvUXjtBgPeYqiXygW/kqReXvwzg/ApU16wWAco3NZU4+Xyzw70SQ5cQrwGg b9tWNZKiMHFhT2DGsNWI5aU116gu8hyBKcca/SVKpOXC2JWJfnvI7272B4Crbwux6UFT MMXcg+FHgq5wESb3VEykHk0OZycg7Fr12L6L/UvuTj1DBqu3ltK4jZQPZWxncgKPkAov hetQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=h6Nyla3H0wUGAKmzWwi+k8dbGIe1ZX5kzFV4/Pz+xJc=; b=FqadWD119Iz4teaAnaYbtdjTCjARAoMqosiM5Ri6Vz4YueR3qmif0mkk0d1f2D40/A ykUU71kVY7Y6Lv0/kSd6TU/Lyd8Qkqd77Ve14v0YPtR2zs+fkjUCSDdv63rfGTJm+HD7 XjyuXPfZBQD6DrCpQKEGd2YFSTrTS8ItT6fWF7vHFHpPXWjAUvWr5yF3KVMaEuVVXXAS PXfn6r0iNmoJTWhAggT/fqXtSR0tFtbZiADO0ChjefXp45q4S69ryONVNBV0GeD6Vl/Z R4FLQCJMw41zAn132IBH8zIEcLmmkuxapvgF5BHLzShmfK5fgQYlB2qOAPrjyEY8AWw8 nsvA== X-Gm-Message-State: AOAM530aM7u+D7nDq0CS79pPgCOq7rAzB2XN9X3BN7s1WCDza+8m8tcF ZARgLG8gp4uYldZGLCr0YM1PnA== X-Google-Smtp-Source: ABdhPJxaZAUd1oAJnAMhDl7Cr1pP6hTC52Sd5CTKaQVBf5nJsWM04lQna+QTamTT6lBMyxnX5PpPOQ== X-Received: by 2002:a17:907:2078:: with SMTP id qp24mr4500987ejb.286.1598259556116; Mon, 24 Aug 2020 01:59:16 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id p1sm8339639edu.11.2020.08.24.01.59.15 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Aug 2020 01:59:15 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu, michal.simek@xilinx.com, git@xilinx.com Subject: [PATCH] arm64: dts: zynqmp: Remove additional compatible string for i2c IPs Date: Mon, 24 Aug 2020 10:59:14 +0200 Message-Id: X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_045918_089357_3D4FF3C3 X-CRM114-Status: GOOD ( 14.99 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Rajan Vaja , Nava kishore Manne , Michael Tretter , Krzysztof Kozlowski , Rob Herring , Moritz Fischer , Laurent Pinchart , Manish Narani , =?utf-8?q?S=C3=B6ren_Brinkmann?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DT binding permits only one compatible string which was decribed in past by commit 63cab195bf49 ("i2c: removed work arounds in i2c driver for Zynq Ultrascale+ MPSoC"). The commit aea37006e183 ("dt-bindings: i2c: cadence: Migrate i2c-cadence documentation to YAML") has converted binding to yaml and the following issues is reported: ...: i2c@ff030000: compatible: Additional items are not allowed ('cdns,i2c-r1p10' was unexpected) From schema: .../Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml fds ...: i2c@ff030000: compatible: ['cdns,i2c-r1p14', 'cdns,i2c-r1p10'] is too long The commit c415f9e8304a ("ARM64: zynqmp: Fix i2c node's compatible string") has added the second compatible string but without removing origin one. The patch is only keeping one compatible string "cdns,i2c-r1p14". Fixes: c415f9e8304a ("ARM64: zynqmp: Fix i2c node's compatible string") Signed-off-by: Michal Simek Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 6a8ff4bcc09b..165a95a106c8 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -500,7 +500,7 @@ gpio: gpio@ff0a0000 { }; i2c0: i2c@ff020000 { - compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; + compatible = "cdns,i2c-r1p14"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 17 4>; @@ -511,7 +511,7 @@ i2c0: i2c@ff020000 { }; i2c1: i2c@ff030000 { - compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; + compatible = "cdns,i2c-r1p14"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 18 4>;