diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-18 06:51:54 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-18 06:51:54 -0500 |
commit | 66dae316dd2941cad098e6674810fdc3f4b2e275 (patch) | |
tree | d24ef7eb71c7378e6a924ba43044a88399703538 /arch/sh | |
parent | 0c929238ca4baefe47f4034732db4c154f2329c6 (diff) | |
parent | 833218f16b1fbfdff0dbb9ac477cf0c6e85cd4f5 (diff) |
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 33dc5b6e8e17..8d2ae109a83a 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[] = { | |||
210 | }, | 210 | }, |
211 | }; | 211 | }; |
212 | 212 | ||
213 | static struct sh_mmcif_dma sh7757lcr_mmcif_dma = { | ||
214 | .chan_priv_tx = { | ||
215 | .slave_id = SHDMA_SLAVE_MMCIF_TX, | ||
216 | }, | ||
217 | .chan_priv_rx = { | ||
218 | .slave_id = SHDMA_SLAVE_MMCIF_RX, | ||
219 | } | ||
220 | }; | ||
221 | |||
222 | static struct sh_mmcif_plat_data sh_mmcif_plat = { | 213 | static struct sh_mmcif_plat_data sh_mmcif_plat = { |
223 | .dma = &sh7757lcr_mmcif_dma, | ||
224 | .sup_pclk = 0x0f, | 214 | .sup_pclk = 0x0f, |
225 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | | 215 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | |
226 | MMC_CAP_NONREMOVABLE, | 216 | MMC_CAP_NONREMOVABLE, |
227 | .ocr = MMC_VDD_32_33 | MMC_VDD_33_34, | 217 | .ocr = MMC_VDD_32_33 | MMC_VDD_33_34, |
218 | .slave_id_tx = SHDMA_SLAVE_MMCIF_TX, | ||
219 | .slave_id_rx = SHDMA_SLAVE_MMCIF_RX, | ||
228 | }; | 220 | }; |
229 | 221 | ||
230 | static struct platform_device sh_mmcif_device = { | 222 | 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 b3c039a5064a..70bd96646f42 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[] = { | |||
343 | CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]), | 343 | CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]), |
344 | CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]), | 344 | CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]), |
345 | CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]), | 345 | CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]), |
346 | CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]), | 346 | CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]), |
347 | CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]), | 347 | CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]), |
348 | CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]), | 348 | CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]), |
349 | CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]), | 349 | CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]), |