linux-next: manual merge of the mfd tree with the mmc tree

linux-next: manual merge of the mfd tree with the mmc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mmc/host/Kconfig between commit 3a96dff0f828 ("mmc: SD/MMC Host
Controller for Wondermedia WM8505/WM8650") from the mmc tree and commit
ff984e57d36e ("mmc: Add realtek pcie sdmmc host driver") from the mfd
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mmc/host/Kconfig
index 83eb1e0,dfa6d56..0000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -602,13 -622,9 +602,20 @@@ config MMC_USH
  	  Note: These controllers only support SDIO cards and do not
  	  support MMC or SD memory cards.
  
 +config MMC_WMT
 +	tristate "Wondermedia SD/MMC Host Controller support"
 +	depends on ARCH_VT8500
 +	default y
 +	help
 +	  This selects support for the SD/MMC Host Controller on
 +	  Wondermedia WM8505/WM8650 based SoCs.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called wmt-sdmmc.
++
+ config MMC_REALTEK_PCI
+ 	tristate "Realtek PCI-E SD/MMC Card Interface Driver"
+ 	depends on MFD_RTSX_PCI
+ 	help
+ 	  Say Y here to include driver code to support SD/MMC card interface
+ 	  of Realtek PCI-E card reader

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the mfd tree with the mmc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  include/linux/mfd/tmio.h

between commits:

  89f415b99050 ("mfd: tmio: Remove obsolete .set_clk_div() callback")
  f86937afb446 ("mmc: tmio: Remove obsolete .set_pwr() callback()")

from the mmc tree and commit:

  70b46487b155 ("mfd: tmio: Move header to platform_data")

from the mfd tree.

I fixed it up (I removed the file and applied the following patch) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jul 2024 14:06:29 +1000
Subject: [PATCH] fixup for "mfd: tmio: Move header to platform_data"

interacting with "mfd: tmio: Remove obsolete .set_clk_div() callback"
and "mmc: tmio: Remove obsolete .set_pwr() callback()" from the mmc tree

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/platform_data/tmio.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/platform_data/tmio.h b/include/linux/platform_data/tmio.h
index 1cf418643da9..b060124ba1ae 100644
--- a/include/linux/platform_data/tmio.h
+++ b/include/linux/platform_data/tmio.h
@@ -58,7 +58,5 @@ struct tmio_mmc_data {
 	dma_addr_t			dma_rx_offset;
 	unsigned int			max_blk_count;
 	unsigned short			max_segs;
-	void (*set_pwr)(struct platform_device *host, int state);
-	void (*set_clk_div)(struct platform_device *host, int state);
 };
 #endif
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with the mmc tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

On Wed, Jul 10, 2024 at 02:10:10PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   include/linux/mfd/tmio.h
> 
> between commits:
> 
>   89f415b99050 ("mfd: tmio: Remove obsolete .set_clk_div() callback")
>   f86937afb446 ("mmc: tmio: Remove obsolete .set_pwr() callback()")
> 
> from the mmc tree and commit:
> 
>   70b46487b155 ("mfd: tmio: Move header to platform_data")
> 
> from the mfd tree.
> 
> I fixed it up (I removed the file and applied the following patch) and

The fix looks good to me. Thank you!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]