| Message ID | 20240209015817.14627-14-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | mfd: tmio: simplify header and move to platform_data | expand |
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 >
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>
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
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%)