target/linux/mediatek/patches-6.6/911-dts-mt7622-bpi-r64-add-rootdisk.patch

   1 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
   2 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
   3 @@ -32,6 +32,9 @@
   4         chosen {
   5                 stdout-path = "serial0:115200n8";
   6                 bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
   7 +               rootdisk-emmc = <&emmc_rootfs>;
   8 +               rootdisk-sd = <&sd_rootfs>;
   9 +               rootdisk-snfi = <&ubi_rootfs>;
  10         };
  11
  12         cpus {
  13 @@ -233,6 +236,26 @@
  14         assigned-clocks = <&topckgen CLK_TOP_MSDC30_0_SEL>;
  15         assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
  16         non-removable;
  17 +
  18 +       card@0 {
  19 +               compatible = "mmc-card";
  20 +               reg = <0>;
  21 +
  22 +               block {
  23 +                       compatible = "block-device";
  24 +                       partitions {
  25 +                               block-partition-env {
  26 +                                       partname = "ubootenv";
  27 +                                       nvmem-layout {
  28 +                                               compatible = "u-boot,env-layout";
  29 +                                       };
  30 +                               };
  31 +                               emmc_rootfs: block-partition-production {
  32 +                                       partname = "production";
  33 +                               };
  34 +                       };
  35 +               };
  36 +       };
  37  };
  38
  39  &mmc1 {
  40 @@ -249,6 +272,26 @@
  41         vqmmc-supply = <&reg_3p3v>;
  42         assigned-clocks = <&topckgen CLK_TOP_MSDC30_1_SEL>;
  43         assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
  44 +
  45 +       card@0 {
  46 +               compatible = "mmc-card";
  47 +               reg = <0>;
  48 +
  49 +               block {
  50 +                       compatible = "block-device";
  51 +                       partitions {
  52 +                               block-partition-env {
  53 +                                       partname = "ubootenv";
  54 +                                       nvmem-layout {
  55 +                                               compatible = "u-boot,env-layout";
  56 +                                       };
  57 +                               };
  58 +                               sd_rootfs: block-partition-production {
  59 +                                       partname = "production";
  60 +                               };
  61 +                       };
  62 +               };
  63 +       };
  64  };
  65
  66  &nandc {
  67 @@ -283,14 +326,29 @@
  68                         };
  69
  70                         partition@80000 {
  71 -                               label = "fip";
  72 -                               reg = <0x80000 0x200000>;
  73 -                               read-only;
  74 -                       };
  75 -
  76 -                       ubi: partition@280000 {
  77                                 label = "ubi";
  78 -                               reg = <0x280000 0x7d80000>;
  79 +                               reg = <0x80000 0x7f80000>;
  80 +                               compatible = "linux,ubi";
  81 +
  82 +                               volumes {
  83 +                                       ubi-volume-ubootenv {
  84 +                                               volname = "ubootenv";
  85 +                                               nvmem-layout {
  86 +                                                       compatible = "u-boot,env-redundant-bool-layout";
  87 +                                               };
  88 +                                       };
  89 +
  90 +                                       ubi-volume-ubootenv2 {
  91 +                                               volname = "ubootenv2";
  92 +                                               nvmem-layout {
  93 +                                                       compatible = "u-boot,env-redundant-bool-layout";
  94 +                                               };
  95 +                                       };
  96 +
  97 +                                       ubi_rootfs: ubi-volume-fit {
  98 +                                               volname = "fit";
  99 +                                       };
 100 +                               };
 101                         };
 102                 };
 103         };