Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c078c62a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Vinod Koul
Browse files

mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info v2 



84f11d5b
(mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info)
replaced sh_mobile_sdhi_info to tmio_mmc_data, but it was missing
to replace board-ape6evm / board-mackerel.
Kernel build will be failed without this patch.

	>> arch/arm/mach-shmobile/board-ape6evm.c:176:21: error: \
		variable 'sdhi0_pdata' has initializer but incomplete type
	static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = {
	                    ^
	>> arch/arm/mach-shmobile/board-ape6evm.c:177:2: error: \
		unknown field 'tmio_flags' specified in initializer
	.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
	^
	...

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 84f11d5b

arch/arm/mach-shmobile/board-ape6evm.c

+6 −6
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ static const struct resource mmcif0_resources[] __initconst = { 
};



/* SDHI0 */

static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

static const struct tmio_mmc_data sdhi0_pdata __initconst = {

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

};



static const struct resource sdhi0_resources[] __initconst = {
@@ -184,9 +184,9 @@ static const struct resource sdhi0_resources[] __initconst = { 
};



/* SDHI1 */

static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

static const struct tmio_mmc_data sdhi1_pdata __initconst = {

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_NEEDS_POLL,

};

arch/arm/mach-shmobile/board-mackerel.c

+15 −15
Original line number Diff line number Diff line
@@ -972,11 +972,11 @@ static struct platform_device nand_flash_device = { 
};



/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_flags	= TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

static struct tmio_mmc_data sdhi0_info = {

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI0_TX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI0_RX,

	.flags		= TMIO_MMC_USE_GPIO_CD,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.cd_gpio	= 172,

};
@@ -1011,11 +1011,11 @@ static struct platform_device sdhi0_device = { 
/* SDHI1 */



/* GPIO 41 can trigger IRQ8, but it is used by USBHS1, we have to poll */

static struct sh_mobile_sdhi_info sdhi1_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

static struct tmio_mmc_data sdhi1_info = {

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI1_TX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI1_RX,

	.flags		= TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_NEEDS_POLL,

	.cd_gpio	= 41,

};
@@ -1054,11 +1054,11 @@ static struct platform_device sdhi1_device = { 
 * The card detect pin of the top SD/MMC slot (CN23) is active low and is

 * connected to GPIO SCIFB_SCK of SH7372 (GPIO 162).

 */

static struct sh_mobile_sdhi_info sdhi2_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI2_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI2_RX,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

static struct tmio_mmc_data sdhi2_info = {

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI2_TX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI2_RX,

	.flags		= TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_USE_GPIO_CD,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_NEEDS_POLL,

	.cd_gpio	= 162,

};