| Message ID | 20230119185342.2093323-1-amit.kumar-mahapatra@amd.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | spi: Add support for stacked/parallel memories | expand |
Am Donnerstag, 19. Januar 2023, 19:53:31 CET schrieb Amit Kumar Mahapatra: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> > --- > diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c > index bd87d3c92dd3..246e81453ec3 100644 > --- a/drivers/spi/spi-rockchip-sfc.c > +++ b/drivers/spi/spi-rockchip-sfc.c > @@ -346,7 +346,7 @@ static int rockchip_sfc_xfer_setup(struct rockchip_sfc *sfc, > > /* set the Controller */ > ctrl |= SFC_CTRL_PHASE_SEL_NEGETIVE; > - cmd |= mem->spi->chip_select << SFC_CMD_CS_SHIFT; > + cmd |= spi_get_chipselect(mem->spi, 0) << SFC_CMD_CS_SHIFT; > > dev_dbg(sfc->dev, "sfc addr.nbytes=%x(x%d) dummy.nbytes=%x(x%d)\n", > op->addr.nbytes, op->addr.buswidth, > diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c > index 79242dc5272d..adc5638eff4b 100644 > --- a/drivers/spi/spi-rockchip.c > +++ b/drivers/spi/spi-rockchip.c > @@ -246,28 +246,30 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable) > bool cs_asserted = spi->mode & SPI_CS_HIGH ? enable : !enable; > > /* Return immediately for no-op */ > - if (cs_asserted == rs->cs_asserted[spi->chip_select]) > + if (cs_asserted == rs->cs_asserted[spi_get_chipselect(spi, 0)]) > return; > > if (cs_asserted) { > /* Keep things powered as long as CS is asserted */ > pm_runtime_get_sync(rs->dev); > > - if (spi->cs_gpiod) > + if (spi_get_csgpiod(spi, 0)) > ROCKCHIP_SPI_SET_BITS(rs->regs + ROCKCHIP_SPI_SER, 1); > else > - ROCKCHIP_SPI_SET_BITS(rs->regs + ROCKCHIP_SPI_SER, BIT(spi->chip_select)); > + ROCKCHIP_SPI_SET_BITS(rs->regs + ROCKCHIP_SPI_SER, > + BIT(spi_get_chipselect(spi, 0))); > } else { > - if (spi->cs_gpiod) > + if (spi_get_csgpiod(spi, 0)) > ROCKCHIP_SPI_CLR_BITS(rs->regs + ROCKCHIP_SPI_SER, 1); > else > - ROCKCHIP_SPI_CLR_BITS(rs->regs + ROCKCHIP_SPI_SER, BIT(spi->chip_select)); > + ROCKCHIP_SPI_CLR_BITS(rs->regs + ROCKCHIP_SPI_SER, > + BIT(spi_get_chipselect(spi, 0))); > > /* Drop reference from when we first asserted CS */ > pm_runtime_put(rs->dev); > } > > - rs->cs_asserted[spi->chip_select] = cs_asserted; > + rs->cs_asserted[spi_get_chipselect(spi, 0)] = cs_asserted; > } > > static void rockchip_spi_handle_err(struct spi_controller *ctlr, > @@ -541,7 +543,7 @@ static int rockchip_spi_config(struct rockchip_spi *rs, > if (spi->mode & SPI_LSB_FIRST) > cr0 |= CR0_FBM_LSB << CR0_FBM_OFFSET; > if (spi->mode & SPI_CS_HIGH) > - cr0 |= BIT(spi->chip_select) << CR0_SOI_OFFSET; > + cr0 |= BIT(spi_get_chipselect(spi, 0)) << CR0_SOI_OFFSET; > > if (xfer->rx_buf && xfer->tx_buf) > cr0 |= CR0_XFM_TR << CR0_XFM_OFFSET; > @@ -724,7 +726,7 @@ static int rockchip_spi_setup(struct spi_device *spi) > struct rockchip_spi *rs = spi_controller_get_devdata(spi->controller); > u32 cr0; > > - if (!spi->cs_gpiod && (spi->mode & SPI_CS_HIGH) && !rs->cs_high_supported) { > + if (!spi_get_csgpiod(spi, 0) && (spi->mode & SPI_CS_HIGH) && !rs->cs_high_supported) { > dev_warn(&spi->dev, "setup: non GPIO CS can't be active-high\n"); > return -EINVAL; > } > @@ -735,10 +737,10 @@ static int rockchip_spi_setup(struct spi_device *spi) > > cr0 &= ~(0x3 << CR0_SCPH_OFFSET); > cr0 |= ((spi->mode & 0x3) << CR0_SCPH_OFFSET); > - if (spi->mode & SPI_CS_HIGH && spi->chip_select <= 1) > - cr0 |= BIT(spi->chip_select) << CR0_SOI_OFFSET; > - else if (spi->chip_select <= 1) > - cr0 &= ~(BIT(spi->chip_select) << CR0_SOI_OFFSET); > + if (spi->mode & SPI_CS_HIGH && spi_get_chipselect(spi, 0) <= 1) > + cr0 |= BIT(spi_get_chipselect(spi, 0)) << CR0_SOI_OFFSET; > + else if (spi_get_chipselect(spi, 0) <= 1) > + cr0 &= ~(BIT(spi_get_chipselect(spi, 0)) << CR0_SOI_OFFSET); > > writel_relaxed(cr0, rs->regs + ROCKCHIP_SPI_CTRLR0); for the two Rockchip drivers Acked-by: Heiko Stuebner <heiko@sntech.de>
On 1/19/23 19:53, Amit Kumar Mahapatra wrote: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> > --- > drivers/spi/spi-altera-core.c | 2 +- > drivers/spi/spi-amd.c | 4 ++-- > drivers/spi/spi-ar934x.c | 2 +- > drivers/spi/spi-armada-3700.c | 4 ++-- > drivers/spi/spi-aspeed-smc.c | 13 +++++++------ > drivers/spi/spi-at91-usart.c | 2 +- > drivers/spi/spi-ath79.c | 4 ++-- > drivers/spi/spi-atmel.c | 26 +++++++++++++------------- > drivers/spi/spi-au1550.c | 4 ++-- > drivers/spi/spi-axi-spi-engine.c | 2 +- > drivers/spi/spi-bcm-qspi.c | 10 +++++----- > drivers/spi/spi-bcm2835.c | 19 ++++++++++--------- > drivers/spi/spi-bcm2835aux.c | 4 ++-- > drivers/spi/spi-bcm63xx-hsspi.c | 22 +++++++++++----------- > drivers/spi/spi-bcm63xx.c | 2 +- > drivers/spi/spi-cadence-quadspi.c | 5 +++-- > drivers/spi/spi-cadence-xspi.c | 4 ++-- > drivers/spi/spi-cadence.c | 4 ++-- > drivers/spi/spi-cavium.c | 8 ++++---- > drivers/spi/spi-coldfire-qspi.c | 8 ++++---- > drivers/spi/spi-davinci.c | 18 +++++++++--------- > drivers/spi/spi-dln2.c | 6 +++--- > drivers/spi/spi-dw-core.c | 2 +- > drivers/spi/spi-dw-mmio.c | 4 ++-- > drivers/spi/spi-falcon.c | 2 +- > drivers/spi/spi-fsi.c | 2 +- > drivers/spi/spi-fsl-dspi.c | 16 ++++++++-------- > drivers/spi/spi-fsl-espi.c | 6 +++--- > drivers/spi/spi-fsl-lpspi.c | 2 +- > drivers/spi/spi-fsl-qspi.c | 6 +++--- > drivers/spi/spi-fsl-spi.c | 2 +- > drivers/spi/spi-geni-qcom.c | 6 +++--- > drivers/spi/spi-gpio.c | 4 ++-- > drivers/spi/spi-gxp.c | 4 ++-- > drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- > drivers/spi/spi-img-spfi.c | 14 +++++++------- > drivers/spi/spi-imx.c | 30 +++++++++++++++--------------- > drivers/spi/spi-ingenic.c | 4 ++-- > drivers/spi/spi-intel.c | 2 +- > drivers/spi/spi-jcore.c | 4 ++-- > drivers/spi/spi-lantiq-ssc.c | 6 +++--- > drivers/spi/spi-mem.c | 4 ++-- > drivers/spi/spi-meson-spicc.c | 2 +- > drivers/spi/spi-microchip-core.c | 6 +++--- > drivers/spi/spi-mpc512x-psc.c | 8 ++++---- > drivers/spi/spi-mpc52xx.c | 2 +- > drivers/spi/spi-mt65xx.c | 6 +++--- > drivers/spi/spi-mt7621.c | 2 +- > drivers/spi/spi-mux.c | 8 ++++---- > drivers/spi/spi-mxic.c | 10 +++++----- > drivers/spi/spi-mxs.c | 2 +- > drivers/spi/spi-npcm-fiu.c | 20 ++++++++++---------- > drivers/spi/spi-nxp-fspi.c | 10 +++++----- > drivers/spi/spi-omap-100k.c | 2 +- > drivers/spi/spi-omap-uwire.c | 8 ++++---- > drivers/spi/spi-omap2-mcspi.c | 24 ++++++++++++------------ > drivers/spi/spi-orion.c | 4 ++-- > drivers/spi/spi-pci1xxxx.c | 4 ++-- > drivers/spi/spi-pic32-sqi.c | 2 +- > drivers/spi/spi-pic32.c | 4 ++-- > drivers/spi/spi-pl022.c | 4 ++-- > drivers/spi/spi-pxa2xx.c | 6 +++--- > drivers/spi/spi-qcom-qspi.c | 2 +- > drivers/spi/spi-rb4xx.c | 2 +- > drivers/spi/spi-rockchip-sfc.c | 2 +- > drivers/spi/spi-rockchip.c | 26 ++++++++++++++------------ > drivers/spi/spi-rspi.c | 10 +++++----- > drivers/spi/spi-s3c64xx.c | 2 +- > drivers/spi/spi-sc18is602.c | 4 ++-- > drivers/spi/spi-sh-msiof.c | 6 +++--- > drivers/spi/spi-sh-sci.c | 2 +- > drivers/spi/spi-sifive.c | 6 +++--- > drivers/spi/spi-sn-f-ospi.c | 2 +- > drivers/spi/spi-st-ssc4.c | 2 +- > drivers/spi/spi-stm32-qspi.c | 12 ++++++------ > drivers/spi/spi-sun4i.c | 2 +- > drivers/spi/spi-sun6i.c | 2 +- > drivers/spi/spi-synquacer.c | 6 +++--- > drivers/spi/spi-tegra114.c | 28 ++++++++++++++-------------- > drivers/spi/spi-tegra20-sflash.c | 2 +- > drivers/spi/spi-tegra20-slink.c | 6 +++--- > drivers/spi/spi-tegra210-quad.c | 8 ++++---- > drivers/spi/spi-ti-qspi.c | 16 ++++++++-------- > drivers/spi/spi-topcliff-pch.c | 4 ++-- > drivers/spi/spi-wpcm-fiu.c | 12 ++++++------ > drivers/spi/spi-xcomm.c | 2 +- > drivers/spi/spi-xilinx.c | 6 +++--- > drivers/spi/spi-xlp.c | 4 ++-- > drivers/spi/spi-zynq-qspi.c | 2 +- > drivers/spi/spi-zynqmp-gqspi.c | 2 +- > drivers/spi/spidev.c | 6 +++--- > include/trace/events/spi.h | 10 +++++----- > 92 files changed, 315 insertions(+), 310 deletions(-) Reviewed-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
On 1/19/23 19:53, Amit Kumar Mahapatra wrote: > diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c > index 873ff2cf72c9..b7a9ec550ba1 100644 > --- a/drivers/spi/spi-aspeed-smc.c > +++ b/drivers/spi/spi-aspeed-smc.c > @@ -296,7 +296,7 @@ static const struct aspeed_spi_data ast2400_spi_data; > static int do_aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) > { > struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master); > - struct aspeed_spi_chip *chip = &aspi->chips[mem->spi->chip_select]; > + struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(mem->spi, 0)]; > u32 addr_mode, addr_mode_backup; > u32 ctl_val; > int ret = 0; > @@ -377,7 +377,8 @@ static const char *aspeed_spi_get_name(struct spi_mem *mem) > struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master); > struct device *dev = aspi->dev; > > - return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev), mem->spi->chip_select); > + return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev), > + spi_get_chipselect(mem->spi, 0)); > } > > struct aspeed_spi_window { > @@ -553,7 +554,7 @@ static int aspeed_spi_do_calibration(struct aspeed_spi_chip *chip); > static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc) > { > struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master); > - struct aspeed_spi_chip *chip = &aspi->chips[desc->mem->spi->chip_select]; > + struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)]; > struct spi_mem_op *op = &desc->info.op_tmpl; > u32 ctl_val; > int ret = 0; > @@ -620,7 +621,7 @@ static ssize_t aspeed_spi_dirmap_read(struct spi_mem_dirmap_desc *desc, > u64 offset, size_t len, void *buf) > { > struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master); > - struct aspeed_spi_chip *chip = &aspi->chips[desc->mem->spi->chip_select]; > + struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)]; > > /* Switch to USER command mode if mapping window is too small */ > if (chip->ahb_window_size < offset + len) { > @@ -670,7 +671,7 @@ static int aspeed_spi_setup(struct spi_device *spi) > { > struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master); > const struct aspeed_spi_data *data = aspi->data; > - unsigned int cs = spi->chip_select; > + unsigned int cs = spi_get_chipselect(spi, 0); > struct aspeed_spi_chip *chip = &aspi->chips[cs]; > > chip->aspi = aspi; > @@ -697,7 +698,7 @@ static int aspeed_spi_setup(struct spi_device *spi) > static void aspeed_spi_cleanup(struct spi_device *spi) > { > struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master); > - unsigned int cs = spi->chip_select; > + unsigned int cs = spi_get_chipselect(spi, 0); > > aspeed_spi_chip_enable(aspi, cs, false); > For the Aspeed driver, Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C.
Hi Amit, On 20/01/23 00:23, Amit Kumar Mahapatra wrote: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> > --- > [...] > drivers/spi/spi-cadence-quadspi.c | 5 +++-- > drivers/spi/spi-cadence-xspi.c | 4 ++-- > drivers/spi/spi-cadence.c | 4 ++-- [...] For SPI Cadence QSPI, Reviewed-by: Dhruva Gole <d-gole@ti.com>
On Fri, Jan 20, 2023 at 12:23:31AM +0530, Amit Kumar Mahapatra wrote: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> > --- [nip] > drivers/spi/spi-dw-core.c | 2 +- > drivers/spi/spi-dw-mmio.c | 4 ++-- [nip] > diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c > index 99edddf9958b..4fd1aa800cc3 100644 > --- a/drivers/spi/spi-dw-core.c > +++ b/drivers/spi/spi-dw-core.c > @@ -103,7 +103,7 @@ void dw_spi_set_cs(struct spi_device *spi, bool enable) > * support active-high or active-low CS level. > */ > if (cs_high == enable) > - dw_writel(dws, DW_SPI_SER, BIT(spi->chip_select)); > + dw_writel(dws, DW_SPI_SER, BIT(spi_get_chipselect(spi, 0))); > else > dw_writel(dws, DW_SPI_SER, 0); > } > diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c > index 26c40ea6dd12..d511da766ce8 100644 > --- a/drivers/spi/spi-dw-mmio.c > +++ b/drivers/spi/spi-dw-mmio.c > @@ -65,7 +65,7 @@ static void dw_spi_mscc_set_cs(struct spi_device *spi, bool enable) > struct dw_spi *dws = spi_master_get_devdata(spi->master); > struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws); > struct dw_spi_mscc *dwsmscc = dwsmmio->priv; > - u32 cs = spi->chip_select; > + u32 cs = spi_get_chipselect(spi, 0); > > if (cs < 4) { > u32 sw_mode = MSCC_SPI_MST_SW_MODE_SW_PIN_CTRL_MODE; > @@ -138,7 +138,7 @@ static void dw_spi_sparx5_set_cs(struct spi_device *spi, bool enable) > struct dw_spi *dws = spi_master_get_devdata(spi->master); > struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws); > struct dw_spi_mscc *dwsmscc = dwsmmio->priv; > - u8 cs = spi->chip_select; > + u8 cs = spi_get_chipselect(spi, 0); > > if (!enable) { > /* CS override drive enable */ For the DW SSI part: Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) [nip]
Hi Amit On 1/19/23 19:53, Amit Kumar Mahapatra wrote: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. > > Signed-off-by: Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> > --- [...] > drivers/spi/spi-stm32-qspi.c | 12 ++++++------ [...] > diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c > index 9131660c1afb..b9e61372dcfb 100644 > --- a/drivers/spi/spi-stm32-qspi.c > +++ b/drivers/spi/spi-stm32-qspi.c > @@ -359,7 +359,7 @@ static int stm32_qspi_get_mode(u8 buswidth) > static int stm32_qspi_send(struct spi_device *spi, const struct spi_mem_op *op) > { > struct stm32_qspi *qspi = spi_controller_get_devdata(spi->master); > - struct stm32_qspi_flash *flash = &qspi->flash[spi->chip_select]; > + struct stm32_qspi_flash *flash = &qspi->flash[spi_get_chipselect(spi, 0)]; > u32 ccr, cr; > int timeout, err = 0, err_poll_status = 0; > > @@ -564,7 +564,7 @@ static int stm32_qspi_transfer_one_message(struct spi_controller *ctrl, > struct spi_mem_op op; > int ret = 0; > > - if (!spi->cs_gpiod) > + if (!spi_get_csgpiod(spi, 0)) > return -EOPNOTSUPP; > > ret = pm_runtime_resume_and_get(qspi->dev); > @@ -573,7 +573,7 @@ static int stm32_qspi_transfer_one_message(struct spi_controller *ctrl, > > mutex_lock(&qspi->lock); > > - gpiod_set_value_cansleep(spi->cs_gpiod, true); > + gpiod_set_value_cansleep(spi_get_csgpiod(spi, 0), true); > > list_for_each_entry(transfer, &msg->transfers, transfer_list) { > u8 dummy_bytes = 0; > @@ -626,7 +626,7 @@ static int stm32_qspi_transfer_one_message(struct spi_controller *ctrl, > } > > end_of_transfer: > - gpiod_set_value_cansleep(spi->cs_gpiod, false); > + gpiod_set_value_cansleep(spi_get_csgpiod(spi, 0), false); > > mutex_unlock(&qspi->lock); > > @@ -669,8 +669,8 @@ static int stm32_qspi_setup(struct spi_device *spi) > > presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1; > > - flash = &qspi->flash[spi->chip_select]; > - flash->cs = spi->chip_select; > + flash = &qspi->flash[spi_get_chipselect(spi, 0)]; > + flash->cs = spi_get_chipselect(spi, 0); > flash->presc = presc; > > mutex_lock(&qspi->lock); Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
On 01/19/2023 10:53 AM, 'Amit Kumar Mahapatra' via BCM-KERNEL-FEEDBACK-LIST,PDL wrote: > diff --git a/drivers/spi/spi-bcm63xx-hsspi.c > b/drivers/spi/spi-bcm63xx-hsspi.c > index b871fd810d80..dc179c4677d4 100644 > --- a/drivers/spi/spi-bcm63xx-hsspi.c > +++ b/drivers/spi/spi-bcm63xx-hsspi.c > @@ -130,7 +130,7 @@ static void bcm63xx_hsspi_set_cs(struct bcm63xx_hsspi > *bs, unsigned int cs, > static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi *bs, > struct spi_device *spi, int hz) > { > - unsigned int profile = spi->chip_select; > + unsigned int profile = spi_get_chipselect(spi, 0); > u32 reg; > > reg = DIV_ROUND_UP(2048, DIV_ROUND_UP(bs->speed_hz, hz)); > @@ -157,7 +157,7 @@ static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi > *bs, > static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct > spi_transfer *t) > { > struct bcm63xx_hsspi *bs = spi_master_get_devdata(spi->master); > - unsigned int chip_select = spi->chip_select; > + unsigned int chip_select = spi_get_chipselect(spi, 0); > u16 opcode = 0; > int pending = t->len; > int step_size = HSSPI_BUFFER_LEN; > @@ -165,7 +165,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device > *spi, struct spi_transfer *t) > u8 *rx = t->rx_buf; > > bcm63xx_hsspi_set_clk(bs, spi, t->speed_hz); > - bcm63xx_hsspi_set_cs(bs, spi->chip_select, true); > + bcm63xx_hsspi_set_cs(bs, spi_get_chipselect(spi, 0), true); > > if (tx && rx) > opcode = HSSPI_OP_READ_WRITE; > @@ -228,14 +228,14 @@ static int bcm63xx_hsspi_setup(struct spi_device > *spi) > u32 reg; > > reg = __raw_readl(bs->regs + > - HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select)); > + HSSPI_PROFILE_SIGNAL_CTRL_REG(spi_get_chipselect(spi, 0))); > reg &= ~(SIGNAL_CTRL_LAUNCH_RISING | SIGNAL_CTRL_LATCH_RISING); > if (spi->mode & SPI_CPHA) > reg |= SIGNAL_CTRL_LAUNCH_RISING; > else > reg |= SIGNAL_CTRL_LATCH_RISING; > __raw_writel(reg, bs->regs + > - HSSPI_PROFILE_SIGNAL_CTRL_REG(spi->chip_select)); > + HSSPI_PROFILE_SIGNAL_CTRL_REG(spi_get_chipselect(spi, 0))); > > mutex_lock(&bs->bus_mutex); > reg = __raw_readl(bs->regs + HSSPI_GLOBAL_CTRL_REG); > @@ -243,16 +243,16 @@ static int bcm63xx_hsspi_setup(struct spi_device > *spi) > /* only change actual polarities if there is no transfer */ > if ((reg & GLOBAL_CTRL_CS_POLARITY_MASK) == bs->cs_polarity) { > if (spi->mode & SPI_CS_HIGH) > - reg |= BIT(spi->chip_select); > + reg |= BIT(spi_get_chipselect(spi, 0)); > else > - reg &= ~BIT(spi->chip_select); > + reg &= ~BIT(spi_get_chipselect(spi, 0)); > __raw_writel(reg, bs->regs + HSSPI_GLOBAL_CTRL_REG); > } > > if (spi->mode & SPI_CS_HIGH) > - bs->cs_polarity |= BIT(spi->chip_select); > + bs->cs_polarity |= BIT(spi_get_chipselect(spi, 0)); > else > - bs->cs_polarity &= ~BIT(spi->chip_select); > + bs->cs_polarity &= ~BIT(spi_get_chipselect(spi, 0)); > > mutex_unlock(&bs->bus_mutex); > > @@ -283,7 +283,7 @@ static int bcm63xx_hsspi_transfer_one(struct > spi_master *master, > * e. At the end restore the polarities again to their default values. > */ > > - dummy_cs = !spi->chip_select; > + dummy_cs = !spi_get_chipselect(spi, 0); > bcm63xx_hsspi_set_cs(bs, dummy_cs, true); > > list_for_each_entry(t, &msg->transfers, transfer_list) { > @@ -296,7 +296,7 @@ static int bcm63xx_hsspi_transfer_one(struct > spi_master *master, > spi_transfer_delay_exec(t); > > if (t->cs_change) > - bcm63xx_hsspi_set_cs(bs, spi->chip_select, false); > + bcm63xx_hsspi_set_cs(bs, spi_get_chipselect(spi, 0), false); > } > > mutex_lock(&bs->bus_mutex); For bcm63xx-hsspi driver, Acked-by: William Zhang <william.zhang@broadcom.com>
On Fri, Jan 20, 2023 at 12:23:31AM +0530, Amit Kumar Mahapatra wrote: > Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod > members of struct spi_device to be an array. But changing the type of these > members to array would break the spi driver functionality. To make the > transition smoother introduced four new APIs to get/set the > spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and > spi->cs_gpiod references with get or set API calls. > While adding multi-cs support in further patches the chip_select & cs_gpiod > members of the spi_device structure would be converted to arrays & the > "idx" parameter of the APIs would be used as array index i.e., > spi->chip_select[idx] & spi->cs_gpiod[idx] respectively. This doesn't apply against current code, please check and resend.
On Fri, 20 Jan 2023 00:23:29 +0530, Amit Kumar Mahapatra wrote: > This patch is in the continuation to the discussions which happened on > 'commit f89504300e94 ("spi: Stacked/parallel memories bindings")' for > adding dt-binding support for stacked/parallel memories. > > This patch series updated the spi-nor, spi core and the spi drivers > to add stacked and parallel memories support. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [01/13] spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod commit: 303feb3cc06ac0665d0ee9c1414941200e60e8a3 [02/13] spi: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) [03/13] net: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) [04/13] iio: imu: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) [05/13] mtd: devices: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) [06/13] staging: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) [07/13] platform/x86: serial-multi-instantiate: Replace all spi->chip_select and spi->cs_gpiod references with function call (no commit info) All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
This patch is in the continuation to the discussions which happened on 'commit f89504300e94 ("spi: Stacked/parallel memories bindings")' for adding dt-binding support for stacked/parallel memories. This patch series updated the spi-nor, spi core and the spi drivers to add stacked and parallel memories support. --- BRANCH: mtd/next Changes in v2: - Rebased the patches on top of v6.2-rc1 - Created separate patch to add get & set APIs for spi->chip_select & spi->cs_gpiod, and replaced all spi->chip_select and spi->cs_gpiod references with the API calls. - Created separate patch to add get & set APIs for nor->params. --- Amit Kumar Mahapatra (13): spi: Add APIs in spi core to set/get spi->chip_select and spi->cs_gpiod spi: Replace all spi->chip_select and spi->cs_gpiod references with function call net: Replace all spi->chip_select and spi->cs_gpiod references with function call iio: imu: Replace all spi->chip_select and spi->cs_gpiod references with function call mtd: devices: Replace all spi->chip_select and spi->cs_gpiod references with function call staging: Replace all spi->chip_select and spi->cs_gpiod references with function call platform/x86: serial-multi-instantiate: Replace all spi->chip_select and spi->cs_gpiod references with function call spi: Add stacked and parallel memories support in SPI core mtd: spi-nor: Add APIs to set/get nor->params mtd: spi-nor: Add stacked memories support in spi-nor spi: spi-zynqmp-gqspi: Add stacked memories support in GQSPI driver mtd: spi-nor: Add parallel memories support in spi-nor spi: spi-zynqmp-gqspi: Add parallel memories support in GQSPI driver drivers/iio/imu/adis16400.c | 2 +- drivers/mtd/devices/mtd_dataflash.c | 2 +- drivers/mtd/spi-nor/atmel.c | 17 +- drivers/mtd/spi-nor/core.c | 665 +++++++++++++++--- drivers/mtd/spi-nor/core.h | 8 + drivers/mtd/spi-nor/debugfs.c | 4 +- drivers/mtd/spi-nor/gigadevice.c | 4 +- drivers/mtd/spi-nor/issi.c | 11 +- drivers/mtd/spi-nor/macronix.c | 6 +- drivers/mtd/spi-nor/micron-st.c | 39 +- drivers/mtd/spi-nor/otp.c | 25 +- drivers/mtd/spi-nor/sfdp.c | 29 +- drivers/mtd/spi-nor/spansion.c | 50 +- drivers/mtd/spi-nor/sst.c | 7 +- drivers/mtd/spi-nor/swp.c | 22 +- drivers/mtd/spi-nor/winbond.c | 10 +- drivers/mtd/spi-nor/xilinx.c | 18 +- drivers/net/ethernet/adi/adin1110.c | 2 +- drivers/net/ethernet/asix/ax88796c_main.c | 2 +- drivers/net/ethernet/davicom/dm9051.c | 2 +- drivers/net/ethernet/qualcomm/qca_debug.c | 2 +- drivers/net/ieee802154/ca8210.c | 2 +- drivers/net/wan/slic_ds26522.c | 2 +- .../net/wireless/marvell/libertas/if_spi.c | 2 +- drivers/net/wireless/silabs/wfx/bus_spi.c | 2 +- drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +- .../platform/x86/serial-multi-instantiate.c | 3 +- drivers/spi/spi-altera-core.c | 2 +- drivers/spi/spi-amd.c | 4 +- drivers/spi/spi-ar934x.c | 2 +- drivers/spi/spi-armada-3700.c | 4 +- drivers/spi/spi-aspeed-smc.c | 13 +- drivers/spi/spi-at91-usart.c | 2 +- drivers/spi/spi-ath79.c | 4 +- drivers/spi/spi-atmel.c | 26 +- drivers/spi/spi-au1550.c | 4 +- drivers/spi/spi-axi-spi-engine.c | 2 +- drivers/spi/spi-bcm-qspi.c | 10 +- drivers/spi/spi-bcm2835.c | 19 +- drivers/spi/spi-bcm2835aux.c | 4 +- drivers/spi/spi-bcm63xx-hsspi.c | 22 +- drivers/spi/spi-bcm63xx.c | 2 +- drivers/spi/spi-cadence-quadspi.c | 5 +- drivers/spi/spi-cadence-xspi.c | 4 +- drivers/spi/spi-cadence.c | 4 +- drivers/spi/spi-cavium.c | 8 +- drivers/spi/spi-coldfire-qspi.c | 8 +- drivers/spi/spi-davinci.c | 18 +- drivers/spi/spi-dln2.c | 6 +- drivers/spi/spi-dw-core.c | 2 +- drivers/spi/spi-dw-mmio.c | 4 +- drivers/spi/spi-falcon.c | 2 +- drivers/spi/spi-fsi.c | 2 +- drivers/spi/spi-fsl-dspi.c | 16 +- drivers/spi/spi-fsl-espi.c | 6 +- drivers/spi/spi-fsl-lpspi.c | 2 +- drivers/spi/spi-fsl-qspi.c | 6 +- drivers/spi/spi-fsl-spi.c | 2 +- drivers/spi/spi-geni-qcom.c | 6 +- drivers/spi/spi-gpio.c | 4 +- drivers/spi/spi-gxp.c | 4 +- drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- drivers/spi/spi-img-spfi.c | 14 +- drivers/spi/spi-imx.c | 30 +- drivers/spi/spi-ingenic.c | 4 +- drivers/spi/spi-intel.c | 2 +- drivers/spi/spi-jcore.c | 4 +- drivers/spi/spi-lantiq-ssc.c | 6 +- drivers/spi/spi-mem.c | 4 +- drivers/spi/spi-meson-spicc.c | 2 +- drivers/spi/spi-microchip-core.c | 6 +- drivers/spi/spi-mpc512x-psc.c | 8 +- drivers/spi/spi-mpc52xx.c | 2 +- drivers/spi/spi-mt65xx.c | 6 +- drivers/spi/spi-mt7621.c | 2 +- drivers/spi/spi-mux.c | 8 +- drivers/spi/spi-mxic.c | 10 +- drivers/spi/spi-mxs.c | 2 +- drivers/spi/spi-npcm-fiu.c | 20 +- drivers/spi/spi-nxp-fspi.c | 10 +- drivers/spi/spi-omap-100k.c | 2 +- drivers/spi/spi-omap-uwire.c | 8 +- drivers/spi/spi-omap2-mcspi.c | 24 +- drivers/spi/spi-orion.c | 4 +- drivers/spi/spi-pci1xxxx.c | 4 +- drivers/spi/spi-pic32-sqi.c | 2 +- drivers/spi/spi-pic32.c | 4 +- drivers/spi/spi-pl022.c | 4 +- drivers/spi/spi-pxa2xx.c | 6 +- drivers/spi/spi-qcom-qspi.c | 2 +- drivers/spi/spi-rb4xx.c | 2 +- drivers/spi/spi-rockchip-sfc.c | 2 +- drivers/spi/spi-rockchip.c | 26 +- drivers/spi/spi-rspi.c | 10 +- drivers/spi/spi-s3c64xx.c | 2 +- drivers/spi/spi-sc18is602.c | 4 +- drivers/spi/spi-sh-msiof.c | 6 +- drivers/spi/spi-sh-sci.c | 2 +- drivers/spi/spi-sifive.c | 6 +- drivers/spi/spi-sn-f-ospi.c | 2 +- drivers/spi/spi-st-ssc4.c | 2 +- drivers/spi/spi-stm32-qspi.c | 12 +- drivers/spi/spi-sun4i.c | 2 +- drivers/spi/spi-sun6i.c | 2 +- drivers/spi/spi-synquacer.c | 6 +- drivers/spi/spi-tegra114.c | 28 +- drivers/spi/spi-tegra20-sflash.c | 2 +- drivers/spi/spi-tegra20-slink.c | 6 +- drivers/spi/spi-tegra210-quad.c | 8 +- drivers/spi/spi-ti-qspi.c | 16 +- drivers/spi/spi-topcliff-pch.c | 4 +- drivers/spi/spi-wpcm-fiu.c | 12 +- drivers/spi/spi-xcomm.c | 2 +- drivers/spi/spi-xilinx.c | 6 +- drivers/spi/spi-xlp.c | 4 +- drivers/spi/spi-zynq-qspi.c | 2 +- drivers/spi/spi-zynqmp-gqspi.c | 58 +- drivers/spi/spi.c | 224 ++++-- drivers/spi/spidev.c | 6 +- drivers/staging/fbtft/fbtft-core.c | 2 +- drivers/staging/greybus/spilib.c | 2 +- include/linux/mtd/spi-nor.h | 18 +- include/linux/spi/spi.h | 46 +- include/trace/events/spi.h | 10 +- 124 files changed, 1319 insertions(+), 594 deletions(-)