* [PATCH] mmc: sh_mmcif: move platform_data header to proper location
@ 2022-04-07 6:31 Wolfram Sang
2022-04-07 9:41 ` Ulf Hansson
2022-04-12 9:16 ` Geert Uytterhoeven
0 siblings, 2 replies; 5+ messages in thread
From: Wolfram Sang @ 2022-04-07 6:31 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-renesas-soc, Wolfram Sang
We have a dedicated directory for platform_data meanwhile, don't spoil
the MMC directory with it.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
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..dc17bf5bc3b4 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -43,13 +43,13 @@
#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_device.h>
+#include <linux/platform_data/sh_mmcif.h>
#include <linux/pm_qos.h>
#include <linux/pm_runtime.h>
#include <linux/sh_dma.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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mmc: sh_mmcif: move platform_data header to proper location
2022-04-07 6:31 [PATCH] mmc: sh_mmcif: move platform_data header to proper location Wolfram Sang
@ 2022-04-07 9:41 ` Ulf Hansson
2022-04-07 13:07 ` Wolfram Sang
2022-04-12 9:16 ` Geert Uytterhoeven
1 sibling, 1 reply; 5+ messages in thread
From: Ulf Hansson @ 2022-04-07 9:41 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-mmc, linux-renesas-soc
On Thu, 7 Apr 2022 at 08:31, Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
>
> We have a dedicated directory for platform_data meanwhile, don't spoil
> the MMC directory with it.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
I can pick this up through my mmc tree, but I need an ack from the
sh-maintainers to do it.
Kind regards
Uffe
> ---
>
> 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..dc17bf5bc3b4 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -43,13 +43,13 @@
> #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_device.h>
> +#include <linux/platform_data/sh_mmcif.h>
> #include <linux/pm_qos.h>
> #include <linux/pm_runtime.h>
> #include <linux/sh_dma.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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mmc: sh_mmcif: move platform_data header to proper location
2022-04-07 9:41 ` Ulf Hansson
@ 2022-04-07 13:07 ` Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2022-04-07 13:07 UTC (permalink / raw)
To: Ulf Hansson, Yoshinori Sato, Rich Felker
Cc: linux-mmc, linux-renesas-soc, linux-sh
[-- Attachment #1: Type: text/plain, Size: 4100 bytes --]
On Thu, Apr 07, 2022 at 11:41:45AM +0200, Ulf Hansson wrote:
> On Thu, 7 Apr 2022 at 08:31, Wolfram Sang
> <wsa+renesas@sang-engineering.com> wrote:
> >
> > We have a dedicated directory for platform_data meanwhile, don't spoil
> > the MMC directory with it.
> >
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> I can pick this up through my mmc tree, but I need an ack from the
> sh-maintainers to do it.
Right, I forgot to CC them :( Sato-san, Rich are you OK with the below
change?
> > ---
> >
> > 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..dc17bf5bc3b4 100644
> > --- a/drivers/mmc/host/sh_mmcif.c
> > +++ b/drivers/mmc/host/sh_mmcif.c
> > @@ -43,13 +43,13 @@
> > #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_device.h>
> > +#include <linux/platform_data/sh_mmcif.h>
> > #include <linux/pm_qos.h>
> > #include <linux/pm_runtime.h>
> > #include <linux/sh_dma.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
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mmc: sh_mmcif: move platform_data header to proper location
2022-04-07 6:31 [PATCH] mmc: sh_mmcif: move platform_data header to proper location Wolfram Sang
2022-04-07 9:41 ` Ulf Hansson
@ 2022-04-12 9:16 ` Geert Uytterhoeven
2022-04-12 9:22 ` Wolfram Sang
1 sibling, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2022-04-12 9:16 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Linux MMC List, Linux-Renesas
Hi Wolfram,
On Thu, Apr 7, 2022 at 4:33 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> We have a dedicated directory for platform_data meanwhile, don't spoil
> the MMC directory with it.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
One minor nit below.
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -43,13 +43,13 @@
> #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_device.h>
> +#include <linux/platform_data/sh_mmcif.h>
Is this intended to be sorted? a < e.
> #include <linux/pm_qos.h>
> #include <linux/pm_runtime.h>
> #include <linux/sh_dma.h>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mmc: sh_mmcif: move platform_data header to proper location
2022-04-12 9:16 ` Geert Uytterhoeven
@ 2022-04-12 9:22 ` Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2022-04-12 9:22 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Linux MMC List, Linux-Renesas
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
> > #include <linux/platform_device.h>
> > +#include <linux/platform_data/sh_mmcif.h>
>
> Is this intended to be sorted? a < e.
Yes, can be argued. I was giving the subdirectory a priority, but
probably keeping the lexical sorting is better.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-12 10:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-07 6:31 [PATCH] mmc: sh_mmcif: move platform_data header to proper location Wolfram Sang
2022-04-07 9:41 ` Ulf Hansson
2022-04-07 13:07 ` Wolfram Sang
2022-04-12 9:16 ` Geert Uytterhoeven
2022-04-12 9:22 ` Wolfram Sang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.