kernel/mediatek: 6.12: adapt for changed MMC card binding
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>
This commit is contained in:
parent
b09c0d2680
commit
25bb907937
3 changed files with 98 additions and 122 deletions
|
@ -11,7 +11,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
connector {
|
connector {
|
||||||
@@ -338,6 +340,22 @@
|
@@ -338,6 +340,20 @@
|
||||||
vmmc-supply = <®_3p3v>;
|
vmmc-supply = <®_3p3v>;
|
||||||
vqmmc-supply = <®_1p8v>;
|
vqmmc-supply = <®_1p8v>;
|
||||||
non-removable;
|
non-removable;
|
||||||
|
@ -22,19 +22,17 @@
|
||||||
+ compatible = "mmc-card";
|
+ compatible = "mmc-card";
|
||||||
+ reg = <0>;
|
+ reg = <0>;
|
||||||
+
|
+
|
||||||
+ block {
|
+ partitions {
|
||||||
+ compatible = "block-device";
|
+ compatible = "msdos-partitions";
|
||||||
+ partitions {
|
+ emmc_rootdisk: block-partition-fit {
|
||||||
+ emmc_rootdisk: block-partition-fit {
|
+ partno = <3>;
|
||||||
+ partno = <3>;
|
|
||||||
+ };
|
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
};
|
};
|
||||||
|
|
||||||
&mmc1 {
|
&mmc1 {
|
||||||
@@ -351,6 +369,22 @@
|
@@ -351,6 +367,20 @@
|
||||||
cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
|
cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
|
||||||
vmmc-supply = <®_3p3v>;
|
vmmc-supply = <®_3p3v>;
|
||||||
vqmmc-supply = <®_3p3v>;
|
vqmmc-supply = <®_3p3v>;
|
||||||
|
@ -45,12 +43,10 @@
|
||||||
+ compatible = "mmc-card";
|
+ compatible = "mmc-card";
|
||||||
+ reg = <0>;
|
+ reg = <0>;
|
||||||
+
|
+
|
||||||
+ block {
|
+ partitions {
|
||||||
+ compatible = "block-device";
|
+ compatible = "msdos-partitions";
|
||||||
+ partitions {
|
+ sd_rootdisk: block-partition-fit {
|
||||||
+ sd_rootdisk: block-partition-fit {
|
+ partno = <3>;
|
||||||
+ partno = <3>;
|
|
||||||
+ };
|
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
@@ -419,27 +423,27 @@
|
@@ -418,27 +422,27 @@
|
||||||
|
|
||||||
port@1 {
|
port@1 {
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
phy-mode = "2500base-x";
|
phy-mode = "2500base-x";
|
||||||
sfp = <&sfp2>;
|
sfp = <&sfp2>;
|
||||||
managed = "in-band-status";
|
managed = "in-band-status";
|
||||||
@@ -490,9 +494,137 @@
|
@@ -489,9 +493,137 @@
|
||||||
|
|
||||||
&wifi {
|
&wifi {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
@ -187,10 +187,10 @@
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
||||||
@@ -55,6 +55,7 @@
|
@@ -55,6 +55,7 @@
|
||||||
partition@c00000 {
|
partition@c00000 {
|
||||||
label = "fit";
|
label = "fit";
|
||||||
reg = <0xc00000 0x1400000>;
|
reg = <0xc00000 0x1400000>;
|
||||||
+ compatible = "denx,fit";
|
+ compatible = "denx,fit";
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
|
@ -1,135 +1,115 @@
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
|
||||||
@@ -23,7 +23,29 @@
|
@@ -21,5 +21,24 @@
|
||||||
no-sd;
|
non-removable;
|
||||||
no-sdio;
|
no-sd;
|
||||||
status = "okay";
|
no-sdio;
|
||||||
+ #address-cells = <1>;
|
+ #address-cells = <1>;
|
||||||
+ #size-cells = <0>;
|
+ #size-cells = <0>;
|
||||||
|
status = "okay";
|
||||||
+
|
+
|
||||||
+ card@0 {
|
+ card@0 {
|
||||||
+ compatible = "mmc-card";
|
+ compatible = "mmc-card";
|
||||||
+ reg = <0>;
|
+ reg = <0>;
|
||||||
+
|
+
|
||||||
+ block {
|
+ partitions {
|
||||||
+ compatible = "block-device";
|
+ compatible = "gpt-partitions";
|
||||||
+ partitions {
|
+
|
||||||
+ emmc_rootdisk: block-partition-production {
|
+ emmc_rootdisk: block-partition-production {
|
||||||
+ partname = "production";
|
+ partname = "production";
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
+ };
|
||||||
};
|
|
||||||
};
|
|
||||||
-};
|
|
||||||
|
|
||||||
+ fragment@1 {
|
|
||||||
+ target-path = "/chosen";
|
|
||||||
+ __overlay__ {
|
|
||||||
+ rootdisk-emmc = <&emmc_rootdisk>;
|
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+};
|
+};
|
||||||
|
+
|
||||||
|
+&{/chosen} {
|
||||||
|
+ rootdisk-emmc = <&emmc_rootdisk>;
|
||||||
|
};
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
|
||||||
@@ -29,27 +29,30 @@
|
@@ -29,25 +29,24 @@
|
||||||
|
|
||||||
partition@0 {
|
partition@0 {
|
||||||
label = "bl2";
|
label = "bl2";
|
||||||
- reg = <0x0 0x100000>;
|
- reg = <0x0 0x100000>;
|
||||||
+ reg = <0x0 0x200000>;
|
- read-only;
|
||||||
read-only;
|
+ reg = <0x0 0x200000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
- partition@100000 {
|
- partition@100000 {
|
||||||
- label = "reserved";
|
- label = "reserved";
|
||||||
- reg = <0x100000 0x280000>;
|
- reg = <0x100000 0x280000>;
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
- partition@380000 {
|
- partition@380000 {
|
||||||
- label = "fip";
|
- label = "fip";
|
||||||
- reg = <0x380000 0x200000>;
|
- reg = <0x380000 0x200000>;
|
||||||
- read-only;
|
- read-only;
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
- partition@580000 {
|
- partition@580000 {
|
||||||
+ partition@200000 {
|
+ partition@200000 {
|
||||||
label = "ubi";
|
label = "ubi";
|
||||||
- reg = <0x580000 0x7a80000>;
|
- reg = <0x580000 0x7a80000>;
|
||||||
+ reg = <0x200000 0x7e00000>;
|
+ reg = <0x200000 0x7e00000>;
|
||||||
+ compatible = "linux,ubi";
|
+ compatible = "linux,ubi";
|
||||||
+
|
+
|
||||||
+ volumes {
|
+ volumes {
|
||||||
+ nand_rootdisk: ubi-volume-fit {
|
+ nand_rootdisk: ubi-volume-fit {
|
||||||
+ volname = "fit";
|
+ volname = "fit";
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
+
|
|
||||||
+ fragment@1 {
|
|
||||||
+ target-path = "/chosen";
|
|
||||||
+ __overlay__ {
|
|
||||||
+ rootdisk-spim-nand = <&nand_rootdisk>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
};
|
};
|
||||||
|
+
|
||||||
|
+&{/chosen} {
|
||||||
|
+ rootdisk-spim-nand = <&nand_rootdisk>;
|
||||||
|
+};
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
|
||||||
@@ -52,7 +52,7 @@
|
@@ -52,7 +52,7 @@
|
||||||
reg = <0x180000 0xa80000>;
|
reg = <0x180000 0xa80000>;
|
||||||
};
|
|
||||||
|
|
||||||
- partition@c00000 {
|
|
||||||
+ nor_rootdisk: partition@c00000 {
|
|
||||||
label = "fit";
|
|
||||||
reg = <0xc00000 0x1400000>;
|
|
||||||
compatible = "denx,fit";
|
|
||||||
@@ -61,4 +61,11 @@
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
- partition@c00000 {
|
||||||
|
+ nor_rootdisk: partition@c00000 {
|
||||||
|
label = "fit";
|
||||||
|
reg = <0xc00000 0x1400000>;
|
||||||
|
compatible = "denx,fit";
|
||||||
|
@@ -60,3 +60,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
+
|
|
||||||
+ fragment@1 {
|
|
||||||
+ target-path = "/chosen";
|
|
||||||
+ __overlay__ {
|
|
||||||
+ rootdisk-nor = <&nor_rootdisk>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
};
|
};
|
||||||
|
+
|
||||||
|
+&{/chosen} {
|
||||||
|
+ rootdisk-nor = <&nor_rootdisk>;
|
||||||
|
+};
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
|
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
|
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
|
||||||
@@ -17,6 +17,29 @@
|
@@ -15,5 +15,24 @@
|
||||||
max-frequency = <52000000>;
|
bus-width = <4>;
|
||||||
cap-sd-highspeed;
|
max-frequency = <52000000>;
|
||||||
status = "okay";
|
cap-sd-highspeed;
|
||||||
+ #address-cells = <1>;
|
+ #address-cells = <1>;
|
||||||
+ #size-cells = <0>;
|
+ #size-cells = <0>;
|
||||||
|
status = "okay";
|
||||||
+
|
+
|
||||||
+ card@0 {
|
+ card@0 {
|
||||||
+ compatible = "mmc-card";
|
+ compatible = "mmc-card";
|
||||||
+ reg = <0>;
|
+ reg = <0>;
|
||||||
+
|
+
|
||||||
+ block {
|
+ partitions {
|
||||||
+ compatible = "block-device";
|
+ compatible = "gpt-partitions";
|
||||||
+ partitions {
|
+
|
||||||
+ sd_rootdisk: block-partition-production {
|
+ sd_rootdisk: block-partition-production {
|
||||||
+ partname = "production";
|
+ partname = "production";
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
+ };
|
+ };
|
||||||
|
+};
|
||||||
+
|
+
|
||||||
+ fragment@1 {
|
+&{/chosen} {
|
||||||
+ target-path = "/chosen";
|
+ rootdisk-sd = <&sd_rootdisk>;
|
||||||
+ __overlay__ {
|
|
||||||
+ rootdisk-sd = <&sd_rootdisk>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue