From patchwork Wed Jan 17 15:29:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 10169575 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 134E1603ED for ; Wed, 17 Jan 2018 15:31:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0334528709 for ; Wed, 17 Jan 2018 15:31:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC38528713; Wed, 17 Jan 2018 15:31:25 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham 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 7821828709 for ; Wed, 17 Jan 2018 15:31:25 +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=pJWjPmyUw/G1UEkAQU5Bj+jN57ar1HsGBsgLZir9zMY=; b=bXueaMSSP95XVP+V8t37kY9B3N jYc2LaFtZQ+p8OfrVF8LtG7fg7+zLQx/jdlFYJJ1/UnKkvDJInuNOUIikzX+x8zaq7KP71ANiLDfv 9qqKgRn7g0TRY0a/YyzHcwGq+A59fa9HGBUecbvMNOq6aQLoyputmfaqE7Yu21luOwa5SvexYWThy I+NqoehaUAOYzPGQ7qUiEgdxaOd9fdSWb68uCvYKynnxPZeePDE8jEMpiMLFYvzFMExZxgXGnNV2H 2J86nhwilLZSyfaedRoCH6WD48urn8LuUowIutIy2anWA3/LQcMnK0IGb2OXEd1iJ8Dt50RpulBWs AlsBq8Mg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ebpgR-0002nu-LD; Wed, 17 Jan 2018 15:31:23 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebpfB-0008Jt-Cb for linux-arm-kernel@lists.infradead.org; Wed, 17 Jan 2018 15:30:12 +0000 Received: by mail-wr0-x241.google.com with SMTP id o7so19284919wro.8 for ; Wed, 17 Jan 2018 07:29:54 -0800 (PST) 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:in-reply-to:references :in-reply-to:references; bh=A7DUxkzDdbC+3mvLpngfbAFSf0UgrvTXoLlDPjwUus0=; b=0Xzu3tvGjZ7zgjCZUDSwpK7bIPQs7Ma8UfFQascyslsQ+ymHU5upKyjZBY3++hSlJr ILMBc+lAXvelkP1fLI7pmivDa+JxSebVwXkpPR0nh2Tk6xv90i8/PD52uZb3pjaK36WR 2LK7DPx6V8ws2YqzVhon5SzIh0Mgt0LoC0Gvll2YVTewViOeDPx5IioTsVHHcNvmeNkX VVHpy+mM5hpOWzpFF6UZRj2XKsUrCv64+fDc+6M47rfPho7JkfqHZ7DGMH0cVG+j2kfW N25Oq72egaS27m4PJg1rU3SgIj8mRDDUNihdC8/WpJkV4UAdnfJAzKeTpIl2SqNNr044 luzw== 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 :in-reply-to:references:in-reply-to:references; bh=A7DUxkzDdbC+3mvLpngfbAFSf0UgrvTXoLlDPjwUus0=; b=HbypqXEWdILPNWiCGNeFIMSEpcsRi2Ec/I4KLwTFpWoYZyXuB9TxmtERiG+s6n1M0s TG/AbLBYseJRgkFnidgbM98c8XDbPA522fXcQCx+AYRXUWLoDpZTWonyz8cm+m84JoDr cVanyE7L3+x1FVXiOc2+HNcUlhvKQhagIsmtsSNlyF3UtT8DOpdxBXCtfjjbf5bgKYWK G3TSwDJik+ylLw2OMv2XhVtLjvixE1l2kckXqJfQalzEGzP5fKCLTB3Lk1C6PhAitQDq nDKDZr3ZeZxHrnUwnepAKM977myC682GF39GK93cPTFJnnM6yr/M83hmB7Mfm80YTIc3 dRwg== X-Gm-Message-State: AKwxytdOZ3jutCVuk9NCX1yzPL0cDcpQK7S8mUaWDEGYuDceQW4x/Ql+ 9wEA2EXR1iahqZQ7ITIYXhYHJg== X-Google-Smtp-Source: ACJfBotDjTWPe0bD35aOnAz5CLLlr9sqvUqqC1Ml6rFyjp50B5Hn0fJzRCEdHNtNVgDJykyCgHlgwA== X-Received: by 10.223.136.218 with SMTP id g26mr3225187wrg.184.1516202993291; Wed, 17 Jan 2018 07:29:53 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id o12sm4497071wrf.81.2018.01.17.07.29.52 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 17 Jan 2018 07:29:52 -0800 (PST) From: Michal Simek To: devicetree@vger.kernel.or, devicetree@vger.kernel.org Subject: [PATCH 1/6] arm64: zynqmp: Use zynqmp specific compatible string for macb Date: Wed, 17 Jan 2018 16:29:45 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: 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: "Edgar E. Iglesias" , Naga Sureshkumar Relli , monstr@monstr.eu, Stefan Krsmanovic , Bharat Kumar Gogada , Will Deacon , Shubhrajyoti Datta , linux-kernel@vger.kernel.org, Rob Herring , Moritz Fischer , Catalin Marinas , Mark Rutland , 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 patch "devicetree: Add compatible string for Zynq Ultrascale+ MPSoC" (commit <988d6f07fc0a29e392035ba56e3bcfaf7b397d95>) introduced specific compatible string for ZynqMP which should be used first. Signed-off-by: Michal Simek --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 7665fbddff28..0da98007753b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -355,7 +355,7 @@ }; gem0: ethernet@ff0b0000 { - compatible = "cdns,gem"; + compatible = "cdns,zynqmp-gem", "cdns,gem"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 57 4>, <0 57 4>; @@ -366,7 +366,7 @@ }; gem1: ethernet@ff0c0000 { - compatible = "cdns,gem"; + compatible = "cdns,zynqmp-gem", "cdns,gem"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 59 4>, <0 59 4>; @@ -377,7 +377,7 @@ }; gem2: ethernet@ff0d0000 { - compatible = "cdns,gem"; + compatible = "cdns,zynqmp-gem", "cdns,gem"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 61 4>, <0 61 4>; @@ -388,7 +388,7 @@ }; gem3: ethernet@ff0e0000 { - compatible = "cdns,gem"; + compatible = "cdns,zynqmp-gem", "cdns,gem"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 63 4>, <0 63 4>;