linux-next: manual merge of the mmc tree with Linus' tree

linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
driver for Arasan SDHCI") from the mmc 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 MAINTAINERS
index 64b39e610589,518bf717b02b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1387,9 -1371,7 +1387,10 @@@ T:	git git://git.xilinx.com/linux-xlnx.
  S:	Supported
  F:	arch/arm/mach-zynq/
  F:	drivers/cpuidle/cpuidle-zynq.c
 +N:	zynq
 +N:	xilinx
 +F:	drivers/clocksource/cadence_ttc_timer.c
+ F:	drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:	Will Deacon <will.deacon@arm.com>


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

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

[Sören Brinkmann]

On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
> between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
> Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
> driver for Arasan SDHCI") from the mmc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix is correct, AFAICT.

	Thanks,
	Sören

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

[Stephen Rothwell]

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

Hi Ulf,

On Fri, 9 May 2014 09:41:39 +0200 Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
> Within this context; while Chris is being busy, I would be able to
> help out better as co-maintainer - if we would add my published mmc
> git tree, into your linux-next merge. Could you do that?
> 
> My intent at this point, is to get patches tested in linux-next, but
> still get them merged via Chris' mmc tree. Does that make sense?
> 
> Here is my git tree:
> git://git.linaro.org/people/ulf.hansson/mmc.git
> 
> I have added a next branch, currently it points to the commit for
> "Linux 3.15-rc4", so it holds no patches yet.

Added from today. Chris, if this is a problem, give me a heads up.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

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

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

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

[Ulf Hansson]

On 9 May 2014 09:14, Lee Jones <lee.jones@linaro.org> wrote:
>> Today's linux-next merge of the mmc tree got a conflict in
>> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
>> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
>> the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
>> remove smatch warnings") from the mmc tree.
>>
>> I fixed it up (maybe - see below and in the final tree) and can carry
>> the fix as necessary (no action is required).
>
> FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
> will continue to happen until a pending revert is merged.
>

Hi Stehpen,

Within this context; while Chris is being busy, I would be able to
help out better as co-maintainer - if we would add my published mmc
git tree, into your linux-next merge. Could you do that?

My intent at this point, is to get patches tested in linux-next, but
still get them merged via Chris' mmc tree. Does that make sense?

Here is my git tree:
git://git.linaro.org/people/ulf.hansson/mmc.git

I have added a next branch, currently it points to the commit for
"Linux 3.15-rc4", so it holds no patches yet.

Kind regards
Ulf Hansson

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

[Lee Jones]

> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
> the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
> remove smatch warnings") from the mmc tree.
> 
> I fixed it up (maybe - see below and in the final tree) and can carry
> the fix as necessary (no action is required).

FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
will continue to happen until a pending revert is merged.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
remove smatch warnings") from the mmc tree.

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

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

diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
index 0b9ded13a3ae,09340b9429ec..000000000000
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@@ -258,10 -375,11 +260,13 @@@ static void sd_send_cmd_get_rsp(struct 
  	if (cmd->opcode == SD_SWITCH_VOLTAGE) {
  		err = rtsx_pci_write_register(pcr, SD_BUS_STAT,
  				0xFF, SD_CLK_TOGGLE_EN);
- 		if (err < 0)
+ 		if (err < 0) {
+ 			rtsx_pci_write_register(pcr, SD_BUS_STAT,
+ 				SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
  			goto out;
+ 		}
 +
 +		clock_toggled = true;
  	}
  
  	rtsx_pci_init_cmd(pcr);

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

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

[Chris Ball]

Hi Stephen,

On Wed, Aug 10 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-esdhc-imx.c between commit 913413c307c9 ("mmc:
> sdhci-esdhc-imx: extend card_detect and write_protect support for mx5")
> from Linus' tree and commit 612e807e4852 ("mmc: sdhci-esdhc-imx: Enable
> ADMA2") from the mmc tree.
>
> I fixed it up (I think - see below) anc can carry the fix as necessary.

Thanks for the conflict fixup.  I've merged 3.1-rc1 into mmc-next
and compile-tested for mx35, so the mmc tree should be clean now.

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

linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-esdhc-imx.c between commit 913413c307c9 ("mmc:
sdhci-esdhc-imx: extend card_detect and write_protect support for mx5")
from Linus' tree and commit 612e807e4852 ("mmc: sdhci-esdhc-imx: Enable
ADMA2") from the mmc tree.

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

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
index 9ebfb4b,53b2ec1..0000000
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@@ -32,6 -31,15 +33,14 @@@
  #define  SDHCI_VENDOR_SPEC_SDIO_QUIRK	0x00000002
  
  /*
+  * There is INT DMA ERR mis-match between eSDHC and STD SDHC SPEC
+  * Bit25 is used in STD SPEC, and is reserved in fsl eSDHC design,
+  * but bit28 is used as the INT DMA ERR in fsl eSDHC design.
+  * Define this macro DMA error INT for fsl eSDHC
+  */
+ #define  SDHCI_INT_VENDOR_SPEC_DMA_ERR	0x10000000
+ 
 -#define ESDHC_FLAG_GPIO_FOR_CD		(1 << 0)
+ /*
   * The CMDTYPE of the CMD register (offset 0xE) should be set to
   * "11" when the STOP CMD12 is issued on imx53 to abort one
   * open ended multi-blk IO. Otherwise the TC INT wouldn't
@@@ -140,14 -115,35 +170,36 @@@ static void esdhc_writel_le(struct sdhc
  {
  	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
  	struct pltfm_imx_data *imx_data = pltfm_host->priv;
 +	struct esdhc_platform_data *boarddata = &imx_data->boarddata;
- 
- 	if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)
- 			&& (boarddata->cd_type == ESDHC_CD_GPIO)))
- 		/*
- 		 * these interrupts won't work with a custom card_detect gpio
- 		 */
- 		val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+ 	u32 data;
+ 
+ 	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
 -		if (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD)
++		if (boarddata->cd_type == ESDHC_CD_GPIO)
+ 			/*
+ 			 * these interrupts won't work with a
+ 			 * custom card_detect gpio
+ 			 * (only applied to mx25/35)
+ 			 */
+ 			val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+ 
+ 		if (val & SDHCI_INT_CARD_INT) {
+ 			/*
+ 			 * clear D3CD bit and set D3CD bit to avoid
+ 			 * missing the card interrupt
+ 			 * this is a eSDHC controller problem so that
+ 			 * we need to apply the following workaround
+ 			 * clear and set D3CD bit will make eSDHC
+ 			 * re-sample the card interrupt, In case
+ 			 * a card interrupt was lost, re-sample it by
+ 			 * the following steps.
+ 			 */
+ 			data = readl(host->ioaddr + SDHCI_HOST_CONTROL);
+ 			data &= ~SDHCI_CTRL_D3CD;
+ 			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+ 			data |= SDHCI_CTRL_D3CD;
+ 			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+ 		}
+ 	}
  
  	if (unlikely((imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
  				&& (reg == SDHCI_INT_STATUS)
@@@ -377,29 -316,22 +439,30 @@@ static int __devinit sdhci_esdhc_imx_pr
  	clk_enable(clk);
  	pltfm_host->clk = clk;
  
 -	if (!cpu_is_mx25())
 +	if (!is_imx25_esdhc(imx_data))
  		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
  
 -	if (cpu_is_mx25() || cpu_is_mx35()) {
 +	if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
  		/* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
- 		host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK;
+ 		host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK
+ 			| SDHCI_QUIRK_BROKEN_ADMA;
 -		/* write_protect can't be routed to controller, use gpio */
 -		sdhci_esdhc_ops.get_ro = esdhc_pltfm_get_ro;
 -	}
  
 -	if (!(cpu_is_mx25() || cpu_is_mx35() || cpu_is_mx51()))
 +	if (is_imx53_esdhc(imx_data))
  		imx_data->flags |= ESDHC_FLAG_MULTIBLK_NO_INT;
  
 -	boarddata = host->mmc->parent->platform_data;
 -	if (boarddata) {
 +	boarddata = &imx_data->boarddata;
 +	if (sdhci_esdhc_imx_probe_dt(pdev, boarddata) < 0) {
 +		if (!host->mmc->parent->platform_data) {
 +			dev_err(mmc_dev(host->mmc), "no board data!\n");
 +			err = -EINVAL;
 +			goto no_board_data;
 +		}
 +		imx_data->boarddata = *((struct esdhc_platform_data *)
 +					host->mmc->parent->platform_data);
 +	}
 +
 +	/* write_protect */
 +	if (boarddata->wp_type == ESDHC_WP_GPIO) {
  		err = gpio_request_one(boarddata->wp_gpio, GPIOF_IN, "ESDHC_WP");
  		if (err) {
  			dev_warn(mmc_dev(host->mmc),

linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-esdhc-imx.c between commit 913413c307c9 ("mmc:
sdhci-esdhc-imx: extend card_detect and write_protect support for mx5")
from Linus' tree and commit 9259bee02100 ("mmc: esdhc-imx: fix card
interrupt loss on freescale eSDHC") from the mmc tree.

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

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
index 9ebfb4b,e62d33f..0000000
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@@ -140,14 -86,35 +141,36 @@@ static void esdhc_writel_le(struct sdhc
  {
  	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
  	struct pltfm_imx_data *imx_data = pltfm_host->priv;
 +	struct esdhc_platform_data *boarddata = &imx_data->boarddata;
- 
- 	if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)
- 			&& (boarddata->cd_type == ESDHC_CD_GPIO)))
- 		/*
- 		 * these interrupts won't work with a custom card_detect gpio
- 		 */
- 		val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+ 	u32 data;
+ 
+ 	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
 -		if (imx_data->flags & ESDHC_FLAG_GPIO_FOR_CD)
++		if (boarddata->cd_type == ESDHC_CD_GPIO))
+ 			/*
+ 			 * these interrupts won't work with a
+ 			 * custom card_detect gpio
+ 			 * (only applied to mx25/35)
+ 			 */
+ 			val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
+ 
+ 		if (val & SDHCI_INT_CARD_INT) {
+ 			/*
+ 			 * clear D3CD bit and set D3CD bit to avoid
+ 			 * missing the card interrupt
+ 			 * this is a eSDHC controller problem so that
+ 			 * we need to apply the following workaround
+ 			 * clear and set D3CD bit will make eSDHC
+ 			 * re-sample the card interrupt, In case
+ 			 * a card interrupt was lost, re-sample it by
+ 			 * the following steps.
+ 			 */
+ 			data = readl(host->ioaddr + SDHCI_HOST_CONTROL);
+ 			data &= ~SDHCI_CTRL_D3CD;
+ 			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+ 			data |= SDHCI_CTRL_D3CD;
+ 			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
+ 		}
+ 	}
  
  	if (unlikely((imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
  				&& (reg == SDHCI_INT_STATUS)

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

[Shawn Guo]

Hi Stephen,

On Wed, Jun 01, 2011 at 11:13:20AM +1000, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80
> ("drivercore: revert addition of of_match to struct device") from Linus'
> tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers
> self registered") from the mmc tree.
> 
> The latter removes the file, so I did that (I *think* that the change
> from the former is no longer needed, but someone should check).

Yes, the change of b1608d69cb80 ("drivercore: revert addition of
of_match to struct device") is no longer needed.

-- 
Regards,
Shawn

linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80
("drivercore: revert addition of of_match to struct device") from Linus'
tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers
self registered") from the mmc tree.

The latter removes the file, so I did that (I *think* that the change
from the former is no longer needed, but someone should check).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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