dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC
PATCH v2 1/3 dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC
This updates bindings for the MT7629 SPI-NOR controller.
---
Changes since v2: none.
Changes since v1: add a Reviewed-by tag.
--- Documentation/devicetree/bindings/mtd/mtk-quadspi.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/mtk-quadspi.txt +2 -1
@@ -1,4 +1,4 @@ -* Serial NOR flash controller for MTK MT81xx (and similar) +* Serial NOR flash controller for MediaTek SoCs Required properties: - compatible: For mt8173, compatible should be "mediatek,mt8173-nor",
@@ -10,6 +10,7 @@ Required properties: "mediatek,mt2712-nor", "mediatek,mt8173-nor" "mediatek,mt7622-nor", "mediatek,mt8173-nor" "mediatek,mt7623-nor", "mediatek,mt8173-nor" + "mediatek,mt7629-nor", "mediatek,mt8173-nor" "mediatek,mt8173-nor" - reg: physical base address and length of the controller's register - clocks: the phandle of the clocks needed by the nor controller
Signature · 1 line
1.9.1
PATCH v2 2/3 mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
From: Guochun Mao <[email protected]>
SNOR_HWCAPS_READ should be supported by this controller, so add this flag to spi_nor_hwcaps mask.
---
Changes since v2: Revise commit msg.
Changes since v1: none.
--- drivers/mtd/spi-nor/mtk-quadspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/mtk-quadspi.c +2 -1
@@ -431,7 +431,8 @@ static int mtk_nor_init(struct mtk_nor *mtk_nor, struct device_node *flash_node) {const struct spi_nor_hwcaps hwcaps = { - .mask =SNOR_HWCAPS_READ_FAST | + .mask =SNOR_HWCAPS_READ | +SNOR_HWCAPS_READ_FAST |SNOR_HWCAPS_READ_1_1_2 |SNOR_HWCAPS_PP , };
Signature · 1 line
1.9.1
Re: [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
Quoted 7 lines · Ryder Lee
From: Guochun Mao <[email protected]>
SNOR_HWCAPS_READshould be supported by this controller, so add this flag tospi_nor_hwcapsmask.Signed-off-by Guochun Mao <[email protected]>Signed-off-by Ryder Lee <[email protected]>
Quoted 22 lines
---
Changes since v2: Revise commit msg.
Changes since v1: none.--- drivers/mtd/spi-nor/mtk-quadspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/mtd/spi-nor/mtk-quadspi.c +2
-1@@ -431,7 +431,8 @@ static int mtk_nor_init(struct mtk_nor *mtk_nor, struct device_node *flash_node) {const struct spi_nor_hwcaps hwcaps = { - .mask =SNOR_HWCAPS_READ_FAST | + .mask =SNOR_HWCAPS_READ | +SNOR_HWCAPS_READ_FAST |SNOR_HWCAPS_READ_1_1_2 |SNOR_HWCAPS_PP , };
Boris Brezillon
AppliedRe: [v2, 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
In reply to Ryder LeeQuoted 8 lines · Ryder Lee
From: Guochun Mao <[email protected]>
SNOR_HWCAPS_READshould be supported by this controller, so add this flag tospi_nor_hwcapsmask.Signed-off-by Guochun Mao <[email protected]>Signed-off-by Ryder Lee <[email protected]>Reviewed-by Tudor Ambarus <[email protected]>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris
PATCH v2 3/3 mtd: spi-nor: mtk-quadspi: rename config to a common one
In reply to Ryder LeeThe quadspi is a generic communication interface which could be shared with other MediaTek SoCs. Hence rename it to a common one.
---
Changes since v2:
-rebase to v5.0-rc1.
-sort the config in an alphabetical order.
Changes since v1: none.
--- drivers/mtd/spi-nor/Kconfig | 16 ++++++++-------- drivers/mtd/spi-nor/Makefile | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/mtd/spi-nor/Kconfig +8 -8
@@ -7,14 +7,6 @@ menuconfig MTD_SPI_NOR if MTD_SPI_NOR -config MTD_MT81xx_NOR - tristate "Mediatek MT81xx SPI NOR flash controller" - depends on HAS_IOMEM - help - This enables access to SPI NOR flash, using MT81xx SPI NOR flash - controller. This controller does not support generic SPI BUS, it only - supports SPI NOR Flash. - config MTD_SPI_NOR_USE_4K_SECTORS bool "Use small 4096 B erase sectors" default y
@@ -66,6 +58,14 @@ config SPI_HISI_SFC help This enables support for hisilicon SPI-NOR flash controller. +config SPI_MTK_QUADSPI + tristate "MediaTek Quad SPI controller" + depends on HAS_IOMEM + help + This enables support for the Quad SPI controller in master mode. + This controller does not support generic SPI. It only supports + SPI NOR. + config SPI_NXP_SPIFI tristate "NXP SPI Flash Interface (SPIFI)" depends on OF && (ARCH_LPC18XX || COMPILE_TEST)
drivers/mtd/spi-nor/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o obj-$(CONFIG_SPI_CADENCE_QUADSPI) += cadence-quadspi.o obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o -obj-$(CONFIG_MTD_MT81xx_NOR) += mtk-quadspi.o +obj-$(CONFIG_SPI_MTK_QUADSPI) += mtk-quadspi.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o obj-$(CONFIG_SPI_INTEL_SPI) += intel-spi.o obj-$(CONFIG_SPI_INTEL_SPI_PCI) += intel-spi-pci.o
Signature · 1 line
1.9.1
Re: [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one
Quoted 4 lines · Ryder Lee
The quadspi is a generic communication interface which could be shared with other MediaTek SoCs. Hence rename it to a common one.
Signed-off-by Ryder Lee <[email protected]>
Quoted 59 lines
---
Changes since v2:(quoted diff) +0
-2-rebase to v5.0-rc1. -sort the config in an alphabetical order.Changes since v1: none.
--- drivers/mtd/spi-nor/Kconfig | 16 ++++++++-------- drivers/mtd/spi-nor/Makefile | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)drivers/mtd/spi-nor/Kconfig +8
-8@@ -7,14 +7,6 @@ menuconfig MTD_SPI_NOR if MTD_SPI_NOR -config MTD_MT81xx_NOR - tristate "Mediatek MT81xx SPI NOR flash controller" - depends on HAS_IOMEM - help - This enables access to SPI NOR flash, using MT81xx SPI NOR flash - controller. This controller does not support generic SPI BUS, it only - supports SPI NOR Flash. - config MTD_SPI_NOR_USE_4K_SECTORS bool "Use small 4096 B erase sectors" default y@@ -66,6 +58,14 @@ config SPI_HISI_SFC help This enables support for hisilicon SPI-NOR flash controller. +config SPI_MTK_QUADSPI + tristate "MediaTek Quad SPI controller" + depends on HAS_IOMEM + help + This enables support for the Quad SPI controller in master mode. + This controller does not support generic SPI. It only supports + SPI NOR. + config SPI_NXP_SPIFI tristate "NXP SPI Flash Interface (SPIFI)" depends on OF && (ARCH_LPC18XX || COMPILE_TEST)drivers/mtd/spi-nor/Makefile +1
-1@@ -4,7 +4,7 @@ obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o obj-$(CONFIG_SPI_CADENCE_QUADSPI) += cadence-quadspi.o obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o -obj-$(CONFIG_MTD_MT81xx_NOR) += mtk-quadspi.o +obj-$(CONFIG_SPI_MTK_QUADSPI) += mtk-quadspi.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o obj-$(CONFIG_SPI_INTEL_SPI) += intel-spi.o obj-$(CONFIG_SPI_INTEL_SPI_PCI) += intel-spi-pci.o
Boris Brezillon
AppliedRe: [v2,3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one
In reply to Ryder LeeQuoted 5 lines · Ryder Lee
The quadspi is a generic communication interface which could be shared with other MediaTek SoCs. Hence rename it to a common one.
Signed-off-by Ryder Lee <[email protected]>Reviewed-by Tudor Ambarus <[email protected]>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris
Boris Brezillon
AppliedQuoted 4 lines · Ryder Lee
This updates bindings for the MT7629 SPI-NOR controller.
Signed-off-by Ryder Lee <[email protected]>Reviewed-by Rob Herring <[email protected]>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris