| Message ID | 20210408075045.3435046-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | d570838efb6fb3154cbd08ab1b22d1f6442b1e78 |
| Headers | show |
| Series | ARM/spi: spear: Drop PL022 num_chipselect | expand |
On 08-04-21, 09:50, Linus Walleij wrote: > A previous refactoring moved the chip select number handling > to the SPI core and we missed a leftover platform data user > in the ST spear platform. The spear is not using this > chipselect or PL022 for anything and should be using device > tree like the rest of the platform so just delete the > offending platform data. > > Cc: Viresh Kumar <vireshk@kernel.org> > Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > Mark: please apply this as a fix to the SPI tree unless there > are protests. Acked-by: Viresh Kumar <viresh.kumar@linaro.org> -- viresh
On Thu, 8 Apr 2021 09:50:45 +0200, Linus Walleij wrote: > A previous refactoring moved the chip select number handling > to the SPI core and we missed a leftover platform data user > in the ST spear platform. The spear is not using this > chipselect or PL022 for anything and should be using device > tree like the rest of the platform so just delete the > offending platform data. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] ARM/spi: spear: Drop PL022 num_chipselect commit: d570838efb6fb3154cbd08ab1b22d1f6442b1e78 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
diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c index 0958f68a21e2..926d5a243238 100644 --- a/arch/arm/mach-spear/spear320.c +++ b/arch/arm/mach-spear/spear320.c @@ -195,14 +195,12 @@ static struct pl022_ssp_controller spear320_ssp_data[] = { .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp1_tx", .dma_rx_param = "ssp1_rx", - .num_chipselect = 2, }, { .bus_id = 2, .enable_dma = 1, .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp2_tx", .dma_rx_param = "ssp2_rx", - .num_chipselect = 2, } }; diff --git a/arch/arm/mach-spear/spear3xx.c b/arch/arm/mach-spear/spear3xx.c index 8537fcffe5a8..f83321d5e353 100644 --- a/arch/arm/mach-spear/spear3xx.c +++ b/arch/arm/mach-spear/spear3xx.c @@ -30,16 +30,6 @@ struct pl022_ssp_controller pl022_plat_data = { .dma_filter = pl08x_filter_id, .dma_tx_param = "ssp0_tx", .dma_rx_param = "ssp0_rx", - /* - * This is number of spi devices that can be connected to spi. There are - * two type of chipselects on which slave devices can work. One is chip - * select provided by spi masters other is controlled through external - * gpio's. We can't use chipselect provided from spi master (because as - * soon as FIFO becomes empty, CS is disabled and transfer ends). So - * this number now depends on number of gpios available for spi. each - * slave on each master requires a separate gpio pin. - */ - .num_chipselect = 2, }; /* dmac device registration */
A previous refactoring moved the chip select number handling to the SPI core and we missed a leftover platform data user in the ST spear platform. The spear is not using this chipselect or PL022 for anything and should be using device tree like the rest of the platform so just delete the offending platform data. Cc: Viresh Kumar <vireshk@kernel.org> Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Mark: please apply this as a fix to the SPI tree unless there are protests. --- arch/arm/mach-spear/spear320.c | 2 -- arch/arm/mach-spear/spear3xx.c | 10 ---------- 2 files changed, 12 deletions(-) -- 2.29.2