| Message ID | cover.1705944943.git.u.kleine-koenig@pengutronix.de |
|---|---|
| Headers | show |
| Series | spi: get rid of some legacy macros | expand |
On Mon, Jan 22, 2024 at 07:06:55PM +0100, Uwe Kleine-König wrote: > Note that Jonathan Cameron has already applied patch 3 to his tree, it > didn't appear in a public tree though yet. I still included it here to > make the kernel build bots happy. It's also going to be needed for buildability of the end of the series.
On Tue, Jan 23, 2024 at 02:09:42PM +0100, Ulf Hansson wrote: > It looks like we need a decision if this should go via Mark's tree, > the series altogether - or if each subsystem maintainer should apply > each patch separately and postpone the final cleanups. > While waiting for a conclusion, here's my ack. As far as I'm concerned at this point it's going via my tree, I've got it queued for -rc3.
On Wed, Jan 24, 2024 at 09:13:49AM -0800, Greg Kroah-Hartman wrote: > On Mon, Jan 22, 2024 at 07:06:55PM +0100, Uwe Kleine-König wrote: > > Note that Jonathan Cameron has already applied patch 3 to his tree, it > > didn't appear in a public tree though yet. I still included it here to > > make the kernel build bots happy. > Are we supposed to take the individual changes in our different > subsystem trees, or do you want them all to go through the spi tree? Given that the final patch removes the legacy interfaces I'm expecting to take them via SPI.
On Mon, 22 Jan 2024 19:23:43 +0000 Jonathan Cameron <jic23@kernel.org> wrote: > On Mon, 22 Jan 2024 18:18:22 +0000 > Mark Brown <broonie@kernel.org> wrote: > > > On Mon, Jan 22, 2024 at 07:06:55PM +0100, Uwe Kleine-König wrote: > > > > > Note that Jonathan Cameron has already applied patch 3 to his tree, it > > > didn't appear in a public tree though yet. I still included it here to > > > make the kernel build bots happy. > > > > It's also going to be needed for buildability of the end of the series. > > Ah. I thought intent was to split this across all the different trees > then do the final patch only after they were all gone? > > I'm fine with it going all in one go if people prefer that. > > My tree will be out in a few mins. Was just waiting to rebase on rc1 > which I've just done. > > Jonathan > Dropped from my tree. Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On Wed Jan 24, 2024 at 7:22 PM EET, Mark Brown wrote: > On Wed, Jan 24, 2024 at 09:13:49AM -0800, Greg Kroah-Hartman wrote: > > On Mon, Jan 22, 2024 at 07:06:55PM +0100, Uwe Kleine-König wrote: > > > > Note that Jonathan Cameron has already applied patch 3 to his tree, it > > > didn't appear in a public tree though yet. I still included it here to > > > make the kernel build bots happy. > > > Are we supposed to take the individual changes in our different > > subsystem trees, or do you want them all to go through the spi tree? > > Given that the final patch removes the legacy interfaces I'm expecting > to take them via SPI. +1 least fuss approach BR, Jarkko
On Mon, 22 Jan 2024 19:06:55 +0100, Uwe Kleine-König wrote: > this is v2 of this patch set. > > Changes since (implicit) v1, sent with Message-Id: > cover.1705348269.git.u.kleine-koenig@pengutronix.de: > > - Rebase to v6.8-rc1 > - Fix a build failure on sh > - Added the tags received in (implicit) v1. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [01/33] fpga: ice40-spi: Follow renaming of SPI "master" to "controller" commit: 227ab73b89d66e3064b3c2bcb5fe382b1815763d [02/33] ieee802154: ca8210: Follow renaming of SPI "master" to "controller" commit: 167b78446706bb4d19f7dd93ca320aed25ae1bbd [03/33] iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" commit: 2780e7b716a605781dbee753ef4983d775a65427 [04/33] Input: pxspad - follow renaming of SPI "master" to "controller" commit: a78acec53b8524593afeed7258a442adc3450818 [05/33] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" commit: 1245633c61baf159fcc1303d7f0855f49831b9c1 [06/33] media: mgb4: Follow renaming of SPI "master" to "controller" commit: 2c2f93fbfba7186cc081e23120f169eac3b5b62a [07/33] media: netup_unidvb: Follow renaming of SPI "master" to "controller" commit: cfa13a64bd631d8f04a1c385923706fcef9a63ed [08/33] media: usb/msi2500: Follow renaming of SPI "master" to "controller" commit: dd868ae646d5770f80f90dc056d06eb2e6d39c62 [09/33] media: v4l2-subdev: Follow renaming of SPI "master" to "controller" commit: d920b3a672b7f79cd13b341234aebd49233f836c [10/33] misc: gehc-achc: Follow renaming of SPI "master" to "controller" commit: 26dcf09ee5d9ceba2c627ae3ba174a229f25638f [11/33] mmc: mmc_spi: Follow renaming of SPI "master" to "controller" commit: b0a6776e53403aa380411f2a43cdefb9f00ff50a [12/33] mtd: dataflash: Follow renaming of SPI "master" to "controller" commit: 44ee998db9eef84bf005c39486566a67cb018354 [14/33] net: ks8851: Follow renaming of SPI "master" to "controller" commit: 1cc711a72ae7fd44e90839f0c8d3226664de55a2 [15/33] net: vertexcom: mse102x: Follow renaming of SPI "master" to "controller" commit: 7969b98b80c0332f940c547f84650a20aab33841 [16/33] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" commit: 85ad0ec049a771c4910c8aebb2d0bd9ce9311fd9 [17/33] spi: bitbang: Follow renaming of SPI "master" to "controller" commit: 2259233110d90059187c5ba75537eb93eba8417b [18/33] spi: cadence-quadspi: Don't emit error message on allocation error commit: e71011dacc3413bed4118d2c42f10736ffcd762c [19/33] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" commit: 28e59d8bf1ace0ddf05f989a48d6824d75731267 [20/33] spi: cavium: Follow renaming of SPI "master" to "controller" commit: 1747fbdedba8b6b3fd459895ed5d57e534549884 [21/33] spi: geni-qcom: Follow renaming of SPI "master" to "controller" commit: 14cea92338a0776c1615994150e738ac0f5fbb2c [22/33] spi: loopback-test: Follow renaming of SPI "master" to "controller" commit: 2c2310c17fac13aa7e78756d7f3780c7891f9397 [23/33] spi: slave-mt27xx: Follow renaming of SPI "master" to "controller" commit: 8197b136bbbe64a7cab1020a4b067020e5977d98 [24/33] spi: spidev: Follow renaming of SPI "master" to "controller" commit: d934cd6f0e5d0052772612db4b07df60cb9da387 [25/33] staging: fbtft: Follow renaming of SPI "master" to "controller" commit: bbd25d7260eeeaef89f7371cbadcd33dd7f7bff9 [26/33] staging: greybus: spi: Follow renaming of SPI "master" to "controller" commit: ee3c668dda3d2783b0fff4091461356fe000e4d8 [27/33] tpm_tis_spi: Follow renaming of SPI "master" to "controller" commit: b6af14eacc8814b0986e20507df423cebe9fd859 [28/33] usb: gadget: max3420_udc: Follow renaming of SPI "master" to "controller" commit: 8c716f4a3d4fcbec976247e3443d36cbc24c0512 [29/33] video: fbdev: mmp: Follow renaming of SPI "master" to "controller" commit: b23031e730e72ec9067b7c38c25e776c5e27e116 [30/33] wifi: libertas: Follow renaming of SPI "master" to "controller" commit: 30060d57cee194d6b70283f2faf787e2fdc61b6e [31/33] spi: fsl-lib: Follow renaming of SPI "master" to "controller" commit: 801185efa2402dce57828930e9684884fc8d62da [32/33] spi: Drop compat layer from renaming "master" to "controller" commit: 620d269f29a569ba37419cc03cf1da2d55f6252a [33/33] Documentation: spi: Update documentation for renaming "master" to "controller" commit: 76b31eb4c2da3ddb3195cc14f6aad24908adf524 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
Hello, this is v2 of this patch set. Changes since (implicit) v1, sent with Message-Id: cover.1705348269.git.u.kleine-koenig@pengutronix.de: - Rebase to v6.8-rc1 - Fix a build failure on sh - Added the tags received in (implicit) v1. The slave-mt27xx driver needs some more work. The patch presented here is enough however to get rid of the defines handled in patch 32. Cleaning that up is out-of-scope for this series, so I'll delay that until later. Note that Jonathan Cameron has already applied patch 3 to his tree, it didn't appear in a public tree though yet. I still included it here to make the kernel build bots happy. Best regards Uwe Uwe Kleine-König (33): fpga: ice40-spi: Follow renaming of SPI "master" to "controller" ieee802154: ca8210: Follow renaming of SPI "master" to "controller" iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" Input: pxspad - follow renaming of SPI "master" to "controller" Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" media: mgb4: Follow renaming of SPI "master" to "controller" media: netup_unidvb: Follow renaming of SPI "master" to "controller" media: usb/msi2500: Follow renaming of SPI "master" to "controller" media: v4l2-subdev: Follow renaming of SPI "master" to "controller" misc: gehc-achc: Follow renaming of SPI "master" to "controller" mmc: mmc_spi: Follow renaming of SPI "master" to "controller" mtd: dataflash: Follow renaming of SPI "master" to "controller" mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing net: ks8851: Follow renaming of SPI "master" to "controller" net: vertexcom: mse102x: Follow renaming of SPI "master" to "controller" platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" spi: bitbang: Follow renaming of SPI "master" to "controller" spi: cadence-quadspi: Don't emit error message on allocation error spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" spi: cavium: Follow renaming of SPI "master" to "controller" spi: geni-qcom: Follow renaming of SPI "master" to "controller" spi: loopback-test: Follow renaming of SPI "master" to "controller" spi: slave-mt27xx: Follow renaming of SPI "master" to "controller" spi: spidev: Follow renaming of SPI "master" to "controller" staging: fbtft: Follow renaming of SPI "master" to "controller" staging: greybus: spi: Follow renaming of SPI "master" to "controller" tpm_tis_spi: Follow renaming of SPI "master" to "controller" usb: gadget: max3420_udc: Follow renaming of SPI "master" to "controller" video: fbdev: mmp: Follow renaming of SPI "master" to "controller" wifi: libertas: Follow renaming of SPI "master" to "controller" spi: fsl-lib: Follow renaming of SPI "master" to "controller" spi: Drop compat layer from renaming "master" to "controller" Documentation: spi: Update documentation for renaming "master" to "controller" .../driver-api/driver-model/devres.rst | 2 +- Documentation/spi/spi-summary.rst | 74 +++++++++---------- drivers/char/tpm/tpm_tis_spi_main.c | 4 +- drivers/fpga/ice40-spi.c | 4 +- drivers/iio/adc/ad_sigma_delta.c | 14 ++-- drivers/input/joystick/psxpad-spi.c | 4 +- drivers/input/rmi4/rmi_spi.c | 2 +- drivers/media/pci/mgb4/mgb4_core.c | 14 ++-- .../media/pci/netup_unidvb/netup_unidvb_spi.c | 48 ++++++------ drivers/media/usb/msi2500/msi2500.c | 38 +++++----- drivers/media/v4l2-core/v4l2-spi.c | 4 +- drivers/misc/gehc-achc.c | 8 +- drivers/mmc/host/mmc_spi.c | 6 +- drivers/mtd/devices/mtd_dataflash.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 +- drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- drivers/net/ethernet/vertexcom/mse102x.c | 2 +- drivers/net/ieee802154/ca8210.c | 2 +- .../net/wireless/marvell/libertas/if_spi.c | 2 +- drivers/platform/chrome/cros_ec_spi.c | 8 +- drivers/spi/spi-ath79.c | 4 +- drivers/spi/spi-bitbang.c | 64 ++++++++-------- drivers/spi/spi-butterfly.c | 6 +- drivers/spi/spi-cadence-quadspi.c | 7 +- drivers/spi/spi-cavium.c | 6 +- drivers/spi/spi-cavium.h | 2 +- drivers/spi/spi-davinci.c | 6 +- drivers/spi/spi-fsl-lib.c | 14 ++-- drivers/spi/spi-geni-qcom.c | 2 +- drivers/spi/spi-gpio.c | 2 +- drivers/spi/spi-lm70llp.c | 6 +- drivers/spi/spi-loopback-test.c | 4 +- drivers/spi/spi-oc-tiny.c | 6 +- drivers/spi/spi-omap-uwire.c | 4 +- drivers/spi/spi-sh-sci.c | 10 +-- drivers/spi/spi-slave-mt27xx.c | 2 +- drivers/spi/spi-xilinx.c | 4 +- drivers/spi/spi-xtensa-xtfpga.c | 2 +- drivers/spi/spi.c | 2 +- drivers/spi/spidev.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 4 +- drivers/staging/greybus/spilib.c | 66 ++++++++--------- drivers/usb/gadget/udc/max3420_udc.c | 2 +- drivers/video/fbdev/mmp/hw/mmp_spi.c | 26 +++---- include/linux/spi/spi.h | 20 +---- include/linux/spi/spi_bitbang.h | 2 +- include/media/v4l2-common.h | 6 +- 47 files changed, 254 insertions(+), 272 deletions(-) base-commit: 6613476e225e090cc9aad49be7fa504e290dd33d