* [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data
@ 2024-02-13 22:02 Wolfram Sang
2024-02-13 22:02 ` [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Wolfram Sang
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Lee Jones, Wolfram Sang, linux-arm-kernel, linux-kernel,
linux-mmc, linux-sh
Changes since v1:
* rebased to rc4
* collected all needed acks (Thanks!)
* capitalized first letter in commit subject
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-rc4, build bot is happy. Branch is here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/tmio-simplification
(just missing Adrian's ack for SH which came just now)
We agreed already that this should go in via MFD. Thanks!
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:05 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors Wolfram Sang
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Lee Jones, Wolfram Sang, linux-kernel
With commit 8971bb812e3c ("mfd: remove toshiba tmio drivers"), all users
of platform data for NAND and framebuffers are gone. So, remove
definitions from the header, too.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Lee Jones <lee@kernel.org>
---
include/linux/mfd/tmio.h | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index eace8ea6cda0..bc53323293a3 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -103,31 +103,4 @@ struct tmio_mmc_data {
void (*set_pwr)(struct platform_device *host, int state);
void (*set_clk_div)(struct platform_device *host, int state);
};
-
-/*
- * data for the NAND controller
- */
-struct tmio_nand_data {
- struct nand_bbt_descr *badblock_pattern;
- struct mtd_partition *partition;
- unsigned int num_partitions;
- const char *const *part_parsers;
-};
-
-#define FBIO_TMIO_ACC_WRITE 0x7C639300
-#define FBIO_TMIO_ACC_SYNC 0x7C639301
-
-struct tmio_fb_data {
- int (*lcd_set_power)(struct platform_device *fb_dev,
- bool on);
- int (*lcd_mode)(struct platform_device *fb_dev,
- const struct fb_videomode *mode);
- int num_modes;
- struct fb_videomode *modes;
-
- /* in mm: size of screen */
- int height;
- int width;
-};
-
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
2024-02-13 22:02 ` [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:07 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes Wolfram Sang
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Lee Jones, Wolfram Sang, linux-kernel
Since commit 568494db6809 ("mtd: remove tmio_nand driver") and commit
aceae7848624 ("fbdev: remove tmiofb driver"), these accessors have no
users anymore. Remove them.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Lee Jones <lee@kernel.org>
---
include/linux/mfd/tmio.h | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index bc53323293a3..4223315d2b2a 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -10,31 +10,6 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
-#define tmio_ioread8(addr) readb(addr)
-#define tmio_ioread16(addr) readw(addr)
-#define tmio_ioread16_rep(r, b, l) readsw(r, b, l)
-#define tmio_ioread32(addr) \
- (((u32)readw((addr))) | (((u32)readw((addr) + 2)) << 16))
-
-#define tmio_iowrite8(val, addr) writeb((val), (addr))
-#define tmio_iowrite16(val, addr) writew((val), (addr))
-#define tmio_iowrite16_rep(r, b, l) writesw(r, b, l)
-#define tmio_iowrite32(val, addr) \
- do { \
- writew((val), (addr)); \
- writew((val) >> 16, (addr) + 2); \
- } while (0)
-
-#define sd_config_write8(base, shift, reg, val) \
- tmio_iowrite8((val), (base) + ((reg) << (shift)))
-#define sd_config_write16(base, shift, reg, val) \
- tmio_iowrite16((val), (base) + ((reg) << (shift)))
-#define sd_config_write32(base, shift, reg, val) \
- do { \
- tmio_iowrite16((val), (base) + ((reg) << (shift))); \
- tmio_iowrite16((val) >> 16, (base) + ((reg + 2) << (shift))); \
- } while (0)
-
/* tmio MMC platform flags */
/*
* Some controllers can support a 2-byte block size when the bus width
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
2024-02-13 22:02 ` [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Wolfram Sang
2024-02-13 22:02 ` [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:09 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 4/6] mfd: tmio: Update include files Wolfram Sang
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Lee Jones, Wolfram Sang, kernel test robot, Ulf Hansson,
linux-mmc, linux-kernel
TMIO uses an of_* function, and SDHI uses pm_runtime functions. Add the
includes directly, so we can clean up another header properly. Sort the
pagemap include while we are here.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202402070323.JpYfFtkQ-lkp@intel.com/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 3 ++-
drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 ++-
drivers/mmc/host/tmio_mmc_core.c | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 53d34c3eddce..24e1c17908d7 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -16,8 +16,9 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/of.h>
-#include <linux/platform_device.h>
#include <linux/pagemap.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/scatterlist.h>
#include <linux/sys_soc.h>
diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
index 9cf7f9feab72..c18581897f8a 100644
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
@@ -16,8 +16,9 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/of.h>
-#include <linux/platform_device.h>
#include <linux/pagemap.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/scatterlist.h>
#include <linux/sys_soc.h>
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index be7f18fd4836..c39141a5bd23 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -37,6 +37,7 @@
#include <linux/mmc/mmc.h>
#include <linux/mmc/slot-gpio.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/pagemap.h>
#include <linux/platform_device.h>
#include <linux/pm_qos.h>
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/6] mfd: tmio: Update include files
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
` (2 preceding siblings ...)
2024-02-13 22:02 ` [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:11 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 5/6] mfd: tmio: Sanitize comments Wolfram Sang
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Lee Jones, Wolfram Sang, linux-kernel
Remove meanwhile unneeded includes, only add types.h for dma_addr_t.
Also, remove an obsolete forward declaration while here.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Lee Jones <lee@kernel.org>
---
include/linux/mfd/tmio.h | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 4223315d2b2a..f71d4e507dcb 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -2,13 +2,8 @@
#ifndef MFD_TMIO_H
#define MFD_TMIO_H
-#include <linux/device.h>
-#include <linux/fb.h>
-#include <linux/io.h>
-#include <linux/jiffies.h>
-#include <linux/mmc/card.h>
#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
+#include <linux/types.h>
/* tmio MMC platform flags */
/*
@@ -59,8 +54,6 @@
/* Some controllers have a CBSY bit */
#define TMIO_MMC_HAVE_CBSY BIT(11)
-struct dma_chan;
-
/*
* data for the MMC controller
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 5/6] mfd: tmio: Sanitize comments
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
` (3 preceding siblings ...)
2024-02-13 22:02 ` [PATCH v2 4/6] mfd: tmio: Update include files Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:13 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 6/6] mfd: tmio: Move header to platform_data Wolfram Sang
2024-02-23 15:20 ` [PATCH v2 0/6] mfd: tmio: simplify header and move " Lee Jones
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Lee Jones, Wolfram Sang, linux-kernel
Reformat the comments to utilize the maximum line length and use single
line comments where appropriate. Remove superfluous comments, too.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Lee Jones <lee@kernel.org>
---
include/linux/mfd/tmio.h | 32 +++++++++++---------------------
1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index f71d4e507dcb..1cf418643da9 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -5,23 +5,23 @@
#include <linux/platform_device.h>
#include <linux/types.h>
-/* tmio MMC platform flags */
+/* TMIO MMC platform flags */
+
/*
- * Some controllers can support a 2-byte block size when the bus width
- * is configured in 4-bit mode.
+ * Some controllers can support a 2-byte block size when the bus width is
+ * configured in 4-bit mode.
*/
#define TMIO_MMC_BLKSZ_2BYTES BIT(1)
-/*
- * Some controllers can support SDIO IRQ signalling.
- */
+
+/* Some controllers can support SDIO IRQ signalling */
#define TMIO_MMC_SDIO_IRQ BIT(2)
/* Some features are only available or tested on R-Car Gen2 or later */
#define TMIO_MMC_MIN_RCAR2 BIT(3)
/*
- * Some controllers require waiting for the SD bus to become
- * idle before writing to some registers.
+ * Some controllers require waiting for the SD bus to become idle before
+ * writing to some registers.
*/
#define TMIO_MMC_HAS_IDLE_WAIT BIT(4)
@@ -32,31 +32,21 @@
*/
#define TMIO_MMC_USE_BUSY_TIMEOUT BIT(5)
-/*
- * Some controllers have CMD12 automatically
- * issue/non-issue register
- */
+/* Some controllers have CMD12 automatically issue/non-issue register */
#define TMIO_MMC_HAVE_CMD12_CTRL BIT(7)
/* Controller has some SDIO status bits which must be 1 */
#define TMIO_MMC_SDIO_STATUS_SETBITS BIT(8)
-/*
- * Some controllers have a 32-bit wide data port register
- */
+/* Some controllers have a 32-bit wide data port register */
#define TMIO_MMC_32BIT_DATA_PORT BIT(9)
-/*
- * Some controllers allows to set SDx actual clock
- */
+/* Some controllers allows to set SDx actual clock */
#define TMIO_MMC_CLK_ACTUAL BIT(10)
/* Some controllers have a CBSY bit */
#define TMIO_MMC_HAVE_CBSY BIT(11)
-/*
- * data for the MMC controller
- */
struct tmio_mmc_data {
void *chan_priv_tx;
void *chan_priv_rx;
--
2.43.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 6/6] mfd: tmio: Move header to platform_data
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
` (4 preceding siblings ...)
2024-02-13 22:02 ` [PATCH v2 5/6] mfd: tmio: Sanitize comments Wolfram Sang
@ 2024-02-13 22:02 ` Wolfram Sang
2024-02-14 16:16 ` Geert Uytterhoeven
2024-02-23 15:20 ` [PATCH v2 0/6] mfd: tmio: simplify header and move " Lee Jones
6 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2024-02-13 22:02 UTC (permalink / raw)
To: linux-renesas-soc
Cc: Lee Jones, Wolfram Sang, Ulf Hansson, John Paul Adrian Glaubitz,
Yoshinori Sato, Rich Felker, 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>
Acked-by: Lee Jones <lee@kernel.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
---
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 73d898383e51..fb672e0bb0c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22153,7 +22153,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
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data
2024-02-13 22:02 ` [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Wolfram Sang
@ 2024-02-14 16:05 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:05 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Lee Jones, linux-kernel
On Tue, Feb 13, 2024 at 11:05 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> With commit 8971bb812e3c ("mfd: remove toshiba tmio drivers"), all users
> of platform data for NAND and framebuffers are gone. So, remove
> definitions from the header, too.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Lee Jones <lee@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors
2024-02-13 22:02 ` [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors Wolfram Sang
@ 2024-02-14 16:07 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:07 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Lee Jones, linux-kernel
On Tue, Feb 13, 2024 at 11:46 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Since commit 568494db6809 ("mtd: remove tmio_nand driver") and commit
> aceae7848624 ("fbdev: remove tmiofb driver"), these accessors have no
> users anymore. Remove them.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Lee Jones <lee@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes
2024-02-13 22:02 ` [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes Wolfram Sang
@ 2024-02-14 16:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:09 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-renesas-soc, Lee Jones, kernel test robot, Ulf Hansson,
linux-mmc, linux-kernel
On Tue, Feb 13, 2024 at 11:18 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> TMIO uses an of_* function, and SDHI uses pm_runtime functions. Add the
> includes directly, so we can clean up another header properly. Sort the
> pagemap include while we are here.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202402070323.JpYfFtkQ-lkp@intel.com/
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 4/6] mfd: tmio: Update include files
2024-02-13 22:02 ` [PATCH v2 4/6] mfd: tmio: Update include files Wolfram Sang
@ 2024-02-14 16:11 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:11 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Lee Jones, linux-kernel
On Tue, Feb 13, 2024 at 11:05 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Remove meanwhile unneeded includes, only add types.h for dma_addr_t.
> Also, remove an obsolete forward declaration while here.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Lee Jones <lee@kernel.org>
LGTM, so
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 5/6] mfd: tmio: Sanitize comments
2024-02-13 22:02 ` [PATCH v2 5/6] mfd: tmio: Sanitize comments Wolfram Sang
@ 2024-02-14 16:13 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:13 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Lee Jones, linux-kernel
On Tue, Feb 13, 2024 at 11:07 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Reformat the comments to utilize the maximum line length and use single
> line comments where appropriate. Remove superfluous comments, too.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Lee Jones <lee@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 6/6] mfd: tmio: Move header to platform_data
2024-02-13 22:02 ` [PATCH v2 6/6] mfd: tmio: Move header to platform_data Wolfram Sang
@ 2024-02-14 16:16 ` Geert Uytterhoeven
0 siblings, 0 replies; 14+ messages in thread
From: Geert Uytterhoeven @ 2024-02-14 16:16 UTC (permalink / raw)
To: Wolfram Sang
Cc: linux-renesas-soc, Lee Jones, Ulf Hansson,
John Paul Adrian Glaubitz, Yoshinori Sato, Rich Felker,
Kunihiko Hayashi, Masami Hiramatsu, linux-kernel, linux-sh,
linux-mmc, linux-arm-kernel
On Tue, Feb 13, 2024 at 11:04 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> 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>
> Acked-by: Lee Jones <lee@kernel.org>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
> Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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] 14+ messages in thread
* Re: [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
` (5 preceding siblings ...)
2024-02-13 22:02 ` [PATCH v2 6/6] mfd: tmio: Move header to platform_data Wolfram Sang
@ 2024-02-23 15:20 ` Lee Jones
6 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2024-02-23 15:20 UTC (permalink / raw)
To: linux-renesas-soc, Wolfram Sang
Cc: Lee Jones, linux-arm-kernel, linux-kernel, linux-mmc, linux-sh
On Tue, 13 Feb 2024 23:02:19 +0100, Wolfram Sang wrote:
> Changes since v1:
>
> * rebased to rc4
> * collected all needed acks (Thanks!)
> * capitalized first letter in commit subject
>
> 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.
>
> [...]
Applied, thanks!
[1/6] mfd: tmio: Remove obsolete platform_data
commit: 58d6d15662e4039fab7d786f0426843befa77ad4
[2/6] mfd: tmio: Remove obsolete io accessors
commit: e927d7bac109d8ca1729dda47a8dbc220efdb50e
[3/6] mmc: tmio/sdhi: Fix includes
commit: bed05c68aa8f078206143700cd37e42a0084155f
[4/6] mfd: tmio: Update include files
commit: 3ef94c41db82573dc1e1dd6c259aec8ef6caaaf3
[5/6] mfd: tmio: Sanitize comments
commit: 2d417dda59123b9523a19ce75fea3fd1056c3b4c
[6/6] mfd: tmio: Move header to platform_data
commit: 858b29729c9d319b9cd1441646cc3af246d3c3f9
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-02-23 15:20 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-13 22:02 [PATCH v2 0/6] mfd: tmio: simplify header and move to platform_data Wolfram Sang
2024-02-13 22:02 ` [PATCH v2 1/6] mfd: tmio: Remove obsolete platform_data Wolfram Sang
2024-02-14 16:05 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 2/6] mfd: tmio: Remove obsolete io accessors Wolfram Sang
2024-02-14 16:07 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 3/6] mmc: tmio/sdhi: Fix includes Wolfram Sang
2024-02-14 16:09 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 4/6] mfd: tmio: Update include files Wolfram Sang
2024-02-14 16:11 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 5/6] mfd: tmio: Sanitize comments Wolfram Sang
2024-02-14 16:13 ` Geert Uytterhoeven
2024-02-13 22:02 ` [PATCH v2 6/6] mfd: tmio: Move header to platform_data Wolfram Sang
2024-02-14 16:16 ` Geert Uytterhoeven
2024-02-23 15:20 ` [PATCH v2 0/6] mfd: tmio: simplify header and move " Lee Jones
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).