linux-next: manual merge of the arm-soc tree with the mmc tree

linux-next: manual merge of the arm-soc tree with the mmc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mmc/host/Kconfig
index 9f1f5e2,4d15dff..0000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -295,18 -288,16 +288,6 @@@ config MMC_ATMELMC
  
  	  If unsure, say N.
  
- endchoice
- 
- config MMC_ATMELMCI_DMA
- 	bool "Atmel MCI DMA support"
- 	depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE
- 	help
- 	  Say Y here to have the Atmel MCI driver use a DMA engine to
- 	  do data transfers and thus increase the throughput and
- 	  reduce the CPU utilization.
- 
- 	  If unsure, say N.
- 
 -config MMC_IMX
 -	tristate "Motorola i.MX Multimedia Card Interface support"
 -	depends on ARCH_MX1
 -	help
 -	  This selects the Motorola i.MX Multimedia card Interface.
 -	  If you have a i.MX platform with a Multimedia Card slot,
 -	  say Y or M here.
 -
 -	  If unsure, say N.
 -
  config MMC_MSM
  	tristate "Qualcomm SDCC Controller Support"
  	depends on MMC && ARCH_MSM

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

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

[Chris Ball]

Hi,

On Thu, Apr 12 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
> driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
> choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
> atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, Stephen.

Nicolas and Arnd, these MMC Kconfig patches weren't sent to me or
linux-mmc@ for review, so I haven't seen them before.  They look
fine, but I'd like to be in the loop directly to avoid surprises.

Do these MMC patches have any dependency on other work?  It doesn't
look like it.  If that's so, I'd rather carry them in the MMC tree
to save Stephen and Linus from dealing with the merge conflict.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

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

[Nicolas Ferre]

On 04/12/2012 06:54 AM, Chris Ball :
> Hi,
> 
> On Thu, Apr 12 2012, Stephen Rothwell wrote:
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
>> driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
>> choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
>> atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
>> tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary.
> 
> Thanks, Stephen.
> 
> Nicolas and Arnd, these MMC Kconfig patches weren't sent to me or
> linux-mmc@ for review, so I haven't seen them before.  They look
> fine, but I'd like to be in the loop directly to avoid surprises.

Yes Chris, my fault here, it is true that I should have send those
patches to you and linux-mmc.

> Do these MMC patches have any dependency on other work?  It doesn't
> look like it.  If that's so, I'd rather carry them in the MMC tree
> to save Stephen and Linus from dealing with the merge conflict.

Indeed, and in the meantime, it seems that these Kconfig modifications
are not as harmless as the others in the series.

I propose to redo a pull request without those two patches. We will
resend them directly through the MMC subsystem together with other
mmc-related fixes. Moreover, all this will probably make more sense as
3.5 modifications...

Best regards,
-- 
Nicolas Ferre

linux-next: manual merge of the arm-soc tree with the mmc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commit cf3a6ec2c0a4
("ARM: OMAP: remove plat/board.h file") from the arm-soc tree.

The latter is a subset of the former.

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

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

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

linux-next: manual merge of the arm-soc tree with the mmc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commits
cf3a6ec2c0a4 ("ARM: OMAP: remove plat/board.h file") and 70c494c3122f
("ARM: OMAP1: Make plat/mux.h omap1 only") from the arm-soc tree.

The former removed a superset of include files, so I did that and can
carry the fix as necessary (no action is required).

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

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

linux-next: manual merge of the arm-soc tree with the mmc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/platform_data/mmc-omap.h between commit 69bc0b677e6c ("mmc:
omap_hsmmc: Enable HSPE bit for high speed cards") from the  tree and
commit 53db20d123f7 ("mmc: omap: Remove cpu_is_omap usage from the
driver") from the arm-soc 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 include/linux/platform_data/mmc-omap.h
index 346af5b,2bf6ea8..0000000
--- a/include/linux/platform_data/mmc-omap.h
+++ b/include/linux/platform_data/mmc-omap.h
@@@ -126,7 -107,9 +107,10 @@@ struct omap_mmc_platform_data 
  		/* we can put the features above into this variable */
  #define HSMMC_HAS_PBIAS		(1 << 0)
  #define HSMMC_HAS_UPDATED_RESET	(1 << 1)
 -#define MMC_OMAP7XX		(1 << 2)
 -#define MMC_OMAP15XX		(1 << 3)
 -#define MMC_OMAP16XX		(1 << 4)
 +#define HSMMC_HAS_HSPE_SUPPORT	(1 << 2)
++#define MMC_OMAP7XX		(1 << 3)
++#define MMC_OMAP15XX		(1 << 4)
++#define MMC_OMAP16XX		(1 << 5)
  		unsigned features;
  
  		int switch_pin;			/* gpio (card detect) */

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