From 0750a54592a2daff70771a1c170f9859d5901d3d Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Thu, 8 Aug 2013 07:26:48 +0900 Subject: ARM: shmobile: Rename to r8a73a4_init_early() Rename r8a73a4_init_delay() into r8a73a4_init_early() to make the function name show that more than just delay setup may happen in the future. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-ape6evm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-shmobile/board-ape6evm.c') diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 24b87eea9da..d36e23f5d8b 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -240,7 +240,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(APE6EVM_DT, "ape6evm") - .init_early = r8a73a4_init_delay, + .init_early = r8a73a4_init_early, .init_machine = ape6evm_add_standard_devices, .dt_compat = ape6evm_boards_compat_dt, MACHINE_END -- cgit v1.2.3-70-g09d2 From 7a2a7a371145e83ad60482313e8cd7501994df3a Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 22 Jul 2013 15:16:16 +0200 Subject: ARM: shmobile: ape6evm: add DMA support to MMCIF Add DMA support for MMCIF on APE6EVM, using the shdma dmaengine driver. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-ape6evm.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-shmobile/board-ape6evm.c') diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 7627385f516..2de4b097aa1 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -162,6 +162,8 @@ static struct regulator_consumer_supply vcc_sdhi1_consumers[] = /* MMCIF */ static const struct sh_mmcif_plat_data mmcif0_pdata __initconst = { .caps = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE, + .slave_id_tx = SHDMA_SLAVE_MMCIF0_TX, + .slave_id_rx = SHDMA_SLAVE_MMCIF0_RX, .ccs_unsupported = true, }; -- cgit v1.2.3-70-g09d2