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

Commit d5bb386d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

ARM: mach-shmobile: simplify MMCIF DMA configuration 



Use the simplified method to specify MMCIF DMA slave configuration.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 41733e89

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

+2 −9
Original line number Original line Diff line number Diff line
@@ -159,19 +159,12 @@ static struct resource sh_mmcif_resources[] = { 
	},

	},

};

};





static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};

static struct sh_mmcif_plat_data sh_mmcif_platdata = {

static struct sh_mmcif_plat_data sh_mmcif_platdata = {

	.sup_pclk	= 0,

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195,

	.ocr		= MMC_VDD_165_195,

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};

};





static struct platform_device mmc_device = {

static struct platform_device mmc_device = {

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

+2 −10
Original line number Original line Diff line number Diff line
@@ -295,15 +295,6 @@ static struct resource sh_mmcif_resources[] = { 
	},

	},

};

};





static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -311,7 +302,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { 
			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,

			  MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

	.get_cd		= slot_cn7_get_cd,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};

};





static struct platform_device sh_mmcif_device = {

static struct platform_device sh_mmcif_device = {

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

+2 −10
Original line number Original line Diff line number Diff line
@@ -1184,15 +1184,6 @@ static struct resource sh_mmcif_resources[] = { 
	},

	},

};

};





static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -1200,7 +1191,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { 
			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,

			  MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

	.get_cd		= slot_cn7_get_cd,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};

};





static struct platform_device sh_mmcif_device = {

static struct platform_device sh_mmcif_device = {