mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 19:46:51 +00:00
2ad898e091
Removed upstreamed: generic/backport-6.1/789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch [1] generic/backport-6.1/789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch [2] generic/backport-6.1/789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch [3] generic/pending-6.1/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch [4] generic/pending-6.1/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch [5] Manual adjusted the following patches: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=be4512b9ac6fc53e1ca8daccbda84f643215c547 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f1fa919ea59655f73cb3972264e157b8831ba546 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=86c0c154a759f2af9612a04bdf29110f02dce956 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=6b62bad2da1b338f452a9380639fc9b093d75a25 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f78807362828ad01db2a9ed005bf79501b620f27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
104 lines
2.1 KiB
Diff
104 lines
2.1 KiB
Diff
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
@@ -32,6 +32,9 @@
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
|
|
+ rootdisk-emmc = <&emmc_rootfs>;
|
|
+ rootdisk-sd = <&sd_rootfs>;
|
|
+ rootdisk-snfi = <&ubi_rootfs>;
|
|
};
|
|
|
|
cpus {
|
|
@@ -234,6 +237,26 @@
|
|
assigned-clocks = <&topckgen CLK_TOP_MSDC30_0_SEL>;
|
|
assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
|
|
non-removable;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ block-partition-env {
|
|
+ partname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-layout";
|
|
+ };
|
|
+ };
|
|
+ emmc_rootfs: block-partition-production {
|
|
+ partname = "production";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mmc1 {
|
|
@@ -250,6 +273,26 @@
|
|
vqmmc-supply = <®_3p3v>;
|
|
assigned-clocks = <&topckgen CLK_TOP_MSDC30_1_SEL>;
|
|
assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ block-partition-env {
|
|
+ partname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-layout";
|
|
+ };
|
|
+ };
|
|
+ sd_rootfs: block-partition-production {
|
|
+ partname = "production";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&nandc {
|
|
@@ -284,14 +327,29 @@
|
|
};
|
|
|
|
partition@80000 {
|
|
- label = "fip";
|
|
- reg = <0x80000 0x200000>;
|
|
- read-only;
|
|
- };
|
|
-
|
|
- ubi: partition@280000 {
|
|
label = "ubi";
|
|
- reg = <0x280000 0x7d80000>;
|
|
+ reg = <0x80000 0x7f80000>;
|
|
+ compatible = "linux,ubi";
|
|
+
|
|
+ volumes {
|
|
+ ubi-volume-ubootenv {
|
|
+ volname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-redundant-bool-layout";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ ubi-volume-ubootenv2 {
|
|
+ volname = "ubootenv2";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-redundant-bool-layout";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ ubi_rootfs: ubi-volume-fit {
|
|
+ volname = "fit";
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
};
|