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
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 <[email protected]>
Acked-by: Lee Jones <[email protected]>
---
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
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 <[email protected]>
Acked-by: Lee Jones <[email protected]>
---
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
On Tue, Feb 13, 2024 at 11:05 PM Wolfram Sang
<[email protected]> 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 <[email protected]>
> Acked-by: Lee Jones <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
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
On Tue, Feb 13, 2024 at 11:05 PM Wolfram Sang
<[email protected]> 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 <[email protected]>
> Acked-by: Lee Jones <[email protected]>
LGTM, so
Reviewed-by: Geert Uytterhoeven <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68korg
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
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 [李琼斯]