From 2998db9ab3a42023155adeda5f56e78453fdb631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20K=C3=A4stner?= Date: Sun, 16 Mar 2025 23:56:32 +0100 Subject: [PATCH] linux-mainline: dts: orangepi-zero: add mmc aliases for consistent enumeration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes random boot failures. Same workaround as in the other patches. Signed-off-by: Oliver Kästner --- recipes-kernel/linux/linux-mainline.inc | 1 + ...angepi-zero-mmc-aliases-for-consiste.patch | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc index e29b7f1..f7d24a6 100644 --- a/recipes-kernel/linux/linux-mainline.inc +++ b/recipes-kernel/linux/linux-mainline.inc @@ -57,6 +57,7 @@ SOURCES_K65 = " \ file://6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \ file://6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \ file://6.5/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch \ + file://6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch \ " SOURCES = " \ diff --git a/recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch b/recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch new file mode 100644 index 0000000..91f7436 --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch @@ -0,0 +1,32 @@ +From a2d765aab2989ba080b8f63cb0489d6a531cb3fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Oliver=20K=C3=A4stner?= +Date: Sun, 16 Mar 2025 22:36:53 +0100 +Subject: [PATCH] dts: allwinner: orangepi-zero: mmc aliases for consistent + enumeration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes random boot failures. + +Upstream-Status: Inappropriate [https://github.com/linux-sunxi/meta-sunxi/pull/431] + +Signed-off-by: Oliver Kästner +--- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index ca94e313f..570a88327 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -59,6 +59,9 @@ aliases { + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; + ethernet1 = &xr819; ++ mmc0 = &mmc0; /* microSD */ ++ mmc1 = &mmc1; /* XR819 WiFi */ ++ mmc2 = &mmc2; + }; + + chosen {