update to 3.10.23

4 files changed, 57 insertions, 119 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 47ebc5a4e45f4d..559683caef9056 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.10.21
+3.10.23
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 0d154a2f26cc5e..eb9a8d07ae6052 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 10
- SUBLEVEL = 21
+ SUBLEVEL = 23
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = TOSSUG Baby Fish
diff --git a/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch b/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
index 513bd1e676efa5..bebab9d5868099 100644
--- a/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
+++ b/patches.renesas/0581-mmc-remove-unnecessary-platform_set_drvdata.patch
@@ -21,36 +21,34 @@ Signed-off-by: Chris Ball <cjb@laptop.org>
 (cherry picked from commit 113a87f868b2f2e086790a68e8b9e41d8f0c3295)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/android-goldfish.c | 2 --
- drivers/mmc/host/atmel-mci.c        | 2 --
- drivers/mmc/host/au1xmmc.c          | 1 -
- drivers/mmc/host/bfin_sdh.c         | 2 --
- drivers/mmc/host/davinci_mmc.c      | 1 -
- drivers/mmc/host/dw_mmc-pltfm.c     | 1 -
- drivers/mmc/host/jz4740_mmc.c       | 2 --
- drivers/mmc/host/mvsdio.c           | 1 -
- drivers/mmc/host/mxcmmc.c           | 2 --
- drivers/mmc/host/mxs-mmc.c          | 2 --
- drivers/mmc/host/omap.c             | 2 --
- drivers/mmc/host/omap_hsmmc.c       | 2 --
- drivers/mmc/host/pxamci.c           | 2 --
- drivers/mmc/host/rtsx_pci_sdmmc.c   | 2 --
- drivers/mmc/host/sdhci-acpi.c       | 2 --
- drivers/mmc/host/sdhci-pltfm.c      | 1 -
- drivers/mmc/host/sdhci-pxav2.c      | 2 --
- drivers/mmc/host/sdhci-pxav3.c      | 2 --
- drivers/mmc/host/sdhci-s3c.c        | 1 -
- drivers/mmc/host/sdhci-spear.c      | 2 --
- drivers/mmc/host/sh_mmcif.c         | 2 --
- drivers/mmc/host/tmio_mmc.c         | 2 --
- drivers/mmc/host/wmt-sdmmc.c        | 2 --
+ drivers/mmc/host/android-goldfish.c |    2 --
+ drivers/mmc/host/atmel-mci.c        |    2 --
+ drivers/mmc/host/au1xmmc.c          |    1 -
+ drivers/mmc/host/bfin_sdh.c         |    2 --
+ drivers/mmc/host/davinci_mmc.c      |    1 -
+ drivers/mmc/host/dw_mmc-pltfm.c     |    1 -
+ drivers/mmc/host/jz4740_mmc.c       |    2 --
+ drivers/mmc/host/mvsdio.c           |    1 -
+ drivers/mmc/host/mxcmmc.c           |    2 --
+ drivers/mmc/host/mxs-mmc.c          |    2 --
+ drivers/mmc/host/omap.c             |    2 --
+ drivers/mmc/host/omap_hsmmc.c       |    2 --
+ drivers/mmc/host/pxamci.c           |    2 --
+ drivers/mmc/host/rtsx_pci_sdmmc.c   |    2 --
+ drivers/mmc/host/sdhci-acpi.c       |    2 --
+ drivers/mmc/host/sdhci-pltfm.c      |    1 -
+ drivers/mmc/host/sdhci-pxav2.c      |    2 --
+ drivers/mmc/host/sdhci-pxav3.c      |    2 --
+ drivers/mmc/host/sdhci-s3c.c        |    1 -
+ drivers/mmc/host/sdhci-spear.c      |    2 --
+ drivers/mmc/host/sh_mmcif.c         |    2 --
+ drivers/mmc/host/tmio_mmc.c         |    2 --
+ drivers/mmc/host/wmt-sdmmc.c        |    2 --
  23 files changed, 40 deletions(-)
 
-diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
-index 7780c147..8b4e20a3 100644
 --- a/drivers/mmc/host/android-goldfish.c
 +++ b/drivers/mmc/host/android-goldfish.c
-@@ -546,8 +546,6 @@ static int goldfish_mmc_remove(struct platform_device *pdev)
+@@ -546,8 +546,6 @@ static int goldfish_mmc_remove(struct pl
  {
  	struct goldfish_mmc_host *host = platform_get_drvdata(pdev);
  
@@ -59,11 +57,9 @@ index 7780c147..8b4e20a3 100644
  	BUG_ON(host == NULL);
  
  	mmc_remove_host(host->mmc);
-diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
-index aca59d93..699c56b6 100644
 --- a/drivers/mmc/host/atmel-mci.c
 +++ b/drivers/mmc/host/atmel-mci.c
-@@ -2475,8 +2475,6 @@ static int __exit atmci_remove(struct platform_device *pdev)
+@@ -2484,8 +2484,6 @@ static int __exit atmci_remove(struct pl
  	struct atmel_mci	*host = platform_get_drvdata(pdev);
  	unsigned int		i;
  
@@ -72,11 +68,9 @@ index aca59d93..699c56b6 100644
  	if (host->buffer)
  		dma_free_coherent(&pdev->dev, host->buf_size,
  		                  host->buffer, host->buf_phys_addr);
-diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
-index 127a8fad..df9becdd 100644
 --- a/drivers/mmc/host/au1xmmc.c
 +++ b/drivers/mmc/host/au1xmmc.c
-@@ -1149,7 +1149,6 @@ static int au1xmmc_remove(struct platform_device *pdev)
+@@ -1149,7 +1149,6 @@ static int au1xmmc_remove(struct platfor
  		kfree(host->ioarea);
  
  		mmc_free_host(host->mmc);
@@ -84,11 +78,9 @@ index 127a8fad..df9becdd 100644
  	}
  	return 0;
  }
-diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
-index fb4348c5..94fae2f1 100644
 --- a/drivers/mmc/host/bfin_sdh.c
 +++ b/drivers/mmc/host/bfin_sdh.c
-@@ -621,8 +621,6 @@ static int sdh_remove(struct platform_device *pdev)
+@@ -621,8 +621,6 @@ static int sdh_remove(struct platform_de
  {
  	struct mmc_host *mmc = platform_get_drvdata(pdev);
  
@@ -97,11 +89,9 @@ index fb4348c5..94fae2f1 100644
  	if (mmc) {
  		struct sdh_host *host = mmc_priv(mmc);
  
-diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
-index 3946a0eb..b1b82022 100644
 --- a/drivers/mmc/host/davinci_mmc.c
 +++ b/drivers/mmc/host/davinci_mmc.c
-@@ -1406,7 +1406,6 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
+@@ -1406,7 +1406,6 @@ static int __exit davinci_mmcsd_remove(s
  {
  	struct mmc_davinci_host *host = platform_get_drvdata(pdev);
  
@@ -109,11 +99,9 @@ index 3946a0eb..b1b82022 100644
  	if (host) {
  		mmc_davinci_cpufreq_deregister(host);
  
-diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
-index 41c27b74..37873f10 100644
 --- a/drivers/mmc/host/dw_mmc-pltfm.c
 +++ b/drivers/mmc/host/dw_mmc-pltfm.c
-@@ -72,7 +72,6 @@ static int dw_mci_pltfm_remove(struct platform_device *pdev)
+@@ -72,7 +72,6 @@ static int dw_mci_pltfm_remove(struct pl
  {
  	struct dw_mci *host = platform_get_drvdata(pdev);
  
@@ -121,8 +109,6 @@ index 41c27b74..37873f10 100644
  	dw_mci_remove(host);
  	return 0;
  }
-diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
-index 2391c6b7..1c47b347 100644
 --- a/drivers/mmc/host/jz4740_mmc.c
 +++ b/drivers/mmc/host/jz4740_mmc.c
 @@ -932,7 +932,6 @@ err_release_mem_region:
@@ -133,7 +119,7 @@ index 2391c6b7..1c47b347 100644
  	mmc_free_host(mmc);
  
  	return ret;
-@@ -960,7 +959,6 @@ static int jz4740_mmc_remove(struct platform_device *pdev)
+@@ -960,7 +959,6 @@ static int jz4740_mmc_remove(struct plat
  
  	clk_put(host->clk);
  
@@ -141,11 +127,9 @@ index 2391c6b7..1c47b347 100644
  	mmc_free_host(host->mmc);
  
  	return 0;
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index a1fcc1f9..3f26428d 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
-@@ -827,7 +827,6 @@ static int __exit mvsd_remove(struct platform_device *pdev)
+@@ -827,7 +827,6 @@ static int __exit mvsd_remove(struct pla
  		clk_disable_unprepare(host->clk);
  	mmc_free_host(mmc);
  
@@ -153,11 +137,9 @@ index a1fcc1f9..3f26428d 100644
  	return 0;
  }
  
-diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
-index d5036353..786448a1 100644
 --- a/drivers/mmc/host/mxcmmc.c
 +++ b/drivers/mmc/host/mxcmmc.c
-@@ -1219,8 +1219,6 @@ static int mxcmci_remove(struct platform_device *pdev)
+@@ -1219,8 +1219,6 @@ static int mxcmci_remove(struct platform
  	struct mmc_host *mmc = platform_get_drvdata(pdev);
  	struct mxcmci_host *host = mmc_priv(mmc);
  
@@ -166,11 +148,9 @@ index d5036353..786448a1 100644
  	mmc_remove_host(mmc);
  
  	if (host->vcc)
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 4278a178..d38f0dae 100644
 --- a/drivers/mmc/host/mxs-mmc.c
 +++ b/drivers/mmc/host/mxs-mmc.c
-@@ -708,8 +708,6 @@ static int mxs_mmc_remove(struct platform_device *pdev)
+@@ -708,8 +708,6 @@ static int mxs_mmc_remove(struct platfor
  
  	mmc_remove_host(mmc);
  
@@ -179,11 +159,9 @@ index 4278a178..d38f0dae 100644
  	if (ssp->dmach)
  		dma_release_channel(ssp->dmach);
  
-diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
-index 4254975f..4b3e0eb7 100644
 --- a/drivers/mmc/host/omap.c
 +++ b/drivers/mmc/host/omap.c
-@@ -1500,8 +1500,6 @@ static int mmc_omap_remove(struct platform_device *pdev)
+@@ -1500,8 +1500,6 @@ static int mmc_omap_remove(struct platfo
  	struct mmc_omap_host *host = platform_get_drvdata(pdev);
  	int i;
  
@@ -192,8 +170,6 @@ index 4254975f..4b3e0eb7 100644
  	BUG_ON(host == NULL);
  
  	for (i = 0; i < host->nr_slots; i++)
-diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
-index eccedc7d..18653214 100644
 --- a/drivers/mmc/host/omap_hsmmc.c
 +++ b/drivers/mmc/host/omap_hsmmc.c
 @@ -2047,7 +2047,6 @@ err_irq:
@@ -204,7 +180,7 @@ index eccedc7d..18653214 100644
  	mmc_free_host(mmc);
  err_alloc:
  	omap_hsmmc_gpio_free(pdata);
-@@ -2093,7 +2092,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
+@@ -2093,7 +2092,6 @@ static int omap_hsmmc_remove(struct plat
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	if (res)
  		release_mem_region(res->start, resource_size(res));
@@ -212,11 +188,9 @@ index eccedc7d..18653214 100644
  
  	return 0;
  }
-diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
-index 2b2f65ad..847b1996 100644
 --- a/drivers/mmc/host/pxamci.c
 +++ b/drivers/mmc/host/pxamci.c
-@@ -834,8 +834,6 @@ static int pxamci_remove(struct platform_device *pdev)
+@@ -834,8 +834,6 @@ static int pxamci_remove(struct platform
  	struct mmc_host *mmc = platform_get_drvdata(pdev);
  	int gpio_cd = -1, gpio_ro = -1, gpio_power = -1;
  
@@ -225,11 +199,9 @@ index 2b2f65ad..847b1996 100644
  	if (mmc) {
  		struct pxamci_host *host = mmc_priv(mmc);
  
-diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
-index ad13f424..82a35b91 100644
 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c
 +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
-@@ -1316,8 +1316,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev)
+@@ -1316,8 +1316,6 @@ static int rtsx_pci_sdmmc_drv_remove(str
  	mmc_remove_host(mmc);
  	mmc_free_host(mmc);
  
@@ -238,11 +210,9 @@ index ad13f424..82a35b91 100644
  	dev_dbg(&(pdev->dev),
  		": Realtek PCI-E SDMMC controller has been removed\n");
  
-diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
-index 706d9cb1..b1a6588b 100644
 --- a/drivers/mmc/host/sdhci-acpi.c
 +++ b/drivers/mmc/host/sdhci-acpi.c
-@@ -262,7 +262,6 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
+@@ -262,7 +262,6 @@ static int sdhci_acpi_probe(struct platf
  	return 0;
  
  err_free:
@@ -250,7 +220,7 @@ index 706d9cb1..b1a6588b 100644
  	sdhci_free_host(c->host);
  	return err;
  }
-@@ -281,7 +280,6 @@ static int sdhci_acpi_remove(struct platform_device *pdev)
+@@ -281,7 +280,6 @@ static int sdhci_acpi_remove(struct plat
  
  	dead = (sdhci_readl(c->host, SDHCI_INT_STATUS) == ~0);
  	sdhci_remove_host(c->host, dead);
@@ -258,11 +228,9 @@ index 706d9cb1..b1a6588b 100644
  	sdhci_free_host(c->host);
  
  	return 0;
-diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
-index cd0f1f68..252d1cea 100644
 --- a/drivers/mmc/host/sdhci-pltfm.c
 +++ b/drivers/mmc/host/sdhci-pltfm.c
-@@ -197,7 +197,6 @@ void sdhci_pltfm_free(struct platform_device *pdev)
+@@ -197,7 +197,6 @@ void sdhci_pltfm_free(struct platform_de
  	iounmap(host->ioaddr);
  	release_mem_region(iomem->start, resource_size(iomem));
  	sdhci_free_host(host);
@@ -270,11 +238,9 @@ index cd0f1f68..252d1cea 100644
  }
  EXPORT_SYMBOL_GPL(sdhci_pltfm_free);
  
-diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
-index 6a3f702a..98b5145c 100644
 --- a/drivers/mmc/host/sdhci-pxav2.c
 +++ b/drivers/mmc/host/sdhci-pxav2.c
-@@ -253,8 +253,6 @@ static int sdhci_pxav2_remove(struct platform_device *pdev)
+@@ -253,8 +253,6 @@ static int sdhci_pxav2_remove(struct pla
  	sdhci_pltfm_free(pdev);
  	kfree(pxa);
  
@@ -283,11 +249,9 @@ index 6a3f702a..98b5145c 100644
  	return 0;
  }
  
-diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
-index ce84208d..4b3f5e14 100644
 --- a/drivers/mmc/host/sdhci-pxav3.c
 +++ b/drivers/mmc/host/sdhci-pxav3.c
-@@ -340,8 +340,6 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
+@@ -340,8 +340,6 @@ static int sdhci_pxav3_remove(struct pla
  	sdhci_pltfm_free(pdev);
  	kfree(pxa);
  
@@ -296,11 +260,9 @@ index ce84208d..4b3f5e14 100644
  	return 0;
  }
  
-diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
-index c6f6246a..926aaf6a 100644
 --- a/drivers/mmc/host/sdhci-s3c.c
 +++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -745,7 +745,6 @@ static int sdhci_s3c_remove(struct platform_device *pdev)
+@@ -745,7 +745,6 @@ static int sdhci_s3c_remove(struct platf
  	clk_disable_unprepare(sc->clk_io);
  
  	sdhci_free_host(host);
@@ -308,11 +270,9 @@ index c6f6246a..926aaf6a 100644
  
  	return 0;
  }
-diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
-index 7ae5b3ae..2dba9f8d 100644
 --- a/drivers/mmc/host/sdhci-spear.c
 +++ b/drivers/mmc/host/sdhci-spear.c
-@@ -258,7 +258,6 @@ static int sdhci_probe(struct platform_device *pdev)
+@@ -258,7 +258,6 @@ static int sdhci_probe(struct platform_d
  	return 0;
  
  set_drvdata:
@@ -320,7 +280,7 @@ index 7ae5b3ae..2dba9f8d 100644
  	sdhci_remove_host(host, 1);
  free_host:
  	sdhci_free_host(host);
-@@ -278,7 +277,6 @@ static int sdhci_remove(struct platform_device *pdev)
+@@ -278,7 +277,6 @@ static int sdhci_remove(struct platform_
  	int dead = 0;
  	u32 scratch;
  
@@ -328,11 +288,9 @@ index 7ae5b3ae..2dba9f8d 100644
  	scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
  	if (scratch == (u32)-1)
  		dead = 1;
-diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
-index e979d2db..36629a02 100644
 --- a/drivers/mmc/host/sh_mmcif.c
 +++ b/drivers/mmc/host/sh_mmcif.c
-@@ -1530,8 +1530,6 @@ static int sh_mmcif_remove(struct platform_device *pdev)
+@@ -1530,8 +1530,6 @@ static int sh_mmcif_remove(struct platfo
  	if (irq[1] >= 0)
  		free_irq(irq[1], host);
  
@@ -341,11 +299,9 @@ index e979d2db..36629a02 100644
  	clk_disable(host->hclk);
  	mmc_free_host(host->mmc);
  	pm_runtime_put_sync(&pdev->dev);
-diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
-index 139212e7..8860d4d2 100644
 --- a/drivers/mmc/host/tmio_mmc.c
 +++ b/drivers/mmc/host/tmio_mmc.c
-@@ -112,8 +112,6 @@ static int tmio_mmc_remove(struct platform_device *pdev)
+@@ -112,8 +112,6 @@ static int tmio_mmc_remove(struct platfo
  	const struct mfd_cell *cell = mfd_get_cell(pdev);
  	struct mmc_host *mmc = platform_get_drvdata(pdev);
  
@@ -354,11 +310,9 @@ index 139212e7..8860d4d2 100644
  	if (mmc) {
  		struct tmio_mmc_host *host = mmc_priv(mmc);
  		free_irq(platform_get_irq(pdev, 0), host);
-diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
-index 442f5766..34231d51 100644
 --- a/drivers/mmc/host/wmt-sdmmc.c
 +++ b/drivers/mmc/host/wmt-sdmmc.c
-@@ -927,8 +927,6 @@ static int wmt_mci_remove(struct platform_device *pdev)
+@@ -927,8 +927,6 @@ static int wmt_mci_remove(struct platfor
  
  	mmc_free_host(mmc);
  
@@ -367,6 +321,3 @@ index 442f5766..34231d51 100644
  	dev_info(&pdev->dev, "WMT MCI device removed\n");
  
  	return 0;
--- 
-1.8.4.3.gca3854a
-
diff --git a/patches.renesas/0595-ARM-shmobile-update-SDHI-DT-compatibility-string-to-.patch b/patches.renesas/0595-ARM-shmobile-update-SDHI-DT-compatibility-string-to-.patch
index f13d52518ce11b..4509f3000981b1 100644
--- a/patches.renesas/0595-ARM-shmobile-update-SDHI-DT-compatibility-string-to-.patch
+++ b/patches.renesas/0595-ARM-shmobile-update-SDHI-DT-compatibility-string-to-.patch
@@ -18,18 +18,16 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit df1d0584b2292df5b9d576d7e5246e94616220a1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 17 ++++++++++-------
- arch/arm/boot/dts/r8a73a4.dtsi                     |  6 +++---
- arch/arm/boot/dts/r8a7790.dtsi                     |  8 ++++----
- arch/arm/boot/dts/sh73a0.dtsi                      |  6 +++---
- drivers/mmc/host/sh_mobile_sdhi.c                  | 16 ++++++++--------
+ Documentation/devicetree/bindings/mmc/tmio_mmc.txt |   17 ++++++++++-------
+ arch/arm/boot/dts/r8a73a4.dtsi                     |    6 +++---
+ arch/arm/boot/dts/r8a7790.dtsi                     |    8 ++++----
+ arch/arm/boot/dts/sh73a0.dtsi                      |    6 +++---
+ drivers/mmc/host/sh_mobile_sdhi.c                  |   16 ++++++++--------
  5 files changed, 28 insertions(+), 25 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
-index df204e18..6a2a1160 100644
 --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
 +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
-@@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as
+@@ -9,12 +9,15 @@ compulsory and any optional properties,
  described in mmc.txt, can be used. Additionally the following tmio_mmc-specific
  optional bindings can be used.
  
@@ -52,8 +50,6 @@ index df204e18..6a2a1160 100644
 -"renesas,sh7372-sdhi":	(default) compatible with SH7372
 -"renesas,r8a7740-sdhi":	compatible with R8A7740: certain MMC/SD commands have to
 -			wait for the interface to become idle.
-diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
-index 6c26caa8..658fcc53 100644
 --- a/arch/arm/boot/dts/r8a73a4.dtsi
 +++ b/arch/arm/boot/dts/r8a73a4.dtsi
 @@ -193,7 +193,7 @@
@@ -83,8 +79,6 @@ index 6c26caa8..658fcc53 100644
  		reg = <0 0xee140000 0 0x100>;
  		interrupt-parent = <&gic>;
  		interrupts = <0 167 4>;
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 98513984..413b4c29 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
 @@ -151,7 +151,7 @@
@@ -123,8 +117,6 @@ index 98513984..413b4c29 100644
  		reg = <0 0xee160000 0 0x100>;
  		interrupt-parent = <&gic>;
  		interrupts = <0 168 4>;
-diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
-index ba59a587..3955c760 100644
 --- a/arch/arm/boot/dts/sh73a0.dtsi
 +++ b/arch/arm/boot/dts/sh73a0.dtsi
 @@ -196,7 +196,7 @@
@@ -154,11 +146,9 @@ index ba59a587..3955c760 100644
  		reg = <0xee140000 0x100>;
  		interrupt-parent = <&gic>;
  		interrupts = <0 104 4
-diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
-index 87ed3fb5..f344659d 100644
 --- a/drivers/mmc/host/sh_mobile_sdhi.c
 +++ b/drivers/mmc/host/sh_mobile_sdhi.c
-@@ -113,14 +113,14 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = {
+@@ -113,14 +113,14 @@ static const struct sh_mobile_sdhi_ops s
  };
  
  static const struct of_device_id sh_mobile_sdhi_of_match[] = {
@@ -181,6 +171,3 @@ index 87ed3fb5..f344659d 100644
  	{},
  };
  MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
--- 
-1.8.4.3.gca3854a
-