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

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

mmc: sh_mobile_sdhi: remove sh_mobile_sdhi_info 



Current sh_mobile_sdhi's platform data is set via sh_mobile_sdhi_info
and it is just copied to tmio_mmc_data.
Now, tmio mmc platform data is specified via tmio_mmc_data.
This patch replace sh_mobile_sdhi_info to tmio_mmc_data

struct sh_mobile_sdhi_info {      -> struct tmio_mmc_data {
        int dma_slave_tx;         ->    void            *chan_priv_tx;
        int dma_slave_rx;         ->    void            *chan_priv_rx;
        unsigned long tmio_flags; ->    unsigned long   flags;
        unsigned long tmio_caps;  ->    unsigned long   capabilities;
        unsigned long tmio_caps2; ->    unsigned long   capabilities2;
        u32 tmio_ocr_mask;        ->    u32             ocr_mask;
        unsigned int cd_gpio;     ->    unsigned int    cd_gpio;
};                                      unsigned int    hclk;
                                        void (*set_pwr)(...);
                                        void (*set_clk_div)(...);
                                      };

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent f33c9d65

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

+10 −10
Original line number Diff line number Diff line
@@ -754,12 +754,12 @@ static struct platform_device vcc_sdhi1 = { 
};



/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.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,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.cd_gpio	= 167,

};
@@ -796,12 +796,12 @@ static struct platform_device sdhi0_device = { 
};



/* SDHI1 */

static struct sh_mobile_sdhi_info sdhi1_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.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,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,

	/* Port72 cannot generate IRQs, will be used in polling mode. */

	.cd_gpio	= 72,

};

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

+7 −7
Original line number Diff line number Diff line
@@ -201,12 +201,12 @@ static struct rcar_phy_platform_data usb_phy_platform_data __initdata = 




/* SDHI */

static struct sh_mobile_sdhi_info sdhi0_info __initdata = {

	.dma_slave_tx	= HPBDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= HPBDMA_SLAVE_SDHI0_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

static struct tmio_mmc_data sdhi0_info __initdata = {

	.chan_priv_tx	= (void *)HPBDMA_SLAVE_SDHI0_TX,

	.chan_priv_rx	= (void *)HPBDMA_SLAVE_SDHI0_RX,

	.capabilities	= MMC_CAP_SD_HIGHSPEED,

	.ocr_mask	= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.flags		= TMIO_MMC_HAS_IDLE_WAIT,

};



static struct resource sdhi0_resources[] __initdata = {
@@ -683,7 +683,7 @@ static void __init bockw_init(void) 
		platform_device_register_resndata(

			NULL, "sh_mobile_sdhi", 0,

			sdhi0_resources, ARRAY_SIZE(sdhi0_resources),

			&sdhi0_info, sizeof(struct sh_mobile_sdhi_info));

			&sdhi0_info, sizeof(struct tmio_mmc_data));

	}



	/* for Audio */

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

+10 −10
Original line number Diff line number Diff line
@@ -442,11 +442,11 @@ static struct platform_device vcc_sdhi2 = { 
};



/* SDHI */

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_HAS_IDLE_WAIT,

	.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_HAS_IDLE_WAIT,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |

			  MMC_CAP_POWER_OFF_CARD,

};
@@ -484,13 +484,13 @@ static struct platform_device sdhi0_device = { 
};



/* Micro SD */

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_HAS_IDLE_WAIT |

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_HAS_IDLE_WAIT |

			  TMIO_MMC_USE_GPIO_CD |

			  TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_POWER_OFF_CARD,

	.cd_gpio	= 13,

};

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

+5 −5
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ static struct resource sdhi0_resources[] = { 
	},

};



static struct sh_mobile_sdhi_info sdhi0_platform_data = {

	.dma_slave_tx = HPBDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx = HPBDMA_SLAVE_SDHI0_RX,

	.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_caps = MMC_CAP_SD_HIGHSPEED,

static struct tmio_mmc_data sdhi0_platform_data = {

	.chan_priv_tx = (void *)HPBDMA_SLAVE_SDHI0_TX,

	.chan_priv_rx = (void *)HPBDMA_SLAVE_SDHI0_RX,

	.flags        = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,

	.capabilities = MMC_CAP_SD_HIGHSPEED,

};



static struct platform_device sdhi0_device = {

arch/sh/boards/board-sh7757lcr.c

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/io.h>

#include <linux/mfd/tmio.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>
@@ -243,10 +244,10 @@ static struct platform_device sh_mmcif_device = { 
};



/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

static struct tmio_mmc_data sdhi_info = {

	.chan_priv_tx	= (void *)SHDMA_SLAVE_SDHI_TX,

	.chan_priv_rx	= (void *)SHDMA_SLAVE_SDHI_RX,

	.capabilities	= MMC_CAP_SD_HIGHSPEED,

};



static struct resource sdhi_resources[] = {