target/linux/mediatek/patches-4.19/0307-spi-mem-Mediatek-Add-SPI-Nand-support-for-MT7629.patch

   1 From c813fbe806257c574240770ef716fbee19f7dbfa Mon Sep 17 00:00:00 2001
   2 From: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
   3 Date: Thu, 6 Jun 2019 16:29:04 +0800
   4 Subject: [PATCH] spi: spi-mem: Mediatek: Add SPI Nand support for MT7629
   5
   6 Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
   7 ---
   8  arch/arm/boot/dts/mt7629-rfb.dts | 45 ++++++++++++++++++++++++++++++++
   9  arch/arm/boot/dts/mt7629-lynx-rfb.dts | 45 ++++++++++++++++++++++++++++++++
  10  arch/arm/boot/dts/mt7629.dtsi    | 22 ++++++++++++++++
  11  drivers/spi/spi-mtk-snfi.c       | 12 +++++++++
  12  3 files changed, 79 insertions(+)
  13
  14 diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
  15 index 8043238fe..ef140623e 100755
  16 --- a/arch/arm/boot/dts/mt7629-rfb.dts
  17 +++ b/arch/arm/boot/dts/mt7629-rfb.dts
  18 @@ -258,6 +258,51 @@
  19         };
  20  };
  21
  22 +&bch {
  23 +       status = "okay";
  24 +};
  25 +
  26 +&snfi {
  27 +       pinctrl-names = "default";
  28 +       pinctrl-0 = <&serial_nand_pins>;
  29 +       status = "okay";
  30 +
  31 +       spi_nand@0 {
  32 +               #address-cells = <1>;
  33 +               #size-cells = <1>;
  34 +               compatible = "spi-nand";
  35 +               spi-max-frequency = <104000000>;
  36 +               reg = <0>;
  37 +
  38 +               partitions {
  39 +                compatible = "fixed-partitions";
  40 +                #address-cells = <1>;
  41 +                #size-cells = <1>;
  42 +
  43 +                partition@0 {
  44 +                        label = "Bootloader";
  45 +                        reg = <0x00000 0x0100000>;
  46 +                        read-only;
  47 +                };
  48 +
  49 +                partition@100000 {
  50 +                        label = "Config";
  51 +                        reg = <0x100000 0x0040000>;
  52 +                };
  53 +
  54 +                partition@140000 {
  55 +                        label = "factory";
  56 +                        reg = <0x140000 0x0080000>;
  57 +                };
  58 +
  59 +                partition@1c0000 {
  60 +                        label = "firmware";
  61 +                        reg = <0x1c0000 0x1000000>;
  62 +                };
  63 +        };
  64 +       };
  65 +};
  66 +
  67  &spi {
  68         pinctrl-names = "default";
  69         pinctrl-0 = <&spi_pins>;
  70 diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
  71 index 53f47796b..c7bd5fc9b 100755
  72 --- a/arch/arm/boot/dts/mt7629.dtsi
  73 +++ b/arch/arm/boot/dts/mt7629.dtsi
  74 @@ -259,6 +259,28 @@
  75                         status = "disabled";
  76                 };
  77
  78 +               bch: ecc@1100e000 {
  79 +                       compatible = "mediatek,mt7622-ecc";
  80 +                       reg = <0x1100e000 0x1000>;
  81 +                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_LOW>;
  82 +                       clocks = <&pericfg CLK_PERI_NFIECC_PD>;
  83 +                       clock-names = "nfiecc_clk";
  84 +                       status = "disabled";
  85 +               };
  86 +
  87 +               snfi: spi@1100d000 {
  88 +                       compatible = "mediatek,mt7629-snfi";
  89 +                       reg = <0x1100d000 0x1000>;
  90 +                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
  91 +                       clocks = <&pericfg CLK_PERI_NFI_PD>,
  92 +                                <&pericfg CLK_PERI_SNFI_PD>;
  93 +                       clock-names = "nfi_clk", "spi_clk";
  94 +                       ecc-engine = <&bch>;
  95 +                       #address-cells = <1>;
  96 +                       #size-cells = <0>;
  97 +                       status = "disabled";
  98 +               };
  99 +
 100                 spi: spi@1100a000 {
 101                         compatible = "mediatek,mt7629-spi",
 102                                      "mediatek,mt7622-spi";
 103 diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
 104 index cd600d9fb..113f541e6 100644
 105 --- a/drivers/spi/spi-mtk-snfi.c
 106 +++ b/drivers/spi/spi-mtk-snfi.c
 107 @@ -1029,8 +1029,20 @@ static const struct mtk_snfi_caps snfi_mt7622 = {
 108         .bad_mark_swap = 0,
 109  };
 110
 111 +static const struct mtk_snfi_caps snfi_mt7629 = {
 112 +       .spare_size = spare_size_mt7622,
 113 +       .num_spare_size = 4,
 114 +       .nand_sec_size = 512,
 115 +       .nand_fdm_size = 8,
 116 +       .nand_fdm_ecc_size = 1,
 117 +       .ecc_parity_bits = 13,
 118 +       .pageformat_spare_shift = 4,
 119 +       .bad_mark_swap = 1,
 120 +};
 121 +
 122  static const struct of_device_id mtk_snfi_id_table[] = {
 123         { .compatible = "mediatek,mt7622-snfi", .data = &snfi_mt7622, },
 124 +       { .compatible = "mediatek,mt7629-snfi", .data = &snfi_mt7629, },
 125         {  /* sentinel */ }
 126  };
 127
 128 --
 129 2.21.0
 130
 131 diff --git a/arch/arm/boot/dts/mt7629-lynx-rfb.dts b/arch/arm/boot/dts/mt7629-lynx-rfb.dts
 132 index f3fadd3..895d6c4 100755
 133 --- a/arch/arm/boot/dts/mt7629-lynx-rfb.dts
 134 +++ b/arch/arm/boot/dts/mt7629-lynx-rfb.dts
 135 @@ -278,6 +278,52 @@
 136         };
 137  };
 138
 139 +&bch {
 140 +       status = "okay";
 141 +};
 142 +
 143 +&snfi {
 144 +       pinctrl-names = "default";
 145 +       pinctrl-0 = <&serial_nand_pins>;
 146 +       status = "okay";
 147 +
 148 +       spi_nand@0 {
 149 +               #address-cells = <1>;
 150 +               #size-cells = <1>;
 151 +               compatible = "spi-nand";
 152 +               spi-max-frequency = <104000000>;
 153 +               reg = <0>;
 154 +
 155 +               partitions {
 156 +               compatible = "fixed-partitions";
 157 +               #address-cells = <1>;
 158 +               #size-cells = <1>;
 159 +
 160 +               partition@0 {
 161 +                       label = "Bootloader";
 162 +                       reg = <0x00000 0x0100000>;
 163 +                       read-only;
 164 +               };
 165 +
 166 +               partition@100000 {
 167 +                       label = "Config";
 168 +                       reg = <0x100000 0x0040000>;
 169 +               };
 170 +
 171 +               partition@140000 {
 172 +                       label = "factory";
 173 +                       reg = <0x140000 0x0080000>;
 174 +               };
 175 +
 176 +               partition@1c0000 {
 177 +                       label = "firmware";
 178 +                       reg = <0x1c0000 0x1000000>;
 179 +               };
 180 +
 181 +               };
 182 +       };
 183 +};
 184 +
 185  &spi {
 186         pinctrl-names = "default";
 187         pinctrl-0 = <&spi_pins>;