From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 20 Feb 2024 11:45:01 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rcNcT-00FvhS-2z for lore@lore.pengutronix.de; Tue, 20 Feb 2024 11:45:01 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rcNcT-00087R-73 for lore@pengutronix.de; Tue, 20 Feb 2024 11:45:01 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=9+81NsRyuC673CRpaEqoBAJBA0oOEpw4F+++jVgSgmc=; b=sTypcto4e4OPazdyPyDEinNf9L aXEcB0HKcXXOlXIrNqKRQ5Y6inl69QWfFoVJMP0HvgI31BWHkAlQiosdR0KtIxdKGXay/Xsd3TeBN lKogUKPEU38y/M5Tllyb9gZsDvPl9tVPPrLvroc82py5w28jKeTvSKGvt45cYZpcc7EIngF7cKEJ5 PtITO7mWZV45c5N1oi+Wv+ZLFDofV68pInUGpI5tE8RoCZOlQhPtORbT2rSWV85GUzAwdyZZYLbi6 hilzk5O0jnh9FYTaNzj36+lZBt9r2hcLEaiwQ76DvPhrk00VJhyw6Sjv39UxHiI1bonHvn9vNWvOL 2UVZpZPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcNbn-0000000EJPF-0fdT; Tue, 20 Feb 2024 10:44:19 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcNbj-0000000EJOI-3P6b for barebox@lists.infradead.org; Tue, 20 Feb 2024 10:44:17 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rcNbg-0007uG-Ll; Tue, 20 Feb 2024 11:44:12 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rcNbg-001pI2-92; Tue, 20 Feb 2024 11:44:12 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rcNbg-00AONu-0Z; Tue, 20 Feb 2024 11:44:12 +0100 From: Sascha Hauer To: Barebox List Date: Tue, 20 Feb 2024 11:44:02 +0100 Message-Id: <20240220104402.2475000-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_024415_869584_7EB0B55A X-CRM114-Status: GOOD ( 14.35 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] ARM: i.MX: add barebox,bootsource-mmc aliases X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Several boards overwrite the standard mmc aliases to give them a board specific numbering. This breaks our assumption that the bootsource instance number matches the mmc alias numbering. barebox supports barebox,bootsource-mmc aliases to provide a mapping between the bootsource and the device nodes that provides them. Add these aliases for the newer i.MX SoCs. Signed-off-by: Sascha Hauer --- arch/arm/dts/imx51.dtsi | 4 ++++ arch/arm/dts/imx53.dtsi | 4 ++++ arch/arm/dts/imx6qdl.dtsi | 4 ++++ arch/arm/dts/imx8mm.dtsi | 3 +++ arch/arm/dts/imx8mn.dtsi | 3 +++ arch/arm/dts/imx8mp.dtsi | 3 +++ arch/arm/dts/imx8mq.dtsi | 5 +++++ arch/arm/dts/imx93.dtsi | 6 ++++++ arch/arm/mach-imx/boot.c | 4 ++-- 9 files changed, 34 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx51.dtsi b/arch/arm/dts/imx51.dtsi index 828a6c2e1b..2be6b955e2 100644 --- a/arch/arm/dts/imx51.dtsi +++ b/arch/arm/dts/imx51.dtsi @@ -2,5 +2,9 @@ /{ aliases { pwm0 = &pwm1; pwm1 = &pwm2; + barebox,bootsource-mmc0 = &esdhc1; + barebox,bootsource-mmc1 = &esdhc2; + barebox,bootsource-mmc2 = &esdhc3; + barebox,bootsource-mmc3 = &esdhc4; }; }; diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi index 96fdd73ed0..5be1d7a53f 100644 --- a/arch/arm/dts/imx53.dtsi +++ b/arch/arm/dts/imx53.dtsi @@ -3,5 +3,9 @@ aliases { pwm0 = &pwm1; pwm1 = &pwm2; ipu0 = &ipu; + barebox,bootsource-mmc0 = &esdhc1; + barebox,bootsource-mmc1 = &esdhc2; + barebox,bootsource-mmc2 = &esdhc3; + barebox,bootsource-mmc3 = &esdhc4; }; }; diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index c3e02d2117..5afb772a84 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -7,6 +7,10 @@ aliases { pwm3 = &pwm4; ipu0 = &ipu1; gpr.reboot_mode = &reboot_mode_gpr; + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + barebox,bootsource-mmc2 = &usdhc3; + barebox,bootsource-mmc3 = &usdhc4; }; }; diff --git a/arch/arm/dts/imx8mm.dtsi b/arch/arm/dts/imx8mm.dtsi index 982174375e..d3d0129421 100644 --- a/arch/arm/dts/imx8mm.dtsi +++ b/arch/arm/dts/imx8mm.dtsi @@ -9,6 +9,9 @@ aliases { pwm1 = &pwm2; pwm2 = &pwm3; pwm3 = &pwm4; + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + barebox,bootsource-mmc2 = &usdhc3; }; }; diff --git a/arch/arm/dts/imx8mn.dtsi b/arch/arm/dts/imx8mn.dtsi index 098bf0a367..6f3f943548 100644 --- a/arch/arm/dts/imx8mn.dtsi +++ b/arch/arm/dts/imx8mn.dtsi @@ -8,6 +8,9 @@ aliases { pwm1 = &pwm2; pwm2 = &pwm3; pwm3 = &pwm4; + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + barebox,bootsource-mmc2 = &usdhc3; }; }; diff --git a/arch/arm/dts/imx8mp.dtsi b/arch/arm/dts/imx8mp.dtsi index 3eb3c7a5df..9d87ddaea8 100644 --- a/arch/arm/dts/imx8mp.dtsi +++ b/arch/arm/dts/imx8mp.dtsi @@ -14,6 +14,9 @@ aliases { pwm1 = &pwm2; pwm2 = &pwm3; pwm3 = &pwm4; + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + barebox,bootsource-mmc2 = &usdhc3; }; }; diff --git a/arch/arm/dts/imx8mq.dtsi b/arch/arm/dts/imx8mq.dtsi index e56cdfe130..d90afbe628 100644 --- a/arch/arm/dts/imx8mq.dtsi +++ b/arch/arm/dts/imx8mq.dtsi @@ -5,6 +5,11 @@ */ / { + aliases { + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + }; + remoteproc_cm4: remoteproc-cm4 { compatible = "fsl,imx8mq-cm4"; clocks = <&clk IMX8MQ_CLK_M4_CORE>; diff --git a/arch/arm/dts/imx93.dtsi b/arch/arm/dts/imx93.dtsi index 7abaabcbd7..dd24c732d3 100644 --- a/arch/arm/dts/imx93.dtsi +++ b/arch/arm/dts/imx93.dtsi @@ -1,4 +1,10 @@ /{ + aliases { + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; + barebox,bootsource-mmc2 = &usdhc3; + }; + soc@0 { usbphynop1: usbphynop1 { compatible = "usb-nop-xceiv"; diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 153da83560..3fea22d05f 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -34,7 +34,7 @@ imx_boot_save_loc(void (*get_boot_source)(enum bootsource *, int *)) get_boot_source(&src, &instance); - bootsource_set_raw(src, instance); + bootsource_set(src, instance); } @@ -319,7 +319,7 @@ void imx53_boot_save_loc(void) imx53_get_boot_source(&src, &instance); - bootsource_set_raw(src, instance); + bootsource_set(src, instance); } #define IMX6_SRC_SBMR1 0x04 -- 2.39.2