Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp5620943pxb; Mon, 28 Mar 2022 15:04:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd3U/R7D+p6YzUwK/avmWD5N7k4QDbdRGZ3TfsnAkjIgy/EZjisyI576o6W2pfHh7v0DIC X-Received: by 2002:a05:6870:420c:b0:dd:f2c0:534f with SMTP id u12-20020a056870420c00b000ddf2c0534fmr631309oac.241.1648505099157; Mon, 28 Mar 2022 15:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648505099; cv=none; d=google.com; s=arc-20160816; b=v1no9vIDmPMul6Mx2i641w9t0k9GhITkEX7ipd9Gq7ey0RdhcRYUJkPTedvUkIWUJ+ 3XgUqykW643315he95/wBkWSKmuuoDeiL1LuIfngJ6pbJrWEcQfYgLpyRSWRoiodvzPx tsL/ugXGYrO22givlFdlcN0GNfCQ4BUjDH2MIL45k72H+5HT9u9w6/N6erZwLVcnx+ew hvh543YRYcDoY+NH9A7EViJ0WjCu0r/F9OyBbYduVzsi9eYnXKPEiC7uz1PJ8vi5T4YS hov24TtRVmjrWNYqLtGQUe7P8LW40fq3tu39Vku7GVYwzOWfKr0g5rhifN/jfk1Pt/75 vbCQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EOKyTZ0MHbuBrMLYUwj/DaXVPHkzGJ/MdORrc27Sp4c=; b=nxqjmkMtCPfhhAKIdPCkydtMCrhssIiZm6llMj3W8lUXFS5VA8yDcrbkfezPEc4sKj L0cckCRQ9HC7GLlCcXjOXiYSM9pWvjITeqzDqJv5eXXoLY6+9LR5O+iWFroRe0O4m19F UwexHtdb4HFOAn/MpVejJDRx6B6NtXAqyPOXw8Uyl0NpuCcTzbNRl0s0U7wVbs96U0cx fbI9H0+TLzOAdZGVgT/yOeyuPJilStSY6BIt6YPtsZyWRH3v5H79eBaapiMD8sVCzj/+ GEb+wu3k+poswpDWq/H2NAjlUOfqDSsHrQglFesFyY7v+JilVpw2MtPmhWCw8IMk24gf 7CPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G5i5dsVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id v17-20020a05683011d100b005cb2fc137adsi10618140otq.41.2022.03.28.15.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 15:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=G5i5dsVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CD6DD8167F; Mon, 28 Mar 2022 14:28:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234854AbiC0MlP (ORCPT + 99 others); Sun, 27 Mar 2022 08:41:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234870AbiC0MlF (ORCPT ); Sun, 27 Mar 2022 08:41:05 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E1CE1FA43; Sun, 27 Mar 2022 05:39:25 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id d3so8146421ilr.10; Sun, 27 Mar 2022 05:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EOKyTZ0MHbuBrMLYUwj/DaXVPHkzGJ/MdORrc27Sp4c=; b=G5i5dsVJBuclAECK6fgs5/2d9WmYJx2BhGGIPWUdWLsVVXQIUKirMMxg0MhIUNRxxT WpPRZP5HwlQf2XnpiaGMSsetyB+pG78KbdYjUjvRW4GRfIVV1DAvM+wcAGfRoUyfLGIx 7nPKbXhOWLk4lmNGrai0T3iDwldkU6T+PetftsM4zkU/kMUbKWb0J9wDUEtXlM4agmf4 c5jgLEoJhQ4Z0ZpBNbYuXhzQTBE3joBdupHFUJQDxzCTwnsHJGZYJ9zx5tn2zYgYouP+ EjyGBSurMuzkaxAWdfs89H4zVjr7/CJXiqoRcoG6Jyj2MFlvzSB7zXubkxHsvypQm6dr FDOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EOKyTZ0MHbuBrMLYUwj/DaXVPHkzGJ/MdORrc27Sp4c=; b=mJ2Q2SS347K7Iv1BPL1xdxQ/pJSSEu2flZYPqCKkDsPug/QDrCcJ7HuSlTTphP2K1j swSHSegSyS+7BdyQsgSjmBQt8WKiMMJnYpAHjnf0Qy9HbKtOeQm/+AuBDFLM4EjzVI3y ICkIYACqs1cySRvFMh896Jzvry2gApDO2SyTjDUcp1+9xQtkGS3kuSMduxfMKv2BmGQW yizkwzRwYQhbKvMWmLmjuv6Q6u2tTlcL2iur29IGriVfOjEF7YRJAStNkG0KmOVEV+8S mftkDq/EISDaedcq09TbeThpCZNyfna6mZKTFvKra4nSSSmnyPXA7eGQw9kpczzzGP9J chNw== X-Gm-Message-State: AOAM5317l/0vyP1APEVyMUz6E2T0sN1obGm5XU71xAPSudeoJWluiG/m KNxXMevzOHCW2RVwWRgv9u0/1qddEU0= X-Received: by 2002:a92:cd85:0:b0:2c7:f152:7161 with SMTP id r5-20020a92cd85000000b002c7f1527161mr3380794ilb.265.1648384764282; Sun, 27 Mar 2022 05:39:24 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:7073:b368:2f66:5e36]) by smtp.gmail.com with ESMTPSA id t7-20020a5e9907000000b00649d6bd1ec5sm6134534ioj.31.2022.03.27.05.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 05:39:23 -0700 (PDT) From: Adam Ford To: linux-mmc@vger.kernel.org Cc: haibo.chen@nxp.com, aford@beaconembedded.com, Adam Ford , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] arm64: dts: imx8qm: Remove fsl,imx7d-usdhc compatible fallback Date: Sun, 27 Mar 2022 07:38:34 -0500 Message-Id: <20220327123835.28329-5-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220327123835.28329-1-aford173@gmail.com> References: <20220327123835.28329-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The correct fallback for the imx8qm should only be fsl,imx8qxp-usdhc because fsl,imx8qxp-usdhc is a superset which contains additional flags not present in fsl,imx7d-usdhc. Signed-off-by: Adam Ford --- arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi index ec1639174e2e..336f0ea7e7b5 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi @@ -13,13 +13,13 @@ &fec2 { }; &usdhc1 { - compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc"; }; &usdhc2 { - compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc"; }; &usdhc3 { - compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8qm-usdhc", "fsl,imx8qxp-usdhc"; }; -- 2.34.1