On Tue, 12 Apr 2022 at 11:31, Wolfram Sang
<wsa+renesas@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> We have a dedicated directory for platform_data meanwhile, don't spoil
> the MMC directory with it.
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
As this is a trivial change, I have applied it for next, thanks!
Sato-san, Rich, please tell me if you see any problems with this - or
if you want me to add your acks.
Kind regards
Uffe
> ---
>
> Change since v1: fixed sorting of includes in the MMCIF driver
> (Thanks Geert!)
>
> I don't have the HW to test this but the buildbots are happy with this
> change. I checked that they actually tested the SH builds. To make the
> patch more readable, I used the -M (rename) feature of git-format-patch.
>
> arch/sh/boards/board-sh7757lcr.c | 2 +-
> arch/sh/boards/mach-ecovec24/setup.c | 2 +-
> arch/sh/boot/romimage/mmcif-sh7724.c | 2 +-
> drivers/mmc/host/sh_mmcif.c | 2 +-
> include/linux/{mmc => platform_data}/sh_mmcif.h | 2 --
> 5 files changed, 4 insertions(+), 6 deletions(-)
> rename include/linux/{mmc => platform_data}/sh_mmcif.h (99%)
>
> diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
> index c32b4c6229d3..f39c8196efdf 100644
> --- a/arch/sh/boards/board-sh7757lcr.c
> +++ b/arch/sh/boards/board-sh7757lcr.c
> @@ -16,7 +16,7 @@
> #include <linux/io.h>
> #include <linux/mfd/tmio.h>
> #include <linux/mmc/host.h>
> -#include <linux/mmc/sh_mmcif.h>
> +#include <linux/platform_data/sh_mmcif.h>
> #include <linux/sh_eth.h>
> #include <linux/sh_intc.h>
> #include <linux/usb/renesas_usbhs.h>
> diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
> index 4c9522dd351f..674da7ebd8b7 100644
> --- a/arch/sh/boards/mach-ecovec24/setup.c
> +++ b/arch/sh/boards/mach-ecovec24/setup.c
> @@ -19,7 +19,7 @@
> #include <linux/memblock.h>
> #include <linux/mfd/tmio.h>
> #include <linux/mmc/host.h>
> -#include <linux/mmc/sh_mmcif.h>
> +#include <linux/platform_data/sh_mmcif.h>
> #include <linux/mtd/physmap.h>
> #include <linux/gpio.h>
> #include <linux/gpio/machine.h>
> diff --git a/arch/sh/boot/romimage/mmcif-sh7724.c b/arch/sh/boot/romimage/mmcif-sh7724.c
> index 6595b6b45bf1..d30123d859e0 100644
> --- a/arch/sh/boot/romimage/mmcif-sh7724.c
> +++ b/arch/sh/boot/romimage/mmcif-sh7724.c
> @@ -8,7 +8,7 @@
> * for more details.
> */
>
> -#include <linux/mmc/sh_mmcif.h>
> +#include <linux/platform_data/sh_mmcif.h>
> #include <mach/romimage.h>
>
> #define MMCIF_BASE (void __iomem *)0xa4ca0000
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index 5f9ebf045b1c..0fd4c9d644dd 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -43,12 +43,12 @@
> #include <linux/mmc/host.h>
> #include <linux/mmc/mmc.h>
> #include <linux/mmc/sdio.h>
> -#include <linux/mmc/sh_mmcif.h>
> #include <linux/mmc/slot-gpio.h>
> #include <linux/mod_devicetable.h>
> #include <linux/mutex.h>
> #include <linux/of_device.h>
> #include <linux/pagemap.h>
> +#include <linux/platform_data/sh_mmcif.h>
> #include <linux/platform_device.h>
> #include <linux/pm_qos.h>
> #include <linux/pm_runtime.h>
> diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/platform_data/sh_mmcif.h
> similarity index 99%
> rename from include/linux/mmc/sh_mmcif.h
> rename to include/linux/platform_data/sh_mmcif.h
> index e25533b95d9f..6eb914f958f9 100644
> --- a/include/linux/mmc/sh_mmcif.h
> +++ b/include/linux/platform_data/sh_mmcif.h
> @@ -1,7 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> /*
> - * include/linux/mmc/sh_mmcif.h
> - *
> * platform data for eMMC driver
> *
> * Copyright (C) 2010 Renesas Solutions Corp.
> --
> 2.30.2
>
