From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77C3DC54EED for ; Tue, 24 Jan 2023 13:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234625AbjAXNpq (ORCPT ); Tue, 24 Jan 2023 08:45:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234549AbjAXNo6 (ORCPT ); Tue, 24 Jan 2023 08:44:58 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C571474E6; Tue, 24 Jan 2023 05:43:46 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0677A611F2; Tue, 24 Jan 2023 13:43:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90C3CC4339C; Tue, 24 Jan 2023 13:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674567792; bh=LkoBjuiq2polH/rK24e4vvUSa+FRr/93moqEdFoFrqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rW4TOaqlXLopmQzQU9gemh9NLPvpwsMHPWKH5QjLSoqxujVg2iQutaII2szRrJ/k3 3Mns8kw9WEfQ7xaV6HE0CxuQM8Eu78seTEosLaXdZuqj+A3I4Hblxf++lG4hb5zrMr FpBSAA9ATBKLWF2yv0MQECRObNIdTPHkq7x+yPuPIKsH3eG0L4g2kUX2erbHH74Mke aS2eSNHBpfT2cogLQ8tfujCZH2ufMFCXw9yaPG8CkhzylcsZPyKV3C2FzU9g3X6Od8 bQHXhzxU4TH4Ow7e8hJqYx6emlNJg+tBSoq1GTttRYfoZ6/KySGWxExRlZtW3R5Kdp /8DrNlb6+7WBw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Krzysztof Kozlowski , Shawn Guo , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 04/14] arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI Date: Tue, 24 Jan 2023 08:42:47 -0500 Message-Id: <20230124134257.637523-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124134257.637523-1-sashal@kernel.org> References: <20230124134257.637523-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Krzysztof Kozlowski [ Upstream commit ef10d57936ead5e817ef7cea6a87531085e77773 ] There is no "no-emmc" property, so intention for SD/SDIO only nodes was to use "no-mmc". Signed-off-by: Krzysztof Kozlowski Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mq-thor96.dts b/arch/arm64/boot/dts/freescale/imx8mq-thor96.dts index 5d5aa6537225..6e6182709d22 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-thor96.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-thor96.dts @@ -339,7 +339,7 @@ &usdhc1 { bus-width = <4>; non-removable; no-sd; - no-emmc; + no-mmc; status = "okay"; brcmf: wifi@1 { @@ -359,7 +359,7 @@ &usdhc2 { cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; bus-width = <4>; no-sdio; - no-emmc; + no-mmc; disable-wp; status = "okay"; }; -- 2.39.0