target/linux/mediatek/patches-6.1/196-dts-mt7986a-bpi-r3-use-all-ubi-nand-layout.patch

   1 --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
   2 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
   3 @@ -23,7 +23,27 @@
   4                         no-sd;
   5                         no-sdio;
   6                         status = "okay";
   7 +
   8 +                       card@0 {
   9 +                               compatible = "mmc-card";
  10 +                               reg = <0>;
  11 +
  12 +                               block {
  13 +                                       compatible = "block-device";
  14 +                                       partitions {
  15 +                                               emmc_rootdisk: block-partition-production {
  16 +                                                       partname = "production";
  17 +                                               };
  18 +                                       };
  19 +                               };
  20 +                       };
  21                 };
  22         };
  23 -};
  24
  25 +       fragment@1 {
  26 +               target-path = "/chosen";
  27 +               __overlay__ {
  28 +                       rootdisk-emmc = <&emmc_rootdisk>;
  29 +               };
  30 +       };
  31 +};
  32 --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
  33 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
  34 @@ -29,27 +29,30 @@
  35
  36                                         partition@0 {
  37                                                 label = "bl2";
  38 -                                               reg = <0x0 0x100000>;
  39 +                                               reg = <0x0 0x200000>;
  40                                                 read-only;
  41                                         };
  42
  43 -                                       partition@100000 {
  44 -                                               label = "reserved";
  45 -                                               reg = <0x100000 0x280000>;
  46 -                                       };
  47 -
  48 -                                       partition@380000 {
  49 -                                               label = "fip";
  50 -                                               reg = <0x380000 0x200000>;
  51 -                                               read-only;
  52 -                                       };
  53 -
  54 -                                       partition@580000 {
  55 +                                       partition@200000 {
  56                                                 label = "ubi";
  57 -                                               reg = <0x580000 0x7a80000>;
  58 +                                               reg = <0x200000 0x7e00000>;
  59 +                                               compatible = "linux,ubi";
  60 +
  61 +                                               volumes {
  62 +                                                       nand_rootdisk: ubi-volume-fit {
  63 +                                                               volname = "fit";
  64 +                                                       };
  65 +                                               };
  66                                         };
  67                                 };
  68                         };
  69                 };
  70         };
  71 +
  72 +       fragment@1 {
  73 +               target-path = "/chosen";
  74 +               __overlay__ {
  75 +                       rootdisk-spim-nand = <&nand_rootdisk>;
  76 +               };
  77 +       };
  78  };
  79 --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
  80 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
  81 @@ -52,7 +52,7 @@
  82                                                 reg = <0x180000 0xa80000>;
  83                                         };
  84
  85 -                                       partition@c00000 {
  86 +                                       nor_rootdisk: partition@c00000 {
  87                                                 label = "fit";
  88                                                 reg = <0xc00000 0x1400000>;
  89                                                 compatible = "denx,fit";
  90 @@ -61,4 +61,11 @@
  91                         };
  92                 };
  93         };
  94 +
  95 +       fragment@1 {
  96 +               target-path = "/chosen";
  97 +               __overlay__ {
  98 +                       rootdisk-nor = <&nor_rootdisk>;
  99 +               };
 100 +       };
 101  };
 102 --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
 103 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
 104 @@ -17,6 +17,27 @@
 105                         max-frequency = <52000000>;
 106                         cap-sd-highspeed;
 107                         status = "okay";
 108 +
 109 +                       card@0 {
 110 +                               compatible = "mmc-card";
 111 +                               reg = <0>;
 112 +
 113 +                               block {
 114 +                                       compatible = "block-device";
 115 +                                       partitions {
 116 +                                               sd_rootdisk: block-partition-production {
 117 +                                                       partname = "production";
 118 +                                               };
 119 +                                       };
 120 +                               };
 121 +                       };
 122 +               };
 123 +       };
 124 +
 125 +       fragment@1 {
 126 +               target-path = "/chosen";
 127 +               __overlay__ {
 128 +                       rootdisk-sd = <&sd_rootdisk>;
 129                 };
 130         };
 131  };