* [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file
@ 2018-01-30 17:31 Yogesh Gaur
2018-01-30 17:31 ` [PATCH 1/2] " Yogesh Gaur
2018-01-30 17:31 ` [PATCH 2/2] dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example Yogesh Gaur
0 siblings, 2 replies; 4+ messages in thread
From: Yogesh Gaur @ 2018-01-30 17:31 UTC (permalink / raw)
To: linux-arm-kernel
This patch-set added support to update hwcap of slave device connected to
FSL QUADSPI controller by reading values from the device tree files.
Mode information is available via "spi-tx-bus-width" and
"spi-rx-bus-width" nodes of device tree for the connected slave device.
Update read and write hwcap capability for slave device by reading
"spi-rx-bus-width" and "spi-tx-bus-width" respectively.
Added usage example by adding support for spi-rx-bus-width
and spi-tx-bus-width binding.
Yogesh Gaur (2):
mtd: fsl-quadspi: Update slave device hwcap based on mode provided in
dtsi file
dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example
.../devicetree/bindings/mtd/fsl-quadspi.txt | 30 ++++++++++++
drivers/mtd/spi-nor/fsl-quadspi.c | 56 ++++++++++++++++++++--
2 files changed, 81 insertions(+), 5 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file 2018-01-30 17:31 [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file Yogesh Gaur @ 2018-01-30 17:31 ` Yogesh Gaur 2018-01-30 17:31 ` [PATCH 2/2] dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example Yogesh Gaur 1 sibling, 0 replies; 4+ messages in thread From: Yogesh Gaur @ 2018-01-30 17:31 UTC (permalink / raw) To: linux-arm-kernel FSL QuadSPI controller supports Single, dual, quad modes of operation. Mode information is available via "spi-tx-bus-width" and "spi-rx-bus-width" nodes of device tree for the connected slave device. Update read and write hwcap capability for slave device by reading "spi-rx-bus-width" and "spi-tx-bus-width" respectively. Assign hwcaps mask to minimal caps for the slave node i.e. SNOR_HWCAPS_READ | SNOR_HWCAPS_PP If value not provided in device tree file, then fallback to default mode i.e. SNOR_HWCAPS_READ_1_1_4 and SNOR_HWCAPS_PP. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> --- drivers/mtd/spi-nor/fsl-quadspi.c | 56 +++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index b9c5918..1503e0c 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -994,17 +994,14 @@ static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops) static int fsl_qspi_probe(struct platform_device *pdev) { - const struct spi_nor_hwcaps hwcaps = { - .mask = SNOR_HWCAPS_READ_1_1_4 | - SNOR_HWCAPS_PP, - }; + struct spi_nor_hwcaps hwcaps; struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; struct fsl_qspi *q; struct resource *res; struct spi_nor *nor; struct mtd_info *mtd; - int ret, i = 0; + int ret, i = 0, value; q = devm_kzalloc(dev, sizeof(*q), GFP_KERNEL); if (!q) @@ -1077,6 +1074,10 @@ static int fsl_qspi_probe(struct platform_device *pdev) /* iterate the subnodes. */ for_each_available_child_of_node(dev->of_node, np) { + /* Reset hwcaps mask to minimal caps for the slave node. */ + hwcaps.mask = SNOR_HWCAPS_READ | SNOR_HWCAPS_PP; + value = 0; + /* skip the holes */ if (!q->has_second_chip) i *= 2; @@ -1106,6 +1107,51 @@ static int fsl_qspi_probe(struct platform_device *pdev) /* set the chip address for READID */ fsl_qspi_set_base_addr(q, nor); + /* + * If spi-rx-bus-width and spi-tx-bus-width not defined assign + * default hardware capabilities SNOR_HWCAPS_READ_1_1_4 and + * SNOR_HWCAPS_PP supported by the Quad-SPI controller. + */ + if (!of_property_read_u32(np, "spi-rx-bus-width", &value)) { + switch (value) { + case 1: + hwcaps.mask |= SNOR_HWCAPS_READ | + SNOR_HWCAPS_READ_FAST; + break; + case 2: + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_2 | + SNOR_HWCAPS_READ_1_2_2; + break; + case 4: + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_4 | + SNOR_HWCAPS_READ_1_4_4; + break; + default: + dev_err(dev, + "spi-rx-bus-width %d not supported\n", + value); + break; + } + } else + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_4; + + if (!of_property_read_u32(np, "spi-tx-bus-width", &value)) { + switch (value) { + case 1: + hwcaps.mask |= SNOR_HWCAPS_PP; + break; + case 4: + hwcaps.mask |= SNOR_HWCAPS_PP_1_1_4 | + SNOR_HWCAPS_PP_1_4_4; + break; + default: + dev_err(dev, + "spi-tx-bus-width %d not supported\n", + value); + break; + } + } + ret = spi_nor_scan(nor, NULL, &hwcaps); if (ret) goto mutex_failed; -- 1.9.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example 2018-01-30 17:31 [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file Yogesh Gaur 2018-01-30 17:31 ` [PATCH 1/2] " Yogesh Gaur @ 2018-01-30 17:31 ` Yogesh Gaur 1 sibling, 0 replies; 4+ messages in thread From: Yogesh Gaur @ 2018-01-30 17:31 UTC (permalink / raw) To: linux-arm-kernel Added usage example by adding support for spi-rx-bus-width and spi-tx-bus-width binding. Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> --- .../devicetree/bindings/mtd/fsl-quadspi.txt | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt b/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt index 63d4d626..811da0e 100644 --- a/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt +++ b/Documentation/devicetree/bindings/mtd/fsl-quadspi.txt @@ -39,3 +39,33 @@ qspi0: quadspi at 40044000 { .... }; }; + +qspi1: quadspi at 20c0000 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x20c0000 0x0 0x10000>, + <0x0 0x20000000 0x0 0x10000000>; + reg-names = "QuadSPI", "QuadSPI-memory"; + interrupts = <0 25 0x4>; /* Level high type */ + clocks = <&clockgen 4 3>, <&clockgen 4 3>; + clock-names = "qspi_en", "qspi"; + status = "okay"; + + qflash0: s25fs512s at 0 { + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <20000000>; + reg = <0>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + }; + + qflash1: s25fs512s at 1 { + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <20000000>; + reg = <1>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + }; +}; -- 1.9.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file
@ 2018-01-30 17:33 Yogesh Gaur
2018-01-30 17:33 ` [PATCH 1/2] " Yogesh Gaur
0 siblings, 1 reply; 4+ messages in thread
From: Yogesh Gaur @ 2018-01-30 17:33 UTC (permalink / raw)
To: linux-arm-kernel
This patch-set added support to update hwcap of slave device connected to
FSL QUADSPI controller by reading values from the device tree files.
Mode information is available via "spi-tx-bus-width" and
"spi-rx-bus-width" nodes of device tree for the connected slave device.
Update read and write hwcap capability for slave device by reading
"spi-rx-bus-width" and "spi-tx-bus-width" respectively.
Added usage example by adding support for spi-rx-bus-width
and spi-tx-bus-width binding.
Depends on
https://patchwork.ozlabs.org/project/linux-mtd/list/?series=26084
Yogesh Gaur (2):
mtd: fsl-quadspi: Update slave device hwcap based on mode provided in
dtsi file
dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example
.../devicetree/bindings/mtd/fsl-quadspi.txt | 30 ++++++++++++
drivers/mtd/spi-nor/fsl-quadspi.c | 56 ++++++++++++++++++++--
2 files changed, 81 insertions(+), 5 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file 2018-01-30 17:33 [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file Yogesh Gaur @ 2018-01-30 17:33 ` Yogesh Gaur 0 siblings, 0 replies; 4+ messages in thread From: Yogesh Gaur @ 2018-01-30 17:33 UTC (permalink / raw) To: linux-arm-kernel FSL QuadSPI controller supports Single, dual, quad modes of operation. Mode information is available via "spi-tx-bus-width" and "spi-rx-bus-width" nodes of device tree for the connected slave device. Update read and write hwcap capability for slave device by reading "spi-rx-bus-width" and "spi-tx-bus-width" respectively. Assign hwcaps mask to minimal caps for the slave node i.e. SNOR_HWCAPS_READ | SNOR_HWCAPS_PP If value not provided in device tree file, then fallback to default mode i.e. SNOR_HWCAPS_READ_1_1_4 and SNOR_HWCAPS_PP. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Yogesh Gaur <yogeshnarayan.gaur@nxp.com> --- Depends on https://patchwork.ozlabs.org/project/linux-mtd/list/?series=26084 drivers/mtd/spi-nor/fsl-quadspi.c | 56 +++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index b9c5918..1503e0c 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -994,17 +994,14 @@ static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops) static int fsl_qspi_probe(struct platform_device *pdev) { - const struct spi_nor_hwcaps hwcaps = { - .mask = SNOR_HWCAPS_READ_1_1_4 | - SNOR_HWCAPS_PP, - }; + struct spi_nor_hwcaps hwcaps; struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; struct fsl_qspi *q; struct resource *res; struct spi_nor *nor; struct mtd_info *mtd; - int ret, i = 0; + int ret, i = 0, value; q = devm_kzalloc(dev, sizeof(*q), GFP_KERNEL); if (!q) @@ -1077,6 +1074,10 @@ static int fsl_qspi_probe(struct platform_device *pdev) /* iterate the subnodes. */ for_each_available_child_of_node(dev->of_node, np) { + /* Reset hwcaps mask to minimal caps for the slave node. */ + hwcaps.mask = SNOR_HWCAPS_READ | SNOR_HWCAPS_PP; + value = 0; + /* skip the holes */ if (!q->has_second_chip) i *= 2; @@ -1106,6 +1107,51 @@ static int fsl_qspi_probe(struct platform_device *pdev) /* set the chip address for READID */ fsl_qspi_set_base_addr(q, nor); + /* + * If spi-rx-bus-width and spi-tx-bus-width not defined assign + * default hardware capabilities SNOR_HWCAPS_READ_1_1_4 and + * SNOR_HWCAPS_PP supported by the Quad-SPI controller. + */ + if (!of_property_read_u32(np, "spi-rx-bus-width", &value)) { + switch (value) { + case 1: + hwcaps.mask |= SNOR_HWCAPS_READ | + SNOR_HWCAPS_READ_FAST; + break; + case 2: + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_2 | + SNOR_HWCAPS_READ_1_2_2; + break; + case 4: + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_4 | + SNOR_HWCAPS_READ_1_4_4; + break; + default: + dev_err(dev, + "spi-rx-bus-width %d not supported\n", + value); + break; + } + } else + hwcaps.mask |= SNOR_HWCAPS_READ_1_1_4; + + if (!of_property_read_u32(np, "spi-tx-bus-width", &value)) { + switch (value) { + case 1: + hwcaps.mask |= SNOR_HWCAPS_PP; + break; + case 4: + hwcaps.mask |= SNOR_HWCAPS_PP_1_1_4 | + SNOR_HWCAPS_PP_1_4_4; + break; + default: + dev_err(dev, + "spi-tx-bus-width %d not supported\n", + value); + break; + } + } + ret = spi_nor_scan(nor, NULL, &hwcaps); if (ret) goto mutex_failed; -- 1.9.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-30 17:33 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-01-30 17:31 [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file Yogesh Gaur 2018-01-30 17:31 ` [PATCH 1/2] " Yogesh Gaur 2018-01-30 17:31 ` [PATCH 2/2] dt-bindings: fsl-quadspi: spi-rx/tx-bus-width usage example Yogesh Gaur -- strict thread matches above, loose matches on Subject: below -- 2018-01-30 17:33 [PATCH 0/2] mtd: fsl-quadspi: Update slave device hwcap based on mode provided in dtsi file Yogesh Gaur 2018-01-30 17:33 ` [PATCH 1/2] " Yogesh Gaur
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).