diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-18 21:51:54 +1000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-18 21:51:54 +1000 |
| commit | 66dae316dd2941cad098e6674810fdc3f4b2e275 (patch) | |
| tree | d24ef7eb71c7378e6a924ba43044a88399703538 /arch/sh | |
| parent | 0c929238ca4baefe47f4034732db4c154f2329c6 (diff) | |
| parent | 833218f16b1fbfdff0dbb9ac477cf0c6e85cd4f5 (diff) | |
| download | linux-3.10-66dae316dd2941cad098e6674810fdc3f4b2e275.tar.gz linux-3.10-66dae316dd2941cad098e6674810fdc3f4b2e275.tar.bz2 linux-3.10-66dae316dd2941cad098e6674810fdc3f4b2e275.zip | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/board-sh7757lcr.c | 12 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c index 33dc5b6e8e1..8d2ae109a83 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c @@ -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 = { diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c index b3c039a5064..70bd96646f4 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c @@ -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]), |