From 1506632a0b2b63dd94784b1a4d0cb7c97fbe0b8e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 15 Aug 2023 12:58:14 -0500
Subject: [PATCH] BeagleV-Fire: make sure mmc0 is mmc0

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 06_generate_debian_console_root.sh               |  6 +++---
 patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi  |  1 -
 patches/linux/dts/mpfs-beaglev-fire.dts          | 15 ++++++---------
 patches/linux/mainline/dts/mpfs-beaglev-fire.dts |  4 +---
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh
index c39781e..3c40a80 100755
--- a/06_generate_debian_console_root.sh
+++ b/06_generate_debian_console_root.sh
@@ -39,7 +39,7 @@ sync
 mkdir -p ./deploy/input/ || true
 echo "label Linux eMMC" > ./deploy/input/extlinux.conf
 echo "    kernel /Image" >> ./deploy/input/extlinux.conf
-echo "    append root=/dev/mmcblk1p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf
+echo "    append root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf
 echo "    fdtdir /" >> ./deploy/input/extlinux.conf
 echo "    fdt /mpfs-beaglev-fire.dtb" >> ./deploy/input/extlinux.conf
 echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
@@ -49,8 +49,8 @@ cat ./deploy/input/extlinux.conf
 
 mkdir -p ./ignore/.root/boot/firmware/ || true
 
-echo '/dev/mmcblk1p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
-echo '/dev/mmcblk1p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk0p2  /boot/firmware/ auto  defaults  0  2' >> ./ignore/.root/etc/fstab
+echo '/dev/mmcblk0p3  /  auto  errors=remount-ro  0  1' >> ./ignore/.root/etc/fstab
 echo 'debugfs  /sys/kernel/debug  debugfs  mode=755,uid=root,gid=gpio,defaults  0  0' >> ./ignore/.root/etc/fstab
 
 rm -rf ./ignore/.root/usr/lib/systemd/system/bb-usb-gadgets.service || true
diff --git a/patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi b/patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi
index c6f2c7e..ebe9532 100644
--- a/patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi
+++ b/patches/linux/dts/mpfs-beaglev-fire-fabric.dtsi
@@ -153,4 +153,3 @@
 		      "dll0_ref", "dll1_ref";
 	status = "okay";
 };
-
diff --git a/patches/linux/dts/mpfs-beaglev-fire.dts b/patches/linux/dts/mpfs-beaglev-fire.dts
index 0c60892..120709f 100644
--- a/patches/linux/dts/mpfs-beaglev-fire.dts
+++ b/patches/linux/dts/mpfs-beaglev-fire.dts
@@ -3,9 +3,9 @@
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include "mpfs.dtsi"
 #include "mpfs-beaglev-fire-fabric.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 /* Clock frequency (in Hz) of the rtcclk */
 #define RTCCLK_FREQ		1000000
@@ -25,6 +25,7 @@
 	};
 
 	aliases {
+		mmc0 = &mmc;
 		ethernet0 = &mac1;
 		serial0 = &mmuart0;
 		serial1 = &mmuart1;
@@ -113,14 +114,11 @@
 		regulator-max-microvolt = <1200000>;
 	};
 
-
 	imx219_clk: camera-clk {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <24000000>;
 	};
-
-
 };
 
 &gpio0 {
@@ -230,16 +228,14 @@
 			};
 		};
 	};
-
-
-
 };
 
 &mac0 {
 	dma-noncoherent;
-	status = "okay";
 	phy-mode = "sgmii";
 	phy-handle = <&phy0>;
+	status = "okay";
+
 	phy0: ethernet-phy@0 {
 		reg = <0>;
 	};
@@ -247,9 +243,10 @@
 
 &mac1 {
 	dma-noncoherent;
-	status = "okay";
 	phy-mode = "sgmii";
 	phy-handle = <&phy1>;
+	status = "okay";
+
 	phy1: ethernet-phy@0 {
 		reg = <0>;
 	};
diff --git a/patches/linux/mainline/dts/mpfs-beaglev-fire.dts b/patches/linux/mainline/dts/mpfs-beaglev-fire.dts
index 451ae70..f66a39b 100644
--- a/patches/linux/mainline/dts/mpfs-beaglev-fire.dts
+++ b/patches/linux/mainline/dts/mpfs-beaglev-fire.dts
@@ -26,6 +26,7 @@
 	};
 
 	aliases {
+		mmc0 = &mmc;
 		ethernet0 = &mac1;
 		serial0 = &mmuart0;
 		serial1 = &mmuart1;
@@ -114,14 +115,11 @@
 		regulator-max-microvolt = <1200000>;
 	};
 
-
 	imx219_clk: camera-clk {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <24000000>;
 	};
-
-
 };
 
 &gpio0 {