Skip to contentSkip to conversation

*** Add support for Mediatek mt762x SoC ***

PATCH New SkyLake Huang 2 participants 5 messages Jan 20, 2021 – Jan 30, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover *** Add support for Mediatek mt762x SoC ***

From: "SkyLake.Huang" <[email protected]>

This patch adds support MTK's SPI NOR controller on mt7622 & mt7629. With this controller, you can access SPI NOR with better performance on mt762x platform.

SkyLake.Huang (2):
spi: mtk_snor: add support for MTK SPI NOR controller
arm: dts: enable MTK SPI NOR controller driver

 arch/arm/dts/mt7622-rfb.dts  |  16 +-
 arch/arm/dts/mt7622.dtsi     |  11 +
 arch/arm/dts/mt7629-rfb.dts  |  16 +-
 arch/arm/dts/mt7629.dtsi     |  11 +
 configs/mt7622_rfb_defconfig |   3 +-
 configs/mt7629_rfb_defconfig |   3 +-
 drivers/spi/Kconfig          |   7 +
 drivers/spi/Makefile         |   1 +
 drivers/spi/mtk_snor.c       | 563 +++++++++++++++++++++++++++++++++++
 9 files changed, 627 insertions(+), 4 deletions(-)
 create mode 100644 drivers/spi/mtk_snor.c
Signature · 1 line
2.18.0
#1 lore raw

PATCH v2 1/2 spi: mtk_snor: add support for MTK SPI NOR controller

From: "SkyLake.Huang" <[email protected]>

This patch adds support for MTK SPI NOR controller, which you can see on mt7622 & mt7629.

1. This controller is designed only for SPI NOR. We can't adjust its bus clock dynamically. Set clock in dts instead.
2. This controller only supports 1-1-1 write mode.
3. Remove mtk_snor_match_read() since upper SPI-MEM layer already handles command.
4. sf read/write/update commands are tested with this driver.

---
 drivers/spi/Kconfig    |   7 +
 drivers/spi/Makefile   |   1 +
 drivers/spi/mtk_snor.c | 563 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 571 insertions(+)
 create mode 100644 drivers/spi/mtk_snor.c
drivers/spi/Kconfig +7 -0
index cd19b2d4b3..7417335e6a 100644
@@ -218,6 +218,13 @@ config MT7621_SPI
 	  the SPI NOR flash on platforms embedding this Ralink / MediaTek
 	  SPI core, like MT7621/7628/7688.
 
+config MTK_SNOR
+	bool "Mediatek SPI-NOR controller driver"
+	depends on SPI_MEM
+	help
+	  Enable the Mediatek SPINOR controller driver. This driver has
+          better read/write performance with NOR.
+
 config MTK_SNFI_SPI
 	bool "Mediatek SPI memory controller driver"
 	depends on SPI_MEM
drivers/spi/Makefile +1 -0
index dc9ea34c0a..d8747c1299 100644
@@ -37,6 +37,7 @@ obj-$(CONFIG_MESON_SPIFC) += meson_spifc.o
 obj-$(CONFIG_MPC8XX_SPI) += mpc8xx_spi.o
 obj-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
 obj-$(CONFIG_MTK_SNFI_SPI) += mtk_snfi_spi.o
+obj-$(CONFIG_MTK_SNOR) += mtk_snor.o
 obj-$(CONFIG_MT7621_SPI) += mt7621_spi.o
 obj-$(CONFIG_MSCC_BB_SPI) += mscc_bb_spi.o
 obj-$(CONFIG_MVEBU_A3700_SPI) += mvebu_a3700_spi.o
drivers/spi/mtk_snor.c new file +563 -0

563 lines not on this page · raw message

Signature · 1 line
2.18.0
#2 lore raw

PATCH v2 1/2 spi: mtk_snor: add support for MTK SPI NOR controller

Quoted 5 lines · SkyLake Huang

From: "SkyLake.Huang" <[email protected]>

This patch adds support for MTK SPI NOR controller, which you can see on mt7622 & mt7629.

Quoted 8 lines

1. This controller is designed only for SPI NOR. We can't adjust its bus clock dynamically. Set clock in dts instead.
2. This controller only supports 1-1-1 write mode.
3. Remove mtk_snor_match_read() since upper SPI-MEM layer already handles command.
4. sf read/write/update commands are tested with this driver.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/dcbb4f5b/attachment.sig>
#3 lore raw

PATCH v2 2/2 arm: dts: enable MTK SPI NOR controller driver

In reply to SkyLake Huang

From: "SkyLake.Huang" <[email protected]>

1. Enable MTK SPI NOR controller driver on mt7622 & mt7629.
2. Enable quad mode for read and single mode for write.

