You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
188 lines
4.6 KiB
Diff
188 lines
4.6 KiB
Diff
From c813fbe806257c574240770ef716fbee19f7dbfa Mon Sep 17 00:00:00 2001
|
|
From: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
|
|
Date: Thu, 6 Jun 2019 16:29:04 +0800
|
|
Subject: [PATCH] spi: spi-mem: Mediatek: Add SPI Nand support for MT7629
|
|
|
|
Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com>
|
|
---
|
|
arch/arm/boot/dts/mt7629-rfb.dts | 45 ++++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/mt7629-lynx-rfb.dts | 45 ++++++++++++++++++++++++++++++++
|
|
arch/arm/boot/dts/mt7629.dtsi | 22 ++++++++++++++++
|
|
drivers/spi/spi-mtk-snfi.c | 12 +++++++++
|
|
3 files changed, 79 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts
|
|
index 8043238fe..ef140623e 100755
|
|
--- a/arch/arm/boot/dts/mt7629-rfb.dts
|
|
+++ b/arch/arm/boot/dts/mt7629-rfb.dts
|
|
@@ -258,6 +258,51 @@
|
|
};
|
|
};
|
|
|
|
+&bch {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&snfi {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&serial_nand_pins>;
|
|
+ status = "okay";
|
|
+
|
|
+ spi_nand@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ compatible = "spi-nand";
|
|
+ spi-max-frequency = <104000000>;
|
|
+ reg = <0>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "Bootloader";
|
|
+ reg = <0x00000 0x0100000>;
|
|
+ read-only;
|
|
+ };
|
|
+
|
|
+ partition@100000 {
|
|
+ label = "Config";
|
|
+ reg = <0x100000 0x0040000>;
|
|
+ };
|
|
+
|
|
+ partition@140000 {
|
|
+ label = "factory";
|
|
+ reg = <0x140000 0x0080000>;
|
|
+ };
|
|
+
|
|
+ partition@1c0000 {
|
|
+ label = "firmware";
|
|
+ reg = <0x1c0000 0x1000000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&spi {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spi_pins>;
|
|
diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
|
|
index 53f47796b..c7bd5fc9b 100755
|
|
--- a/arch/arm/boot/dts/mt7629.dtsi
|
|
+++ b/arch/arm/boot/dts/mt7629.dtsi
|
|
@@ -259,6 +259,28 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ bch: ecc@1100e000 {
|
|
+ compatible = "mediatek,mt7622-ecc";
|
|
+ reg = <0x1100e000 0x1000>;
|
|
+ interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_LOW>;
|
|
+ clocks = <&pericfg CLK_PERI_NFIECC_PD>;
|
|
+ clock-names = "nfiecc_clk";
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ snfi: spi@1100d000 {
|
|
+ compatible = "mediatek,mt7629-snfi";
|
|
+ reg = <0x1100d000 0x1000>;
|
|
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
|
|
+ clocks = <&pericfg CLK_PERI_NFI_PD>,
|
|
+ <&pericfg CLK_PERI_SNFI_PD>;
|
|
+ clock-names = "nfi_clk", "spi_clk";
|
|
+ ecc-engine = <&bch>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
spi: spi@1100a000 {
|
|
compatible = "mediatek,mt7629-spi",
|
|
"mediatek,mt7622-spi";
|
|
diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
|
|
index cd600d9fb..113f541e6 100644
|
|
--- a/drivers/spi/spi-mtk-snfi.c
|
|
+++ b/drivers/spi/spi-mtk-snfi.c
|
|
@@ -1029,8 +1029,20 @@ static const struct mtk_snfi_caps snfi_mt7622 = {
|
|
.bad_mark_swap = 0,
|
|
};
|
|
|
|
+static const struct mtk_snfi_caps snfi_mt7629 = {
|
|
+ .spare_size = spare_size_mt7622,
|
|
+ .num_spare_size = 4,
|
|
+ .nand_sec_size = 512,
|
|
+ .nand_fdm_size = 8,
|
|
+ .nand_fdm_ecc_size = 1,
|
|
+ .ecc_parity_bits = 13,
|
|
+ .pageformat_spare_shift = 4,
|
|
+ .bad_mark_swap = 1,
|
|
+};
|
|
+
|
|
static const struct of_device_id mtk_snfi_id_table[] = {
|
|
{ .compatible = "mediatek,mt7622-snfi", .data = &snfi_mt7622, },
|
|
+ { .compatible = "mediatek,mt7629-snfi", .data = &snfi_mt7629, },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
--
|
|
2.21.0
|
|
|
|
diff --git a/arch/arm/boot/dts/mt7629-lynx-rfb.dts b/arch/arm/boot/dts/mt7629-lynx-rfb.dts
|
|
index f3fadd3..895d6c4 100755
|
|
--- a/arch/arm/boot/dts/mt7629-lynx-rfb.dts
|
|
+++ b/arch/arm/boot/dts/mt7629-lynx-rfb.dts
|
|
@@ -278,6 +278,52 @@
|
|
};
|
|
};
|
|
|
|
+&bch {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&snfi {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&serial_nand_pins>;
|
|
+ status = "okay";
|
|
+
|
|
+ spi_nand@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ compatible = "spi-nand";
|
|
+ spi-max-frequency = <104000000>;
|
|
+ reg = <0>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "Bootloader";
|
|
+ reg = <0x00000 0x0100000>;
|
|
+ read-only;
|
|
+ };
|
|
+
|
|
+ partition@100000 {
|
|
+ label = "Config";
|
|
+ reg = <0x100000 0x0040000>;
|
|
+ };
|
|
+
|
|
+ partition@140000 {
|
|
+ label = "factory";
|
|
+ reg = <0x140000 0x0080000>;
|
|
+ };
|
|
+
|
|
+ partition@1c0000 {
|
|
+ label = "firmware";
|
|
+ reg = <0x1c0000 0x1000000>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&spi {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spi_pins>;
|