forked from Openwrt-EcoNet/openwrt
25bb907937
Adapt patches adding NVMEM or fitblk rootdisk references to MMC partitions for the changed MMC card binding. Note that boards in 'dts' folder can only be converted once Linux 6.6, which still depends on the old binding, has been dropped. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
56 lines
1.2 KiB
Diff
56 lines
1.2 KiB
Diff
--- a/arch/arm/boot/dts/mediatek/mt7623n-bananapi-bpi-r2.dts
|
|
+++ b/arch/arm/boot/dts/mediatek/mt7623n-bananapi-bpi-r2.dts
|
|
@@ -26,7 +26,9 @@
|
|
|
|
chosen {
|
|
stdout-path = "serial2:115200n8";
|
|
- bootargs = "earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
|
|
+ bootargs = "root=/dev/fit0 rootwait earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200n8 console=tty1";
|
|
+ rootdisk-emmc = <&emmc_rootdisk>;
|
|
+ rootdisk-sd = <&sd_rootdisk>;
|
|
};
|
|
|
|
connector {
|
|
@@ -338,6 +340,20 @@
|
|
vmmc-supply = <®_3p3v>;
|
|
vqmmc-supply = <®_1p8v>;
|
|
non-removable;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "msdos-partitions";
|
|
+ emmc_rootdisk: block-partition-fit {
|
|
+ partno = <3>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mmc1 {
|
|
@@ -351,6 +367,20 @@
|
|
cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
|
|
vmmc-supply = <®_3p3v>;
|
|
vqmmc-supply = <®_3p3v>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "msdos-partitions";
|
|
+ sd_rootdisk: block-partition-fit {
|
|
+ partno = <3>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mt6323keys {
|