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
6 Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
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(+)
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
27 + pinctrl-names = "default";
28 + pinctrl-0 = <&serial_nand_pins>;
32 + #address-cells = <1>;
34 + compatible = "spi-nand";
35 + spi-max-frequency = <104000000>;
39 + compatible = "fixed-partitions";
40 + #address-cells = <1>;
44 + label = "Bootloader";
45 + reg = <0x00000 0x0100000>;
51 + reg = <0x100000 0x0040000>;
56 + reg = <0x140000 0x0080000>;
61 + reg = <0x1c0000 0x1000000>;
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
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";
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>;
97 + status = "disabled";
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 = {
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,
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, },
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
144 + pinctrl-names = "default";
145 + pinctrl-0 = <&serial_nand_pins>;
149 + #address-cells = <1>;
151 + compatible = "spi-nand";
152 + spi-max-frequency = <104000000>;
156 + compatible = "fixed-partitions";
157 + #address-cells = <1>;
161 + label = "Bootloader";
162 + reg = <0x00000 0x0100000>;
168 + reg = <0x100000 0x0040000>;
173 + reg = <0x140000 0x0080000>;
177 + label = "firmware";
178 + reg = <0x1c0000 0x1000000>;
186 pinctrl-names = "default";
187 pinctrl-0 = <&spi_pins>;