---
 arch/arm/dts/mt7622-rfb.dts  | 16 +++++++++++++++-
 arch/arm/dts/mt7622.dtsi     | 11 +++++++++++
 arch/arm/dts/mt7629-rfb.dts  | 16 +++++++++++++++-
 arch/arm/dts/mt7629.dtsi     | 11 +++++++++++
 configs/mt7622_rfb_defconfig |  3 ++-
 configs/mt7629_rfb_defconfig |  3 ++-
 6 files changed, 56 insertions(+), 4 deletions(-)
arch/arm/dts/mt7622-rfb.dts +15 -1
index ef7d0f0270..c2f1ad2011 100644
@@ -19,7 +19,7 @@
 	};
 
 	aliases {
-		spi0 = &snfi;
+		spi0 = &snor;
 	};
 
 	memory at 40000000 {
@@ -165,11 +165,25 @@
 	pinctrl-names = "default", "snfi";
 	pinctrl-0 = <&snor_pins>;
 	pinctrl-1 = <&snfi_pins>;
+	status = "disabled";
+
+	spi-flash at 0{
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		u-boot,dm-pre-reloc;
+	};
+};
+
+&snor {
+	pinctrl-names = "default";
+	pinctrl-0 = <&snor_pins>;
 	status = "okay";
 
 	spi-flash at 0{
 		compatible = "jedec,spi-nor";
 		reg = <0>;
+		spi-tx-bus-width = <1>;
+		spi-rx-bus-width = <4>;
 		u-boot,dm-pre-reloc;
 	};
 };
arch/arm/dts/mt7622.dtsi +11 -0
index 5c2e0251de..0127474c95 100644
@@ -53,6 +53,17 @@
 		#size-cells = <0>;
 	};
 
+	snor: snor at 11014000 {
+		compatible = "mediatek,mtk-snor";
+		reg = <0x11014000 0x1000>;
+		clocks = <&pericfg CLK_PERI_FLASH_PD>,
+			 <&topckgen CLK_TOP_FLASH_SEL>;
+		clock-names = "spi", "sf";
+		status = "disabled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupt-parent = <&gic>;
arch/arm/dts/mt7629-rfb.dts +15 -1
index 5cc7294de6..df43cc49c5 100644
@@ -14,7 +14,7 @@
 	compatible = "mediatek,mt7629-rfb", "mediatek,mt7629";
 
 	aliases {
-		spi0 = &snfi;
+		spi0 = &snor;
 	};
 
 	chosen {
@@ -69,11 +69,25 @@
 	pinctrl-names = "default", "snfi";
 	pinctrl-0 = <&snor_pins>;
 	pinctrl-1 = <&snfi_pins>;
+	status = "disabled";
+
+	spi-flash at 0{
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		u-boot,dm-pre-reloc;
+	};
+};
+
+&snor {
+	pinctrl-names = "default";
+	pinctrl-0 = <&snor_pins>;
 	status = "okay";
 
 	spi-flash at 0{
 		compatible = "jedec,spi-nor";
 		reg = <0>;
+		spi-tx-bus-width = <1>;
+		spi-rx-bus-width = <4>;
 		u-boot,dm-pre-reloc;
 	};
 };
arch/arm/dts/mt7629.dtsi +11 -0
index 6850e0058d..05394266e0 100644
@@ -223,6 +223,17 @@
 		#size-cells = <0>;
 	};
 
+	snor: snor at 11014000 {
+		compatible = "mediatek,mtk-snor";
+		reg = <0x11014000 0x1000>;
+		clocks = <&pericfg CLK_PERI_FLASH_PD>,
+			 <&topckgen CLK_TOP_FLASH_SEL>;
+		clock-names = "spi", "sf";
+		status = "disabled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
 	ssusbsys: ssusbsys at 1a000000 {
 		compatible = "mediatek,mt7629-ssusbsys", "syscon";
 		reg = <0x1a000000 0x1000>;
configs/mt7622_rfb_defconfig +2 -1
index ccf926e104..347f5f6b12 100644
@@ -49,7 +49,8 @@ CONFIG_DM_SERIAL=y
 CONFIG_MTK_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
-CONFIG_MTK_SNFI_SPI=y
+# CONFIG_MTK_SNFI_SPI is not set
+CONFIG_MTK_SNOR=y
 CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_TIMER=y
 CONFIG_MTK_TIMER=y
configs/mt7629_rfb_defconfig +2 -1
index d9032d4493..3691223510 100644
@@ -75,7 +75,8 @@ CONFIG_DM_SERIAL=y
 CONFIG_MTK_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
-CONFIG_MTK_SNFI_SPI=y
+# CONFIG_MTK_SNFI_SPI is not set
+CONFIG_MTK_SNOR=y
 CONFIG_SYSRESET=y
 CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_WATCHDOG=y
Signature · 1 line
2.18.0
#4 lore raw

PATCH v2 2/2 arm: dts: enable MTK SPI NOR controller driver

Quoted 6 lines · SkyLake Huang

From: "SkyLake.Huang" <[email protected]>

1. Enable MTK SPI NOR controller driver on mt7622 & mt7629.
2. Enable quad mode for read and single mode for write.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/d7f30d4b/attachment.sig>