* [PATCH 0/6] mfd: tmio: simplify header and move to platform_data
@ 2024-02-09 1:58 Wolfram Sang
2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Wolfram Sang @ 2024-02-09 1:58 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Lee Jones, Wolfram Sang, linux-arm-kernel, linux-kernel,
linux-mmc, linux-sh
The MFD parts of the TMIO have been removed by Arnd, so that only the
SD/MMC related functionality is left. Remove the outdated remains in the
public header file and then move it to platform_data as the data is now
specific for the SD/MMC part.
Based on 6.8-rc3, build bot is happy. Branch is here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification
I'd suggest this goes via the MFD tree, so the series would need acks
from the MMC and SH maintainers. Is that okay with everyone?
All the best!
Wolfram
Wolfram Sang (6):
mfd: tmio: remove obsolete platform_data
mfd: tmio: remove obsolete io accessors
mmc: tmio/sdhi: fix includes
mfd: tmio: update include files
mfd: tmio: sanitize comments
mfd: tmio: move header to platform_data
MAINTAINERS | 2 +-
arch/sh/boards/board-sh7757lcr.c | 2 +-
arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
arch/sh/boards/mach-ecovec24/setup.c | 2 +-
arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
arch/sh/boards/mach-migor/setup.c | 2 +-
arch/sh/boards/mach-se/7724/setup.c | 2 +-
drivers/mmc/host/renesas_sdhi_core.c | 2 +-
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +-
drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +-
drivers/mmc/host/tmio_mmc_core.c | 3 +-
drivers/mmc/host/uniphier-sd.c | 2 +-
include/linux/mfd/tmio.h | 133 ------------------
include/linux/platform_data/tmio.h | 64 +++++++++
14 files changed, 81 insertions(+), 147 deletions(-)
delete mode 100644 include/linux/mfd/tmio.h
create mode 100644 include/linux/platform_data/tmio.h
--
2.43.0
_______________________________________________
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] 10+ messages in thread* [PATCH 6/6] mfd: tmio: move header to platform_data 2024-02-09 1:58 [PATCH 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang @ 2024-02-09 1:58 ` Wolfram Sang 2024-02-09 7:56 ` Lee Jones 2024-02-13 20:52 ` John Paul Adrian Glaubitz 2024-02-09 7:58 ` [PATCH 0/6] mfd: tmio: simplify header and move " Lee Jones 2024-02-09 11:34 ` Ulf Hansson 2 siblings, 2 replies; 10+ messages in thread From: Wolfram Sang @ 2024-02-09 1:58 UTC (permalink / raw) To: linux-renesas-soc Cc: Lee Jones, Wolfram Sang, Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz, Ulf Hansson, Kunihiko Hayashi, Masami Hiramatsu, linux-kernel, linux-sh, linux-mmc, linux-arm-kernel All the MFD components are gone from the header meanwhile. Only the MMC relevant data is left which makes it a platform_data for the MMC controller. Move the header to the now fitting directory. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- MAINTAINERS | 2 +- arch/sh/boards/board-sh7757lcr.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- arch/sh/boards/mach-ecovec24/setup.c | 2 +- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 2 +- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- drivers/mmc/host/tmio_mmc_core.c | 2 +- drivers/mmc/host/uniphier-sd.c | 2 +- include/linux/{mfd => platform_data}/tmio.h | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename include/linux/{mfd => platform_data}/tmio.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 960512bec428..c4e20abd177b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22154,7 +22154,7 @@ L: linux-renesas-soc@vger.kernel.org S: Supported F: drivers/mmc/host/renesas_sdhi* F: drivers/mmc/host/tmio_mmc* -F: include/linux/mfd/tmio.h +F: include/linux/platform_data/tmio.h TMP401 HARDWARE MONITOR DRIVER M: Guenter Roeck <linux@roeck-us.net> diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index f39c8196efdf..4014c042d2a5 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c @@ -14,9 +14,9 @@ #include <linux/spi/spi.h> #include <linux/spi/flash.h> #include <linux/io.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/platform_data/sh_mmcif.h> +#include <linux/platform_data/tmio.h> #include <linux/sh_eth.h> #include <linux/sh_intc.h> #include <linux/usb/renesas_usbhs.h> diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 645cccf3da88..bb5004a8ac02 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c @@ -24,10 +24,10 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/memblock.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mtd/physmap.h> #include <linux/mtd/sh_flctl.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 30d117f9ad7e..6f13557eecd6 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -17,13 +17,13 @@ #include <linux/input/sh_keysc.h> #include <linux/interrupt.h> #include <linux/memblock.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/platform_data/sh_mmcif.h> #include <linux/mtd/physmap.h> #include <linux/gpio.h> #include <linux/gpio/machine.h> #include <linux/platform_data/gpio_backlight.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_data/tsc2007.h> #include <linux/platform_device.h> #include <linux/regulator/fixed.h> diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 6b775eae85c0..70236859919d 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -22,10 +22,10 @@ #include <linux/input/sh_keysc.h> #include <linux/interrupt.h> #include <linux/memblock.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mtd/physmap.h> #include <linux/platform_data/lv5207lp.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 773ee767d0c4..1853e6319a66 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -7,6 +7,7 @@ #include <linux/clkdev.h> #include <linux/dma-map-ops.h> #include <linux/init.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/input.h> @@ -14,7 +15,6 @@ #include <linux/memblock.h> #include <linux/mmc/host.h> #include <linux/mtd/physmap.h> -#include <linux/mfd/tmio.h> #include <linux/mtd/platnand.h> #include <linux/i2c.h> #include <linux/regulator/fixed.h> diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 787ddd3c627a..e500feb91053 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -21,9 +21,9 @@ #include <linux/input/sh_keysc.h> #include <linux/interrupt.h> #include <linux/memblock.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mtd/physmap.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index c675dec587ef..f84f60139bcf 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -22,13 +22,13 @@ #include <linux/delay.h> #include <linux/iopoll.h> #include <linux/kernel.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mmc/mmc.h> #include <linux/mmc/slot-gpio.h> #include <linux/module.h> #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/pinctrl-state.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/regulator/consumer.h> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 24e1c17908d7..97cd55fec0bf 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -11,12 +11,12 @@ #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/io-64-nonatomic-hi-lo.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of.h> #include <linux/pagemap.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/scatterlist.h> diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index c18581897f8a..68e31c37cce6 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -11,12 +11,12 @@ #include <linux/device.h> #include <linux/dma-mapping.h> #include <linux/dmaengine.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of.h> #include <linux/pagemap.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/scatterlist.h> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index c39141a5bd23..0c4397b3cffd 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -31,7 +31,6 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/irq.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> #include <linux/mmc/mmc.h> @@ -39,6 +38,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/pagemap.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/pm_qos.h> #include <linux/pm_runtime.h> diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index 1404989e6151..bd231dbe90ba 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -9,11 +9,11 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/mfd/syscon.h> -#include <linux/mfd/tmio.h> #include <linux/mmc/host.h> #include <linux/module.h> #include <linux/of.h> #include <linux/pinctrl/consumer.h> +#include <linux/platform_data/tmio.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> diff --git a/include/linux/mfd/tmio.h b/include/linux/platform_data/tmio.h similarity index 100% rename from include/linux/mfd/tmio.h rename to include/linux/platform_data/tmio.h -- 2.43.0 _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 6/6] mfd: tmio: move header to platform_data 2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang @ 2024-02-09 7:56 ` Lee Jones 2024-02-13 20:52 ` John Paul Adrian Glaubitz 1 sibling, 0 replies; 10+ messages in thread From: Lee Jones @ 2024-02-09 7:56 UTC (permalink / raw) To: Wolfram Sang Cc: linux-renesas-soc, Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz, Ulf Hansson, Kunihiko Hayashi, Masami Hiramatsu, linux-kernel, linux-sh, linux-mmc, linux-arm-kernel On Fri, 09 Feb 2024, Wolfram Sang wrote: > All the MFD components are gone from the header meanwhile. Only the MMC > relevant data is left which makes it a platform_data for the MMC > controller. Move the header to the now fitting directory. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > MAINTAINERS | 2 +- > arch/sh/boards/board-sh7757lcr.c | 2 +- > arch/sh/boards/mach-ap325rxa/setup.c | 2 +- > arch/sh/boards/mach-ecovec24/setup.c | 2 +- > arch/sh/boards/mach-kfr2r09/setup.c | 2 +- > arch/sh/boards/mach-migor/setup.c | 2 +- > arch/sh/boards/mach-se/7724/setup.c | 2 +- > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- > drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- > drivers/mmc/host/tmio_mmc_core.c | 2 +- > drivers/mmc/host/uniphier-sd.c | 2 +- > include/linux/{mfd => platform_data}/tmio.h | 0 > 13 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{mfd => platform_data}/tmio.h (100%) Acked-by: Lee Jones <lee@kernel.org> > diff --git a/MAINTAINERS b/MAINTAINERS > index 960512bec428..c4e20abd177b 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -22154,7 +22154,7 @@ L: linux-renesas-soc@vger.kernel.org > S: Supported > F: drivers/mmc/host/renesas_sdhi* > F: drivers/mmc/host/tmio_mmc* > -F: include/linux/mfd/tmio.h > +F: include/linux/platform_data/tmio.h > > TMP401 HARDWARE MONITOR DRIVER > M: Guenter Roeck <linux@roeck-us.net> > diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c > index f39c8196efdf..4014c042d2a5 100644 > --- a/arch/sh/boards/board-sh7757lcr.c > +++ b/arch/sh/boards/board-sh7757lcr.c > @@ -14,9 +14,9 @@ > #include <linux/spi/spi.h> > #include <linux/spi/flash.h> > #include <linux/io.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/platform_data/sh_mmcif.h> > +#include <linux/platform_data/tmio.h> > #include <linux/sh_eth.h> > #include <linux/sh_intc.h> > #include <linux/usb/renesas_usbhs.h> > diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c > index 645cccf3da88..bb5004a8ac02 100644 > --- a/arch/sh/boards/mach-ap325rxa/setup.c > +++ b/arch/sh/boards/mach-ap325rxa/setup.c > @@ -24,10 +24,10 @@ > #include <linux/init.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > #include <linux/mtd/sh_flctl.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c > index 30d117f9ad7e..6f13557eecd6 100644 > --- a/arch/sh/boards/mach-ecovec24/setup.c > +++ b/arch/sh/boards/mach-ecovec24/setup.c > @@ -17,13 +17,13 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/platform_data/sh_mmcif.h> > #include <linux/mtd/physmap.h> > #include <linux/gpio.h> > #include <linux/gpio/machine.h> > #include <linux/platform_data/gpio_backlight.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_data/tsc2007.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c > index 6b775eae85c0..70236859919d 100644 > --- a/arch/sh/boards/mach-kfr2r09/setup.c > +++ b/arch/sh/boards/mach-kfr2r09/setup.c > @@ -22,10 +22,10 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > #include <linux/platform_data/lv5207lp.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c > index 773ee767d0c4..1853e6319a66 100644 > --- a/arch/sh/boards/mach-migor/setup.c > +++ b/arch/sh/boards/mach-migor/setup.c > @@ -7,6 +7,7 @@ > #include <linux/clkdev.h> > #include <linux/dma-map-ops.h> > #include <linux/init.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/interrupt.h> > #include <linux/input.h> > @@ -14,7 +15,6 @@ > #include <linux/memblock.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > -#include <linux/mfd/tmio.h> > #include <linux/mtd/platnand.h> > #include <linux/i2c.h> > #include <linux/regulator/fixed.h> > diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c > index 787ddd3c627a..e500feb91053 100644 > --- a/arch/sh/boards/mach-se/7724/setup.c > +++ b/arch/sh/boards/mach-se/7724/setup.c > @@ -21,9 +21,9 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c > index c675dec587ef..f84f60139bcf 100644 > --- a/drivers/mmc/host/renesas_sdhi_core.c > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -22,13 +22,13 @@ > #include <linux/delay.h> > #include <linux/iopoll.h> > #include <linux/kernel.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/slot-gpio.h> > #include <linux/module.h> > #include <linux/pinctrl/consumer.h> > #include <linux/pinctrl/pinctrl-state.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/regulator/consumer.h> > diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > index 24e1c17908d7..97cd55fec0bf 100644 > --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > @@ -11,12 +11,12 @@ > #include <linux/device.h> > #include <linux/dma-mapping.h> > #include <linux/io-64-nonatomic-hi-lo.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/scatterlist.h> > diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c > index c18581897f8a..68e31c37cce6 100644 > --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c > @@ -11,12 +11,12 @@ > #include <linux/device.h> > #include <linux/dma-mapping.h> > #include <linux/dmaengine.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/scatterlist.h> > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c > index c39141a5bd23..0c4397b3cffd 100644 > --- a/drivers/mmc/host/tmio_mmc_core.c > +++ b/drivers/mmc/host/tmio_mmc_core.c > @@ -31,7 +31,6 @@ > #include <linux/interrupt.h> > #include <linux/io.h> > #include <linux/irq.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/card.h> > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > @@ -39,6 +38,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_qos.h> > #include <linux/pm_runtime.h> > diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c > index 1404989e6151..bd231dbe90ba 100644 > --- a/drivers/mmc/host/uniphier-sd.c > +++ b/drivers/mmc/host/uniphier-sd.c > @@ -9,11 +9,11 @@ > #include <linux/delay.h> > #include <linux/dma-mapping.h> > #include <linux/mfd/syscon.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pinctrl/consumer.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/reset.h> > diff --git a/include/linux/mfd/tmio.h b/include/linux/platform_data/tmio.h > similarity index 100% > rename from include/linux/mfd/tmio.h > rename to include/linux/platform_data/tmio.h > -- > 2.43.0 > -- Lee Jones [李琼斯] _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 6/6] mfd: tmio: move header to platform_data 2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang 2024-02-09 7:56 ` Lee Jones @ 2024-02-13 20:52 ` John Paul Adrian Glaubitz 1 sibling, 0 replies; 10+ messages in thread From: John Paul Adrian Glaubitz @ 2024-02-13 20:52 UTC (permalink / raw) To: Wolfram Sang, linux-renesas-soc Cc: Lee Jones, Yoshinori Sato, Rich Felker, Ulf Hansson, Kunihiko Hayashi, Masami Hiramatsu, linux-kernel, linux-sh, linux-mmc, linux-arm-kernel On Fri, 2024-02-09 at 02:58 +0100, Wolfram Sang wrote: > All the MFD components are gone from the header meanwhile. Only the MMC > relevant data is left which makes it a platform_data for the MMC > controller. Move the header to the now fitting directory. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > MAINTAINERS | 2 +- > arch/sh/boards/board-sh7757lcr.c | 2 +- > arch/sh/boards/mach-ap325rxa/setup.c | 2 +- > arch/sh/boards/mach-ecovec24/setup.c | 2 +- > arch/sh/boards/mach-kfr2r09/setup.c | 2 +- > arch/sh/boards/mach-migor/setup.c | 2 +- > arch/sh/boards/mach-se/7724/setup.c | 2 +- > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- > drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- > drivers/mmc/host/tmio_mmc_core.c | 2 +- > drivers/mmc/host/uniphier-sd.c | 2 +- > include/linux/{mfd => platform_data}/tmio.h | 0 > 13 files changed, 12 insertions(+), 12 deletions(-) > rename include/linux/{mfd => platform_data}/tmio.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 960512bec428..c4e20abd177b 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -22154,7 +22154,7 @@ L: linux-renesas-soc@vger.kernel.org > S: Supported > F: drivers/mmc/host/renesas_sdhi* > F: drivers/mmc/host/tmio_mmc* > -F: include/linux/mfd/tmio.h > +F: include/linux/platform_data/tmio.h > > TMP401 HARDWARE MONITOR DRIVER > M: Guenter Roeck <linux@roeck-us.net> > diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c > index f39c8196efdf..4014c042d2a5 100644 > --- a/arch/sh/boards/board-sh7757lcr.c > +++ b/arch/sh/boards/board-sh7757lcr.c > @@ -14,9 +14,9 @@ > #include <linux/spi/spi.h> > #include <linux/spi/flash.h> > #include <linux/io.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/platform_data/sh_mmcif.h> > +#include <linux/platform_data/tmio.h> > #include <linux/sh_eth.h> > #include <linux/sh_intc.h> > #include <linux/usb/renesas_usbhs.h> > diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c > index 645cccf3da88..bb5004a8ac02 100644 > --- a/arch/sh/boards/mach-ap325rxa/setup.c > +++ b/arch/sh/boards/mach-ap325rxa/setup.c > @@ -24,10 +24,10 @@ > #include <linux/init.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > #include <linux/mtd/sh_flctl.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c > index 30d117f9ad7e..6f13557eecd6 100644 > --- a/arch/sh/boards/mach-ecovec24/setup.c > +++ b/arch/sh/boards/mach-ecovec24/setup.c > @@ -17,13 +17,13 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/platform_data/sh_mmcif.h> > #include <linux/mtd/physmap.h> > #include <linux/gpio.h> > #include <linux/gpio/machine.h> > #include <linux/platform_data/gpio_backlight.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_data/tsc2007.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c > index 6b775eae85c0..70236859919d 100644 > --- a/arch/sh/boards/mach-kfr2r09/setup.c > +++ b/arch/sh/boards/mach-kfr2r09/setup.c > @@ -22,10 +22,10 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > #include <linux/platform_data/lv5207lp.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c > index 773ee767d0c4..1853e6319a66 100644 > --- a/arch/sh/boards/mach-migor/setup.c > +++ b/arch/sh/boards/mach-migor/setup.c > @@ -7,6 +7,7 @@ > #include <linux/clkdev.h> > #include <linux/dma-map-ops.h> > #include <linux/init.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/interrupt.h> > #include <linux/input.h> > @@ -14,7 +15,6 @@ > #include <linux/memblock.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > -#include <linux/mfd/tmio.h> > #include <linux/mtd/platnand.h> > #include <linux/i2c.h> > #include <linux/regulator/fixed.h> > diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c > index 787ddd3c627a..e500feb91053 100644 > --- a/arch/sh/boards/mach-se/7724/setup.c > +++ b/arch/sh/boards/mach-se/7724/setup.c > @@ -21,9 +21,9 @@ > #include <linux/input/sh_keysc.h> > #include <linux/interrupt.h> > #include <linux/memblock.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mtd/physmap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regulator/fixed.h> > #include <linux/regulator/machine.h> > diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c > index c675dec587ef..f84f60139bcf 100644 > --- a/drivers/mmc/host/renesas_sdhi_core.c > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -22,13 +22,13 @@ > #include <linux/delay.h> > #include <linux/iopoll.h> > #include <linux/kernel.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/slot-gpio.h> > #include <linux/module.h> > #include <linux/pinctrl/consumer.h> > #include <linux/pinctrl/pinctrl-state.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_domain.h> > #include <linux/regulator/consumer.h> > diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > index 24e1c17908d7..97cd55fec0bf 100644 > --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c > @@ -11,12 +11,12 @@ > #include <linux/device.h> > #include <linux/dma-mapping.h> > #include <linux/io-64-nonatomic-hi-lo.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/scatterlist.h> > diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c > index c18581897f8a..68e31c37cce6 100644 > --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c > +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c > @@ -11,12 +11,12 @@ > #include <linux/device.h> > #include <linux/dma-mapping.h> > #include <linux/dmaengine.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/scatterlist.h> > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c > index c39141a5bd23..0c4397b3cffd 100644 > --- a/drivers/mmc/host/tmio_mmc_core.c > +++ b/drivers/mmc/host/tmio_mmc_core.c > @@ -31,7 +31,6 @@ > #include <linux/interrupt.h> > #include <linux/io.h> > #include <linux/irq.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/card.h> > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > @@ -39,6 +38,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pagemap.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/pm_qos.h> > #include <linux/pm_runtime.h> > diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c > index 1404989e6151..bd231dbe90ba 100644 > --- a/drivers/mmc/host/uniphier-sd.c > +++ b/drivers/mmc/host/uniphier-sd.c > @@ -9,11 +9,11 @@ > #include <linux/delay.h> > #include <linux/dma-mapping.h> > #include <linux/mfd/syscon.h> > -#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/pinctrl/consumer.h> > +#include <linux/platform_data/tmio.h> > #include <linux/platform_device.h> > #include <linux/regmap.h> > #include <linux/reset.h> > diff --git a/include/linux/mfd/tmio.h b/include/linux/platform_data/tmio.h > similarity index 100% > rename from include/linux/mfd/tmio.h > rename to include/linux/platform_data/tmio.h Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-09 1:58 [PATCH 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang 2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang @ 2024-02-09 7:58 ` Lee Jones 2024-02-09 10:02 ` Wolfram Sang 2024-02-09 11:34 ` Ulf Hansson 2 siblings, 1 reply; 10+ messages in thread From: Lee Jones @ 2024-02-09 7:58 UTC (permalink / raw) To: Wolfram Sang Cc: linux-renesas-soc, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh On Fri, 09 Feb 2024, Wolfram Sang wrote: > The MFD parts of the TMIO have been removed by Arnd, so that only the > SD/MMC related functionality is left. Remove the outdated remains in the > public header file and then move it to platform_data as the data is now > specific for the SD/MMC part. > > Based on 6.8-rc3, build bot is happy. Branch is here: > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification > > I'd suggest this goes via the MFD tree, so the series would need acks > from the MMC and SH maintainers. Is that okay with everyone? > > All the best! > > Wolfram Could you please change all of the subject lines with "mfd" in them i.e. all of the commits which touch include/linux/mfd and ensure the description starts with an upper case char? I like all commits that touch drivers/mfd and include/linux/mfd to have the same formatting structure. Thanks. > Wolfram Sang (6): > mfd: tmio: remove obsolete platform_data > mfd: tmio: remove obsolete io accessors > mmc: tmio/sdhi: fix includes > mfd: tmio: update include files > mfd: tmio: sanitize comments > mfd: tmio: move header to platform_data > > MAINTAINERS | 2 +- > arch/sh/boards/board-sh7757lcr.c | 2 +- > arch/sh/boards/mach-ap325rxa/setup.c | 2 +- > arch/sh/boards/mach-ecovec24/setup.c | 2 +- > arch/sh/boards/mach-kfr2r09/setup.c | 2 +- > arch/sh/boards/mach-migor/setup.c | 2 +- > arch/sh/boards/mach-se/7724/setup.c | 2 +- > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- > drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- > drivers/mmc/host/tmio_mmc_core.c | 3 +- > drivers/mmc/host/uniphier-sd.c | 2 +- > include/linux/mfd/tmio.h | 133 ------------------ > include/linux/platform_data/tmio.h | 64 +++++++++ > 14 files changed, 81 insertions(+), 147 deletions(-) > delete mode 100644 include/linux/mfd/tmio.h > create mode 100644 include/linux/platform_data/tmio.h > > -- > 2.43.0 > -- Lee Jones [李琼斯] _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-09 7:58 ` [PATCH 0/6] mfd: tmio: simplify header and move " Lee Jones @ 2024-02-09 10:02 ` Wolfram Sang 0 siblings, 0 replies; 10+ messages in thread From: Wolfram Sang @ 2024-02-09 10:02 UTC (permalink / raw) To: Lee Jones Cc: linux-renesas-soc, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh [-- Attachment #1.1: Type: text/plain, Size: 1129 bytes --] On Fri, Feb 09, 2024 at 07:58:39AM +0000, Lee Jones wrote: > On Fri, 09 Feb 2024, Wolfram Sang wrote: > > > The MFD parts of the TMIO have been removed by Arnd, so that only the > > SD/MMC related functionality is left. Remove the outdated remains in the > > public header file and then move it to platform_data as the data is now > > specific for the SD/MMC part. > > > > Based on 6.8-rc3, build bot is happy. Branch is here: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification > > > > I'd suggest this goes via the MFD tree, so the series would need acks > > from the MMC and SH maintainers. Is that okay with everyone? > > > > All the best! > > > > Wolfram > > Could you please change all of the subject lines with "mfd" in them > i.e. all of the commits which touch include/linux/mfd and ensure the > description starts with an upper case char? > > I like all commits that touch drivers/mfd and include/linux/mfd to have > the same formatting structure. Sure, I'll just wait one day for other review comments. Thanks for your review! [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-09 1:58 [PATCH 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang 2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang 2024-02-09 7:58 ` [PATCH 0/6] mfd: tmio: simplify header and move " Lee Jones @ 2024-02-09 11:34 ` Ulf Hansson 2024-02-09 13:28 ` Lee Jones 2 siblings, 1 reply; 10+ messages in thread From: Ulf Hansson @ 2024-02-09 11:34 UTC (permalink / raw) To: Wolfram Sang Cc: linux-renesas-soc, Lee Jones, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh On Fri, 9 Feb 2024 at 02:59, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > The MFD parts of the TMIO have been removed by Arnd, so that only the > SD/MMC related functionality is left. Remove the outdated remains in the > public header file and then move it to platform_data as the data is now > specific for the SD/MMC part. > > Based on 6.8-rc3, build bot is happy. Branch is here: > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification > > I'd suggest this goes via the MFD tree, so the series would need acks > from the MMC and SH maintainers. Is that okay with everyone? Wouldn't it be better to funnel this via the mmc tree? In that way, we can easily avoid conflicts with additional renesas-mmc driver changes that we have in pipe. Or perhaps there are other changes that make the mfd tree preferred? Kind regards Uffe > > All the best! > > Wolfram > > > Wolfram Sang (6): > mfd: tmio: remove obsolete platform_data > mfd: tmio: remove obsolete io accessors > mmc: tmio/sdhi: fix includes > mfd: tmio: update include files > mfd: tmio: sanitize comments > mfd: tmio: move header to platform_data > > MAINTAINERS | 2 +- > arch/sh/boards/board-sh7757lcr.c | 2 +- > arch/sh/boards/mach-ap325rxa/setup.c | 2 +- > arch/sh/boards/mach-ecovec24/setup.c | 2 +- > arch/sh/boards/mach-kfr2r09/setup.c | 2 +- > arch/sh/boards/mach-migor/setup.c | 2 +- > arch/sh/boards/mach-se/7724/setup.c | 2 +- > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- > drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- > drivers/mmc/host/tmio_mmc_core.c | 3 +- > drivers/mmc/host/uniphier-sd.c | 2 +- > include/linux/mfd/tmio.h | 133 ------------------ > include/linux/platform_data/tmio.h | 64 +++++++++ > 14 files changed, 81 insertions(+), 147 deletions(-) > delete mode 100644 include/linux/mfd/tmio.h > create mode 100644 include/linux/platform_data/tmio.h > > -- > 2.43.0 > > _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-09 11:34 ` Ulf Hansson @ 2024-02-09 13:28 ` Lee Jones 2024-02-12 11:17 ` Ulf Hansson 0 siblings, 1 reply; 10+ messages in thread From: Lee Jones @ 2024-02-09 13:28 UTC (permalink / raw) To: Ulf Hansson Cc: Wolfram Sang, linux-renesas-soc, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh On Fri, 09 Feb 2024, Ulf Hansson wrote: > On Fri, 9 Feb 2024 at 02:59, Wolfram Sang > <wsa+renesas@sang-engineering.com> wrote: > > > > The MFD parts of the TMIO have been removed by Arnd, so that only the > > SD/MMC related functionality is left. Remove the outdated remains in the > > public header file and then move it to platform_data as the data is now > > specific for the SD/MMC part. > > > > Based on 6.8-rc3, build bot is happy. Branch is here: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification > > > > I'd suggest this goes via the MFD tree, so the series would need acks > > from the MMC and SH maintainers. Is that okay with everyone? > > Wouldn't it be better to funnel this via the mmc tree? In that way, we > can easily avoid conflicts with additional renesas-mmc driver changes > that we have in pipe. You could say the same about changes SH, MFD and Platform Data have in the pipe. > Or perhaps there are other changes that make the mfd tree preferred? MFD is usually preferred since the parent device usually lives there and we are well accustomed to merging multi-subsystem related sets. It doesn't really matter how this is merged. The only stipulation is that whoever applies the set does so on a succinct, immutable, tagged branch and sends out a pull-request for everyone else to pull from. If you want to do that, there are no complains from me. > > All the best! > > > > Wolfram > > > > > > Wolfram Sang (6): > > mfd: tmio: remove obsolete platform_data > > mfd: tmio: remove obsolete io accessors > > mmc: tmio/sdhi: fix includes > > mfd: tmio: update include files > > mfd: tmio: sanitize comments > > mfd: tmio: move header to platform_data > > > > MAINTAINERS | 2 +- > > arch/sh/boards/board-sh7757lcr.c | 2 +- > > arch/sh/boards/mach-ap325rxa/setup.c | 2 +- > > arch/sh/boards/mach-ecovec24/setup.c | 2 +- > > arch/sh/boards/mach-kfr2r09/setup.c | 2 +- > > arch/sh/boards/mach-migor/setup.c | 2 +- > > arch/sh/boards/mach-se/7724/setup.c | 2 +- > > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- > > drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- > > drivers/mmc/host/tmio_mmc_core.c | 3 +- > > drivers/mmc/host/uniphier-sd.c | 2 +- > > include/linux/mfd/tmio.h | 133 ------------------ > > include/linux/platform_data/tmio.h | 64 +++++++++ > > 14 files changed, 81 insertions(+), 147 deletions(-) > > delete mode 100644 include/linux/mfd/tmio.h > > create mode 100644 include/linux/platform_data/tmio.h > > > > -- > > 2.43.0 > > > > -- Lee Jones [李琼斯] _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-09 13:28 ` Lee Jones @ 2024-02-12 11:17 ` Ulf Hansson 2024-02-12 12:12 ` Wolfram Sang 0 siblings, 1 reply; 10+ messages in thread From: Ulf Hansson @ 2024-02-12 11:17 UTC (permalink / raw) To: Lee Jones Cc: Wolfram Sang, linux-renesas-soc, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh On Fri, 9 Feb 2024 at 14:28, Lee Jones <lee@kernel.org> wrote: > > On Fri, 09 Feb 2024, Ulf Hansson wrote: > > > On Fri, 9 Feb 2024 at 02:59, Wolfram Sang > > <wsa+renesas@sang-engineering.com> wrote: > > > > > > The MFD parts of the TMIO have been removed by Arnd, so that only the > > > SD/MMC related functionality is left. Remove the outdated remains in the > > > public header file and then move it to platform_data as the data is now > > > specific for the SD/MMC part. > > > > > > Based on 6.8-rc3, build bot is happy. Branch is here: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification > > > > > > I'd suggest this goes via the MFD tree, so the series would need acks > > > from the MMC and SH maintainers. Is that okay with everyone? > > > > Wouldn't it be better to funnel this via the mmc tree? In that way, we > > can easily avoid conflicts with additional renesas-mmc driver changes > > that we have in pipe. > > You could say the same about changes SH, MFD and Platform Data have in > the pipe. > > > Or perhaps there are other changes that make the mfd tree preferred? > > MFD is usually preferred since the parent device usually lives there and > we are well accustomed to merging multi-subsystem related sets. > > It doesn't really matter how this is merged. The only stipulation is > that whoever applies the set does so on a succinct, immutable, tagged > branch and sends out a pull-request for everyone else to pull from. You are right. Although, in this particular case I thought it could make better sense to use the mmc tree, because 1) we are only removing a header file from mfd and 2) I know we have other renesas-mmc changes in the pipe for the next release. The point is, I wanted us to avoid the need for using an immutable branch. But nevermind. > > If you want to do that, there are no complains from me. Well, it sounds like we may need the flexibility with the immutable branch, so I suggest we do the usual thing with the mfd tree. Please add my ack for the mmc related changes. [...] Kind regards Uffe _______________________________________________ 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] 10+ messages in thread
* Re: [PATCH 0/6] mfd: tmio: simplify header and move to platform_data 2024-02-12 11:17 ` Ulf Hansson @ 2024-02-12 12:12 ` Wolfram Sang 0 siblings, 0 replies; 10+ messages in thread From: Wolfram Sang @ 2024-02-12 12:12 UTC (permalink / raw) To: Ulf Hansson Cc: Lee Jones, linux-renesas-soc, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh [-- Attachment #1.1: Type: text/plain, Size: 214 bytes --] Hi Lee, Ulf, > Please add my ack for the mmc related changes. I prepared v2 of the series: rebased to rc4, acks added, capitalized first letter... waiting for buildbot now before resending. Thanks, Wolfram [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ 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] 10+ messages in thread
end of thread, other threads:[~2024-02-13 20:53 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-02-09 1:58 [PATCH 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang 2024-02-09 1:58 ` [PATCH 6/6] mfd: tmio: move header " Wolfram Sang 2024-02-09 7:56 ` Lee Jones 2024-02-13 20:52 ` John Paul Adrian Glaubitz 2024-02-09 7:58 ` [PATCH 0/6] mfd: tmio: simplify header and move " Lee Jones 2024-02-09 10:02 ` Wolfram Sang 2024-02-09 11:34 ` Ulf Hansson 2024-02-09 13:28 ` Lee Jones 2024-02-12 11:17 ` Ulf Hansson 2024-02-12 12:12 ` Wolfram Sang
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).