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.dtsi    | 22 ++++++++++++++++
  10  drivers/spi/spi-mtk-snfi.c       | 12 +++++++++
  11  3 files changed, 79 insertions(+)
  12
  13 --- a/arch/arm/boot/dts/mt7629.dtsi
  14 +++ b/arch/arm/boot/dts/mt7629.dtsi
  15 @@ -259,6 +259,28 @@
  16                         status = "disabled";
  17                 };
  18
  19 +               bch: ecc@1100e000 {
  20 +                       compatible = "mediatek,mt7622-ecc";
  21 +                       reg = <0x1100e000 0x1000>;
  22 +                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_LOW>;
  23 +                       clocks = <&pericfg CLK_PERI_NFIECC_PD>;
  24 +                       clock-names = "nfiecc_clk";
  25 +                       status = "disabled";
  26 +               };
  27 +
  28 +               snfi: spi@1100d000 {
  29 +                       compatible = "mediatek,mt7629-snfi";
  30 +                       reg = <0x1100d000 0x1000>;
  31 +                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
  32 +                       clocks = <&pericfg CLK_PERI_NFI_PD>,
  33 +                                <&pericfg CLK_PERI_SNFI_PD>;
  34 +                       clock-names = "nfi_clk", "spi_clk";
  35 +                       ecc-engine = <&bch>;
  36 +                       #address-cells = <1>;
  37 +                       #size-cells = <0>;
  38 +                       status = "disabled";
  39 +               };
  40 +
  41                 spi: spi@1100a000 {
  42                         compatible = "mediatek,mt7629-spi",
  43                                      "mediatek,mt7622-spi";
  44 --- a/drivers/spi/spi-mtk-snfi.c
  45 +++ b/drivers/spi/spi-mtk-snfi.c
  46 @@ -1029,8 +1029,20 @@ static const struct mtk_snfi_caps snfi_m
  47         .bad_mark_swap = 0,
  48  };
  49
  50 +static const struct mtk_snfi_caps snfi_mt7629 = {
  51 +       .spare_size = spare_size_mt7622,
  52 +       .num_spare_size = 4,
  53 +       .nand_sec_size = 512,
  54 +       .nand_fdm_size = 8,
  55 +       .nand_fdm_ecc_size = 1,
  56 +       .ecc_parity_bits = 13,
  57 +       .pageformat_spare_shift = 4,
  58 +       .bad_mark_swap = 1,
  59 +};
  60 +
  61  static const struct of_device_id mtk_snfi_id_table[] = {
  62         { .compatible = "mediatek,mt7622-snfi", .data = &snfi_mt7622, },
  63 +       { .compatible = "mediatek,mt7629-snfi", .data = &snfi_mt7629, },
  64         {  /* sentinel */ }
  65  };
  66
  67 --- a/arch/arm/boot/dts/mt7629-rfb.dts
  68 +++ b/arch/arm/boot/dts/mt7629-rfb.dts
  69 @@ -281,6 +281,52 @@
  70         };
  71  };
  72
  73 +&bch {
  74 +       status = "okay";
  75 +};
  76 +
  77 +&snfi {
  78 +       pinctrl-names = "default";
  79 +       pinctrl-0 = <&serial_nand_pins>;
  80 +       status = "okay";
  81 +
  82 +       spi_nand@0 {
  83 +               #address-cells = <1>;
  84 +               #size-cells = <1>;
  85 +               compatible = "spi-nand";
  86 +               spi-max-frequency = <104000000>;
  87 +               reg = <0>;
  88 +
  89 +               partitions {
  90 +               compatible = "fixed-partitions";
  91 +               #address-cells = <1>;
  92 +               #size-cells = <1>;
  93 +
  94 +               partition@0 {
  95 +                       label = "Bootloader";
  96 +                       reg = <0x00000 0x0100000>;
  97 +                       read-only;
  98 +               };
  99 +
 100 +               partition@100000 {
 101 +                       label = "Config";
 102 +                       reg = <0x100000 0x0040000>;
 103 +               };
 104 +
 105 +               partition@140000 {
 106 +                       label = "factory";
 107 +                       reg = <0x140000 0x0080000>;
 108 +               };
 109 +
 110 +               partition@1c0000 {
 111 +                       label = "firmware";
 112 +                       reg = <0x1c0000 0x1000000>;
 113 +               };
 114 +
 115 +               };
 116 +       };
 117 +};
 118 +
 119  &spi {
 120         pinctrl-names = "default";
 121         pinctrl-0 = <&spi_pins>;