aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2015-04-20 14:51:14 -0400
committerVinod Koul <vinod.koul@intel.com>2015-04-20 14:51:14 -0400
commitb53c7582805b10d6a32e88e22d16dc469e66a37a (patch)
tree3775742e873f18d005fd8c2187411ead06c0049d /arch
parent7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff)
parent3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff)
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-ape6evm.c12
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c20
-rw-r--r--arch/arm/mach-shmobile/board-bockw.c14
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c20
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c30
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c10
-rw-r--r--arch/sh/boards/board-sh7757lcr.c9
-rw-r--r--arch/sh/boards/mach-ap325rxa/setup.c9
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c20
-rw-r--r--arch/sh/boards/mach-kfr2r09/setup.c10
-rw-r--r--arch/sh/boards/mach-migor/setup.c9
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c17
12 files changed, 92 insertions, 88 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 444f22d370f0..52c9605ad611 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -173,9 +173,9 @@ static const struct resource mmcif0_resources[] __initconst = {
173}; 173};
174 174
175/* SDHI0 */ 175/* SDHI0 */
176static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = { 176static const struct tmio_mmc_data sdhi0_pdata __initconst = {
177 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, 177 .flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
178 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, 178 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
179}; 179};
180 180
181static const struct resource sdhi0_resources[] __initconst = { 181static const struct resource sdhi0_resources[] __initconst = {
@@ -184,9 +184,9 @@ static const struct resource sdhi0_resources[] __initconst = {
184}; 184};
185 185
186/* SDHI1 */ 186/* SDHI1 */
187static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = { 187static const struct tmio_mmc_data sdhi1_pdata __initconst = {
188 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, 188 .flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
189 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 189 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
190 MMC_CAP_NEEDS_POLL, 190 MMC_CAP_NEEDS_POLL,
191}; 191};
192 192
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 6d949f1c850b..7eac84687cb4 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -754,12 +754,12 @@ static struct platform_device vcc_sdhi1 = {
754}; 754};
755 755
756/* SDHI0 */ 756/* SDHI0 */
757static struct sh_mobile_sdhi_info sdhi0_info = { 757static struct tmio_mmc_data sdhi0_info = {
758 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 758 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
759 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 759 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
760 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 760 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
761 MMC_CAP_POWER_OFF_CARD, 761 MMC_CAP_POWER_OFF_CARD,
762 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD, 762 .flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,
763 .cd_gpio = 167, 763 .cd_gpio = 167,
764}; 764};
765 765
@@ -796,12 +796,12 @@ static struct platform_device sdhi0_device = {
796}; 796};
797 797
798/* SDHI1 */ 798/* SDHI1 */
799static struct sh_mobile_sdhi_info sdhi1_info = { 799static struct tmio_mmc_data sdhi1_info = {
800 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, 800 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI1_TX,
801 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, 801 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI1_RX,
802 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 802 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
803 MMC_CAP_POWER_OFF_CARD, 803 MMC_CAP_POWER_OFF_CARD,
804 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD, 804 .flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,
805 /* Port72 cannot generate IRQs, will be used in polling mode. */ 805 /* Port72 cannot generate IRQs, will be used in polling mode. */
806 .cd_gpio = 72, 806 .cd_gpio = 72,
807}; 807};
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index f27b5a833bf0..25558d1f417f 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -201,12 +201,12 @@ static struct rcar_phy_platform_data usb_phy_platform_data __initdata =
201 201
202 202
203/* SDHI */ 203/* SDHI */
204static struct sh_mobile_sdhi_info sdhi0_info __initdata = { 204static struct tmio_mmc_data sdhi0_info __initdata = {
205 .dma_slave_tx = HPBDMA_SLAVE_SDHI0_TX, 205 .chan_priv_tx = (void *)HPBDMA_SLAVE_SDHI0_TX,
206 .dma_slave_rx = HPBDMA_SLAVE_SDHI0_RX, 206 .chan_priv_rx = (void *)HPBDMA_SLAVE_SDHI0_RX,
207 .tmio_caps = MMC_CAP_SD_HIGHSPEED, 207 .capabilities = MMC_CAP_SD_HIGHSPEED,
208 .tmio_ocr_mask = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34, 208 .ocr_mask = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
209 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, 209 .flags = TMIO_MMC_HAS_IDLE_WAIT,
210}; 210};
211 211
212static struct resource sdhi0_resources[] __initdata = { 212static struct resource sdhi0_resources[] __initdata = {
@@ -683,7 +683,7 @@ static void __init bockw_init(void)
683 platform_device_register_resndata( 683 platform_device_register_resndata(
684 NULL, "sh_mobile_sdhi", 0, 684 NULL, "sh_mobile_sdhi", 0,
685 sdhi0_resources, ARRAY_SIZE(sdhi0_resources), 685 sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
686 &sdhi0_info, sizeof(struct sh_mobile_sdhi_info)); 686 &sdhi0_info, sizeof(struct tmio_mmc_data));
687 } 687 }
688 688
689 /* for Audio */ 689 /* for Audio */
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 7c9b63bdde9f..260d8319fd82 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -442,11 +442,11 @@ static struct platform_device vcc_sdhi2 = {
442}; 442};
443 443
444/* SDHI */ 444/* SDHI */
445static struct sh_mobile_sdhi_info sdhi0_info = { 445static struct tmio_mmc_data sdhi0_info = {
446 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 446 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
447 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 447 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
448 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT, 448 .flags = TMIO_MMC_HAS_IDLE_WAIT,
449 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 449 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
450 MMC_CAP_POWER_OFF_CARD, 450 MMC_CAP_POWER_OFF_CARD,
451}; 451};
452 452
@@ -484,13 +484,13 @@ static struct platform_device sdhi0_device = {
484}; 484};
485 485
486/* Micro SD */ 486/* Micro SD */
487static struct sh_mobile_sdhi_info sdhi2_info = { 487static struct tmio_mmc_data sdhi2_info = {
488 .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX, 488 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI2_TX,
489 .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX, 489 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI2_RX,
490 .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | 490 .flags = TMIO_MMC_HAS_IDLE_WAIT |
491 TMIO_MMC_USE_GPIO_CD | 491 TMIO_MMC_USE_GPIO_CD |
492 TMIO_MMC_WRPROTECT_DISABLE, 492 TMIO_MMC_WRPROTECT_DISABLE,
493 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD, 493 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD,
494 .cd_gpio = 13, 494 .cd_gpio = 13,
495}; 495};
496 496
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index a1c1dfb6a67a..88e4f457193b 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -972,11 +972,11 @@ static struct platform_device nand_flash_device = {
972}; 972};
973 973
974/* SDHI0 */ 974/* SDHI0 */
975static struct sh_mobile_sdhi_info sdhi0_info = { 975static struct tmio_mmc_data sdhi0_info = {
976 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 976 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
977 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 977 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
978 .tmio_flags = TMIO_MMC_USE_GPIO_CD, 978 .flags = TMIO_MMC_USE_GPIO_CD,
979 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, 979 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
980 .cd_gpio = 172, 980 .cd_gpio = 172,
981}; 981};
982 982
@@ -1011,11 +1011,11 @@ static struct platform_device sdhi0_device = {
1011/* SDHI1 */ 1011/* SDHI1 */
1012 1012
1013/* GPIO 41 can trigger IRQ8, but it is used by USBHS1, we have to poll */ 1013/* GPIO 41 can trigger IRQ8, but it is used by USBHS1, we have to poll */
1014static struct sh_mobile_sdhi_info sdhi1_info = { 1014static struct tmio_mmc_data sdhi1_info = {
1015 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, 1015 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI1_TX,
1016 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, 1016 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI1_RX,
1017 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD, 1017 .flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,
1018 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 1018 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
1019 MMC_CAP_NEEDS_POLL, 1019 MMC_CAP_NEEDS_POLL,
1020 .cd_gpio = 41, 1020 .cd_gpio = 41,
1021}; 1021};
@@ -1054,11 +1054,11 @@ static struct platform_device sdhi1_device = {
1054 * The card detect pin of the top SD/MMC slot (CN23) is active low and is 1054 * The card detect pin of the top SD/MMC slot (CN23) is active low and is
1055 * connected to GPIO SCIFB_SCK of SH7372 (GPIO 162). 1055 * connected to GPIO SCIFB_SCK of SH7372 (GPIO 162).
1056 */ 1056 */
1057static struct sh_mobile_sdhi_info sdhi2_info = { 1057static struct tmio_mmc_data sdhi2_info = {
1058 .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX, 1058 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI2_TX,
1059 .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX, 1059 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI2_RX,
1060 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD, 1060 .flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,
1061 .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | 1061 .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
1062 MMC_CAP_NEEDS_POLL, 1062 MMC_CAP_NEEDS_POLL,
1063 .cd_gpio = 162, 1063 .cd_gpio = 162,
1064}; 1064};
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 598f704f76ae..51db288f192a 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -122,11 +122,11 @@ static struct resource sdhi0_resources[] = {
122 }, 122 },
123}; 123};
124 124
125static struct sh_mobile_sdhi_info sdhi0_platform_data = { 125static struct tmio_mmc_data sdhi0_platform_data = {
126 .dma_slave_tx = HPBDMA_SLAVE_SDHI0_TX, 126 .chan_priv_tx = (void *)HPBDMA_SLAVE_SDHI0_TX,
127 .dma_slave_rx = HPBDMA_SLAVE_SDHI0_RX, 127 .chan_priv_rx = (void *)HPBDMA_SLAVE_SDHI0_RX,
128 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT, 128 .flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
129 .tmio_caps = MMC_CAP_SD_HIGHSPEED, 129 .capabilities = MMC_CAP_SD_HIGHSPEED,
130}; 130};
131 131
132static struct platform_device sdhi0_device = { 132static struct platform_device sdhi0_device = {
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 669df51a82e3..324599bfad14 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -17,6 +17,7 @@
17#include <linux/spi/spi.h> 17#include <linux/spi/spi.h>
18#include <linux/spi/flash.h> 18#include <linux/spi/flash.h>
19#include <linux/io.h> 19#include <linux/io.h>
20#include <linux/mfd/tmio.h>
20#include <linux/mmc/host.h> 21#include <linux/mmc/host.h>
21#include <linux/mmc/sh_mmcif.h> 22#include <linux/mmc/sh_mmcif.h>
22#include <linux/mmc/sh_mobile_sdhi.h> 23#include <linux/mmc/sh_mobile_sdhi.h>
@@ -243,10 +244,10 @@ static struct platform_device sh_mmcif_device = {
243}; 244};
244 245
245/* SDHI0 */ 246/* SDHI0 */
246static struct sh_mobile_sdhi_info sdhi_info = { 247static struct tmio_mmc_data sdhi_info = {
247 .dma_slave_tx = SHDMA_SLAVE_SDHI_TX, 248 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI_TX,
248 .dma_slave_rx = SHDMA_SLAVE_SDHI_RX, 249 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI_RX,
249 .tmio_caps = MMC_CAP_SD_HIGHSPEED, 250 .capabilities = MMC_CAP_SD_HIGHSPEED,
250}; 251};
251 252
252static struct resource sdhi_resources[] = { 253static struct resource sdhi_resources[] = {
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index d4b01d4cc102..cbd2a9f02a91 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -18,6 +18,7 @@
18#include <linux/mmc/sh_mobile_sdhi.h> 18#include <linux/mmc/sh_mobile_sdhi.h>
19#include <linux/mtd/physmap.h> 19#include <linux/mtd/physmap.h>
20#include <linux/mtd/sh_flctl.h> 20#include <linux/mtd/sh_flctl.h>
21#include <linux/mfd/tmio.h>
21#include <linux/delay.h> 22#include <linux/delay.h>
22#include <linux/i2c.h> 23#include <linux/i2c.h>
23#include <linux/regulator/fixed.h> 24#include <linux/regulator/fixed.h>
@@ -447,8 +448,8 @@ static struct resource sdhi0_cn3_resources[] = {
447 }, 448 },
448}; 449};
449 450
450static struct sh_mobile_sdhi_info sdhi0_cn3_data = { 451static struct tmio_mmc_data sdhi0_cn3_data = {
451 .tmio_caps = MMC_CAP_SDIO_IRQ, 452 .capabilities = MMC_CAP_SDIO_IRQ,
452}; 453};
453 454
454static struct platform_device sdhi0_cn3_device = { 455static struct platform_device sdhi0_cn3_device = {
@@ -474,8 +475,8 @@ static struct resource sdhi1_cn7_resources[] = {
474 }, 475 },
475}; 476};
476 477
477static struct sh_mobile_sdhi_info sdhi1_cn7_data = { 478static struct tmio_mmc_data sdhi1_cn7_data = {
478 .tmio_caps = MMC_CAP_SDIO_IRQ, 479 .capabilities = MMC_CAP_SDIO_IRQ,
479}; 480};
480 481
481static struct platform_device sdhi1_cn7_device = { 482static struct platform_device sdhi1_cn7_device = {
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 0d3049244cd3..d531791f06ff 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -601,12 +601,12 @@ static struct platform_device sdhi0_power = {
601 }, 601 },
602}; 602};
603 603
604static struct sh_mobile_sdhi_info sdhi0_info = { 604static struct tmio_mmc_data sdhi0_info = {
605 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 605 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
606 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 606 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
607 .tmio_caps = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD | 607 .capabilities = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
608 MMC_CAP_NEEDS_POLL, 608 MMC_CAP_NEEDS_POLL,
609 .tmio_flags = TMIO_MMC_USE_GPIO_CD, 609 .flags = TMIO_MMC_USE_GPIO_CD,
610 .cd_gpio = GPIO_PTY7, 610 .cd_gpio = GPIO_PTY7,
611}; 611};
612 612
@@ -635,12 +635,12 @@ static struct platform_device sdhi0_device = {
635 635
636#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) 636#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
637/* SDHI1 */ 637/* SDHI1 */
638static struct sh_mobile_sdhi_info sdhi1_info = { 638static struct tmio_mmc_data sdhi1_info = {
639 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, 639 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI1_TX,
640 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, 640 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI1_RX,
641 .tmio_caps = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD | 641 .capabilities = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
642 MMC_CAP_NEEDS_POLL, 642 MMC_CAP_NEEDS_POLL,
643 .tmio_flags = TMIO_MMC_USE_GPIO_CD, 643 .flags = TMIO_MMC_USE_GPIO_CD,
644 .cd_gpio = GPIO_PTW7, 644 .cd_gpio = GPIO_PTW7,
645}; 645};
646 646
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 1df4398f8375..7d997cec09c5 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -373,11 +373,11 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = {
373 }, 373 },
374}; 374};
375 375
376static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { 376static struct tmio_mmc_data sh7724_sdhi0_data = {
377 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 377 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
378 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 378 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
379 .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, 379 .flags = TMIO_MMC_WRPROTECT_DISABLE,
380 .tmio_caps = MMC_CAP_SDIO_IRQ, 380 .capabilities = MMC_CAP_SDIO_IRQ,
381}; 381};
382 382
383static struct platform_device kfr2r09_sh_sdhi0_device = { 383static struct platform_device kfr2r09_sh_sdhi0_device = {
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 8b73194ed2ce..29b7c0dcfc51 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,6 +15,7 @@
15#include <linux/mmc/host.h> 15#include <linux/mmc/host.h>
16#include <linux/mmc/sh_mobile_sdhi.h> 16#include <linux/mmc/sh_mobile_sdhi.h>
17#include <linux/mtd/physmap.h> 17#include <linux/mtd/physmap.h>
18#include <linux/mfd/tmio.h>
18#include <linux/mtd/nand.h> 19#include <linux/mtd/nand.h>
19#include <linux/i2c.h> 20#include <linux/i2c.h>
20#include <linux/regulator/fixed.h> 21#include <linux/regulator/fixed.h>
@@ -408,10 +409,10 @@ static struct resource sdhi_cn9_resources[] = {
408 }, 409 },
409}; 410};
410 411
411static struct sh_mobile_sdhi_info sh7724_sdhi_data = { 412static struct tmio_mmc_data sh7724_sdhi_data = {
412 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 413 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
413 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 414 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
414 .tmio_caps = MMC_CAP_SDIO_IRQ, 415 .capabilities = MMC_CAP_SDIO_IRQ,
415}; 416};
416 417
417static struct platform_device sdhi_cn9_device = { 418static struct platform_device sdhi_cn9_device = {
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 1162bc6945a3..4f6635a075f2 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -16,6 +16,7 @@
16#include <linux/platform_device.h> 16#include <linux/platform_device.h>
17#include <linux/mmc/host.h> 17#include <linux/mmc/host.h>
18#include <linux/mmc/sh_mobile_sdhi.h> 18#include <linux/mmc/sh_mobile_sdhi.h>
19#include <linux/mfd/tmio.h>
19#include <linux/mtd/physmap.h> 20#include <linux/mtd/physmap.h>
20#include <linux/delay.h> 21#include <linux/delay.h>
21#include <linux/regulator/fixed.h> 22#include <linux/regulator/fixed.h>
@@ -468,10 +469,10 @@ static struct resource sdhi0_cn7_resources[] = {
468 }, 469 },
469}; 470};
470 471
471static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { 472static struct tmio_mmc_data sh7724_sdhi0_data = {
472 .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, 473 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
473 .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, 474 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
474 .tmio_caps = MMC_CAP_SDIO_IRQ, 475 .capabilities = MMC_CAP_SDIO_IRQ,
475}; 476};
476 477
477static struct platform_device sdhi0_cn7_device = { 478static struct platform_device sdhi0_cn7_device = {
@@ -497,10 +498,10 @@ static struct resource sdhi1_cn8_resources[] = {
497 }, 498 },
498}; 499};
499 500
500static struct sh_mobile_sdhi_info sh7724_sdhi1_data = { 501static struct tmio_mmc_data sh7724_sdhi1_data = {
501 .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, 502 .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI1_TX,
502 .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, 503 .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI1_RX,
503 .tmio_caps = MMC_CAP_SDIO_IRQ, 504 .capabilities = MMC_CAP_SDIO_IRQ,
504}; 505};
505 506
506static struct platform_device sdhi1_cn8_device = { 507static struct platform_device sdhi1_cn8_device = {
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-10 13:27:21 -0400