From patchwork Mon Sep 11 21:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 137953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp167795vqx; Mon, 11 Sep 2023 21:30:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5j/7yq8KVHQXN6WpteCILJyDmFE0yD/iLtinyf5iV9as90q5skGXJroFRv7joMcoukBEJ X-Received: by 2002:a05:6808:2217:b0:3a8:5001:e077 with SMTP id bd23-20020a056808221700b003a85001e077mr15404768oib.53.1694493016973; Mon, 11 Sep 2023 21:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694493016; cv=none; d=google.com; s=arc-20160816; b=I4DJDSKRPzSi+aD0eVAxDUeWFfmNPHTsl1HiPYt0y3Yr9PmCg0pZn4efix68KbpxJk vr1TEuam5xaxyWXrRr17eH1OzVAbFafZHNCetp1RehsAaRw9GhojzeG1uGqEsB2OKxqz uI0pfmp9K0URhOXC/GlbDiE3VPlE0mo+6aXJ2euD+kmBolJah3lB+KG3esKvdwiS2q74 ppdothpRhtVi55F9AyoiUggXc0du4pZsXN75Mi2r1lhH4pQtrRx5k9aGSjj/Jay9ituH 9CBG1+mv6IE5dOdOjQTioUmT/DxyKSjx2jZZXa9wo4+uFWIq7i7oOMYHrJJCvA+jFa6W XyKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4W/ME8jWuuxMe5T1Plh4ZY+z2fQQxcf9vxmjJZOrFjo=; fh=xy1Bhz5TSgcrhdzts3w8kFLDYzjQlc+Vf2bYIgU4pKM=; b=qkBXjQ0SwL1AT8D74RjdbtSq15bPvuwannSf2+ys2v4EH3W0Tz3NpWwYlcwBC6KVYY BaWD/qxkirBRae1TdSuV1HGgdPTblF9D/Ji0Bz/qYxDdSbWbxpdElIssydl/ip0XTAus /0lBFbK/4J2ze42C1jHR77W9UD/PVT21G81SWOZ8z6WlX4gppCGLpCN9pL0axe5cZNg1 O637XL0Ylh0Q1dKMbVJc8nS1mbfqXCfIsKWy94X7GXnu/3alun5Kmv3yE180wYekuyJB LBM2JkuakIZsXH2GZ14IzMOMk6LW4POKEy859URtvI36PR3zc6524CSlPh8AMfupouyW rbnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hz9D28Z3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id g6-20020a63f406000000b00573f90c0ef5si7203246pgi.126.2023.09.11.21.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 21:30:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hz9D28Z3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id BA8968079324; Mon, 11 Sep 2023 21:30:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238027AbjILC21 (ORCPT + 78 others); Mon, 11 Sep 2023 22:28:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237649AbjILC2C (ORCPT ); Mon, 11 Sep 2023 22:28:02 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1845B114112; Mon, 11 Sep 2023 18:52:26 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C90AC07616; Mon, 11 Sep 2023 21:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694468875; bh=V1/4qYoS5i83IaWV3Li0Ak1OZFvqoZ3kUw55Zk3yyRs=; h=From:To:Cc:Subject:Date:From; b=hz9D28Z37OI76V5gXXxgFSPt/cPlL5BKMffWrUkSyAR9wFdMONbOhKnVTBir4McnB 8qwlPlEvLh6STAshvvGAdqH+LXK4dyYCxplTiiheahGdDFDGXstRJp81UmdV98ebce nT2Awui41JA7Djts4w1Wp0aXtosj4VUA1UP8rmMV0QQ4DlFTwEkGcasM+8zEyIuZ6S q7FC5MFGlvU4J8ENT2t+IwegJgwXezjUcHyp9VMX6tqTQgS5z4k9TIe6dTWb0IPC9t kca7YFy7o6LMBKAEauRN289diUhH+9n8sQ4g2g3zZ2GxS4np8ErobGKoCooT8ylihm QT8wAkDaN9Urg== Received: (nullmailer pid 2203086 invoked by uid 1000); Mon, 11 Sep 2023 21:47:53 -0000 From: Rob Herring To: Krzysztof Kozlowski , Conor Dooley , Michal Simek Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: xilinx: Apply overlays to base dtbs Date: Mon, 11 Sep 2023 16:47:47 -0500 Message-Id: <20230911214751.2202913-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 11 Sep 2023 21:30:14 -0700 (PDT) X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776804709515619265 X-GMAIL-MSGID: 1776804709515619265 DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time. Defining the "-dtbs" variable is not enough as the combined DT must be added to dtbs-y. zynqmp-sck-kr-g-revA.dtso and zynqmp-sck-kr-g-revB.dtso don't exist, so drop them. Signed-off-by: Rob Herring --- arch/arm64/boot/dts/xilinx/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile index 5e40c0b4fa0a..1068b0fa8e98 100644 --- a/arch/arm64/boot/dts/xilinx/Makefile +++ b/arch/arm64/boot/dts/xilinx/Makefile @@ -22,11 +22,10 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb zynqmp-smk-k26-revA-sck-kv-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revA.dtb zynqmp-smk-k26-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo - -zynqmp-sm-k26-revA-sck-kr-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-sm-k26-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revB.dtb