* [PATCH v2 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC
@ 2019-01-16 2:12 Ryder Lee
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Ryder Lee @ 2019-01-16 2:12 UTC (permalink / raw)
To: Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Ryder Lee, Weijie Gao, linux-kernel, Rob Herring,
linux-mtd, linux-mediatek, linux-arm-kernel
This updates bindings for the MT7629 SPI-NOR controller.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
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(-)
diff --git a/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt b/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt
index 56d3668..a12e3b5 100644
--- a/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt
+++ b/Documentation/devicetree/bindings/mtd/mtk-quadspi.txt
@@ -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
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
2019-01-16 2:12 [PATCH v2 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Ryder Lee
@ 2019-01-16 2:12 ` Ryder Lee
2019-01-16 6:05 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
2019-01-16 2:12 ` [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one Ryder Lee
2019-01-19 15:43 ` [v2, 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Boris Brezillon
2 siblings, 2 replies; 8+ messages in thread
From: Ryder Lee @ 2019-01-16 2:12 UTC (permalink / raw)
To: Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Ryder Lee, Guochun Mao, Weijie Gao, linux-kernel,
Rob Herring, linux-mtd, linux-mediatek, linux-arm-kernel
From: Guochun Mao <guochun.mao@mediatek.com>
SNOR_HWCAPS_READ should be supported by this controller, so add this
flag to spi_nor_hwcaps mask.
Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
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(-)
diff --git a/drivers/mtd/spi-nor/mtk-quadspi.c b/drivers/mtd/spi-nor/mtk-quadspi.c
index 5442993..d9eed68 100644
--- a/drivers/mtd/spi-nor/mtk-quadspi.c
+++ b/drivers/mtd/spi-nor/mtk-quadspi.c
@@ -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,
};
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
@ 2019-01-16 6:05 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
1 sibling, 0 replies; 8+ messages in thread
From: Tudor.Ambarus @ 2019-01-16 6:05 UTC (permalink / raw)
To: ryder.lee, marek.vasut, computersforpeace, boris.brezillon
Cc: devicetree, guochun.mao, weijie.gao, linux-kernel, robh+dt,
linux-mtd, linux-mediatek, linux-arm-kernel
On 01/16/2019 04:12 AM, Ryder Lee wrote:
> From: Guochun Mao <guochun.mao@mediatek.com>
>
> SNOR_HWCAPS_READ should be supported by this controller, so add this
> flag to spi_nor_hwcaps mask.
>
> Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> 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(-)
>
> diff --git a/drivers/mtd/spi-nor/mtk-quadspi.c b/drivers/mtd/spi-nor/mtk-quadspi.c
> index 5442993..d9eed68 100644
> --- a/drivers/mtd/spi-nor/mtk-quadspi.c
> +++ b/drivers/mtd/spi-nor/mtk-quadspi.c
> @@ -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,
> };
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [v2, 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
2019-01-16 6:05 ` Tudor.Ambarus
@ 2019-01-19 15:42 ` Boris Brezillon
1 sibling, 0 replies; 8+ messages in thread
From: Boris Brezillon @ 2019-01-19 15:42 UTC (permalink / raw)
To: Ryder Lee, Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Guochun Mao, Boris Brezillon, Weijie Gao,
linux-kernel, Rob Herring, linux-mtd, linux-mediatek,
linux-arm-kernel
On Wed, 2019-01-16 at 02:12:04 UTC, Ryder Lee wrote:
> From: Guochun Mao <guochun.mao@mediatek.com>
>
> SNOR_HWCAPS_READ should be supported by this controller, so add this
> flag to spi_nor_hwcaps mask.
>
> Signed-off-by: Guochun Mao <guochun.mao@mediatek.com>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one
2019-01-16 2:12 [PATCH v2 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Ryder Lee
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
@ 2019-01-16 2:12 ` Ryder Lee
2019-01-16 6:06 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
2019-01-19 15:43 ` [v2, 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Boris Brezillon
2 siblings, 2 replies; 8+ messages in thread
From: Ryder Lee @ 2019-01-16 2:12 UTC (permalink / raw)
To: Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Ryder Lee, Weijie Gao, linux-kernel, Rob Herring,
linux-mtd, linux-mediatek, linux-arm-kernel
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 <ryder.lee@mediatek.com>
---
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(-)
diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig
index 44fe801..414e887 100644
--- a/drivers/mtd/spi-nor/Kconfig
+++ b/drivers/mtd/spi-nor/Kconfig
@@ -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)
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index a552efd..4e4d400 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -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
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one
2019-01-16 2:12 ` [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one Ryder Lee
@ 2019-01-16 6:06 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
1 sibling, 0 replies; 8+ messages in thread
From: Tudor.Ambarus @ 2019-01-16 6:06 UTC (permalink / raw)
To: ryder.lee, marek.vasut, computersforpeace, boris.brezillon
Cc: devicetree, weijie.gao, linux-kernel, robh+dt, linux-mtd,
linux-mediatek, linux-arm-kernel
On 01/16/2019 04:12 AM, Ryder Lee wrote:
> 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 <ryder.lee@mediatek.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> 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(-)
>
> diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig
> index 44fe801..414e887 100644
> --- a/drivers/mtd/spi-nor/Kconfig
> +++ b/drivers/mtd/spi-nor/Kconfig
> @@ -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)
> diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
> index a552efd..4e4d400 100644
> --- a/drivers/mtd/spi-nor/Makefile
> +++ b/drivers/mtd/spi-nor/Makefile
> @@ -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
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [v2, 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one
2019-01-16 2:12 ` [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one Ryder Lee
2019-01-16 6:06 ` Tudor.Ambarus
@ 2019-01-19 15:42 ` Boris Brezillon
1 sibling, 0 replies; 8+ messages in thread
From: Boris Brezillon @ 2019-01-19 15:42 UTC (permalink / raw)
To: Ryder Lee, Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Boris Brezillon, Weijie Gao, linux-kernel,
Rob Herring, linux-mtd, linux-mediatek, linux-arm-kernel
On Wed, 2019-01-16 at 02:12:05 UTC, Ryder Lee wrote:
> 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 <ryder.lee@mediatek.com>
> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [v2, 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC
2019-01-16 2:12 [PATCH v2 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Ryder Lee
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
2019-01-16 2:12 ` [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one Ryder Lee
@ 2019-01-19 15:43 ` Boris Brezillon
2 siblings, 0 replies; 8+ messages in thread
From: Boris Brezillon @ 2019-01-19 15:43 UTC (permalink / raw)
To: Ryder Lee, Marek Vasut, Brian Norris, Boris Brezillon
Cc: devicetree, Boris Brezillon, Weijie Gao, linux-kernel,
Rob Herring, linux-mtd, linux-mediatek, linux-arm-kernel
On Wed, 2019-01-16 at 02:12:03 UTC, Ryder Lee wrote:
> This updates bindings for the MT7629 SPI-NOR controller.
>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
Applied to http://git.infradead.org/linux-mtd.git spi-nor/next, thanks.
Boris
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-01-19 16:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-16 2:12 [PATCH v2 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Ryder Lee
2019-01-16 2:12 ` [PATCH v2 2/3] mtd: spi-nor: mtk-quadspi: add SNOR_HWCAPS_READ to spi_nor_hwcaps mask Ryder Lee
2019-01-16 6:05 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
2019-01-16 2:12 ` [PATCH v2 3/3] mtd: spi-nor: mtk-quadspi: rename config to a common one Ryder Lee
2019-01-16 6:06 ` Tudor.Ambarus
2019-01-19 15:42 ` [v2, " Boris Brezillon
2019-01-19 15:43 ` [v2, 1/3] dt-bindings: mtd: mtk-quadspi: update bindings for MT7629 SoC Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).