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

Commit 66dae316 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/platform-updates' into sh-latest

parents 0c929238 833218f1

arch/sh/boards/board-sh7757lcr.c

+2 −10
Original line number Diff line number Diff line
@@ -210,21 +210,13 @@ static struct resource sh_mmcif_resources[] = { 
	},

};



static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {

	.chan_priv_tx	= {

		.slave_id = SHDMA_SLAVE_MMCIF_TX,

	},

	.chan_priv_rx	= {

		.slave_id = SHDMA_SLAVE_MMCIF_RX,

	}

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.dma		= &sh7757lcr_mmcif_dma,

	.sup_pclk	= 0x0f,

	.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NONREMOVABLE,

	.ocr		= MMC_VDD_32_33 | MMC_VDD_33_34,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct platform_device sh_mmcif_device = {

arch/sh/kernel/cpu/sh4a/clock-sh7724.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),

	CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),

	CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),

	CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),

	CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]),

	CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),

	CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),

	CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),