diff options
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index b7289051fe2..1d214cb9d77 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -272,16 +272,8 @@ struct platform_device s5p_device_fimc3 = { | |||
272 | 272 | ||
273 | #ifdef CONFIG_S5P_DEV_G2D | 273 | #ifdef CONFIG_S5P_DEV_G2D |
274 | static struct resource s5p_g2d_resource[] = { | 274 | static struct resource s5p_g2d_resource[] = { |
275 | [0] = { | 275 | [0] = DEFINE_RES_MEM(S5P_PA_G2D, SZ_4K), |
276 | .start = S5P_PA_G2D, | 276 | [1] = DEFINE_RES_IRQ(IRQ_2D), |
277 | .end = S5P_PA_G2D + SZ_4K - 1, | ||
278 | .flags = IORESOURCE_MEM, | ||
279 | }, | ||
280 | [1] = { | ||
281 | .start = IRQ_2D, | ||
282 | .end = IRQ_2D, | ||
283 | .flags = IORESOURCE_IRQ, | ||
284 | }, | ||
285 | }; | 277 | }; |
286 | 278 | ||
287 | struct platform_device s5p_device_g2d = { | 279 | struct platform_device s5p_device_g2d = { |
@@ -370,7 +362,6 @@ struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata = { | |||
370 | .max_width = 4, | 362 | .max_width = 4, |
371 | .host_caps = (MMC_CAP_4_BIT_DATA | | 363 | .host_caps = (MMC_CAP_4_BIT_DATA | |
372 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), | 364 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), |
373 | .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL, | ||
374 | }; | 365 | }; |
375 | 366 | ||
376 | struct platform_device s3c_device_hsmmc0 = { | 367 | struct platform_device s3c_device_hsmmc0 = { |
@@ -401,7 +392,6 @@ struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata = { | |||
401 | .max_width = 4, | 392 | .max_width = 4, |
402 | .host_caps = (MMC_CAP_4_BIT_DATA | | 393 | .host_caps = (MMC_CAP_4_BIT_DATA | |
403 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), | 394 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), |
404 | .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL, | ||
405 | }; | 395 | }; |
406 | 396 | ||
407 | struct platform_device s3c_device_hsmmc1 = { | 397 | struct platform_device s3c_device_hsmmc1 = { |
@@ -434,7 +424,6 @@ struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata = { | |||
434 | .max_width = 4, | 424 | .max_width = 4, |
435 | .host_caps = (MMC_CAP_4_BIT_DATA | | 425 | .host_caps = (MMC_CAP_4_BIT_DATA | |
436 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), | 426 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), |
437 | .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL, | ||
438 | }; | 427 | }; |
439 | 428 | ||
440 | struct platform_device s3c_device_hsmmc2 = { | 429 | struct platform_device s3c_device_hsmmc2 = { |
@@ -465,7 +454,6 @@ struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata = { | |||
465 | .max_width = 4, | 454 | .max_width = 4, |
466 | .host_caps = (MMC_CAP_4_BIT_DATA | | 455 | .host_caps = (MMC_CAP_4_BIT_DATA | |
467 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), | 456 | MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED), |
468 | .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL, | ||
469 | }; | 457 | }; |
470 | 458 | ||
471 | struct platform_device s3c_device_hsmmc3 = { | 459 | struct platform_device s3c_device_hsmmc3 = { |