diff options
| -rw-r--r-- | arch/arm/mach-exynos/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/dev-drm.c | 29 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-smdk4x12.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 2 |
8 files changed, 0 insertions, 47 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 9b58024f7d43..1797dee88a0d 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile | |||
| @@ -53,7 +53,6 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o | |||
| 53 | obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o | 53 | obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o |
| 54 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o | 54 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o |
| 55 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o | 55 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o |
| 56 | obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o | ||
| 57 | obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o | 56 | obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o |
| 58 | 57 | ||
| 59 | obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o | 58 | obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o |
diff --git a/arch/arm/mach-exynos/dev-drm.c b/arch/arm/mach-exynos/dev-drm.c deleted file mode 100644 index 17c9c6ecc2e0..000000000000 --- a/arch/arm/mach-exynos/dev-drm.c +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-exynos/dev-drm.c | ||
| 3 | * | ||
| 4 | * Copyright (c) 2012 Samsung Electronics Co., Ltd. | ||
| 5 | * http://www.samsung.com | ||
| 6 | * | ||
| 7 | * EXYNOS - core DRM device | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/dma-mapping.h> | ||
| 17 | #include <linux/platform_device.h> | ||
| 18 | |||
| 19 | #include <plat/devs.h> | ||
| 20 | |||
| 21 | static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32); | ||
| 22 | |||
| 23 | struct platform_device exynos_device_drm = { | ||
| 24 | .name = "exynos-drm", | ||
| 25 | .dev = { | ||
| 26 | .dma_mask = &exynos_drm_dma_mask, | ||
| 27 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
| 28 | } | ||
| 29 | }; | ||
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index c05d7aa84031..94970602df61 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
| @@ -1327,9 +1327,6 @@ static struct platform_device *nuri_devices[] __initdata = { | |||
| 1327 | &cam_vdda_fixed_rdev, | 1327 | &cam_vdda_fixed_rdev, |
| 1328 | &cam_8m_12v_fixed_rdev, | 1328 | &cam_8m_12v_fixed_rdev, |
| 1329 | &exynos4_bus_devfreq, | 1329 | &exynos4_bus_devfreq, |
| 1330 | #ifdef CONFIG_DRM_EXYNOS | ||
| 1331 | &exynos_device_drm, | ||
| 1332 | #endif | ||
| 1333 | }; | 1330 | }; |
| 1334 | 1331 | ||
| 1335 | static void __init nuri_map_io(void) | 1332 | static void __init nuri_map_io(void) |
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 9adf491674ea..d8dc6d7f0c00 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
| @@ -709,9 +709,6 @@ static struct platform_device *origen_devices[] __initdata = { | |||
| 709 | &s5p_device_mfc_l, | 709 | &s5p_device_mfc_l, |
| 710 | &s5p_device_mfc_r, | 710 | &s5p_device_mfc_r, |
| 711 | &s5p_device_mixer, | 711 | &s5p_device_mixer, |
| 712 | #ifdef CONFIG_DRM_EXYNOS | ||
| 713 | &exynos_device_drm, | ||
| 714 | #endif | ||
| 715 | &exynos4_device_ohci, | 712 | &exynos4_device_ohci, |
| 716 | &origen_device_gpiokeys, | 713 | &origen_device_gpiokeys, |
| 717 | &origen_lcd_hv070wsa, | 714 | &origen_lcd_hv070wsa, |
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c index 730f1ac65928..17b9ca48722e 100644 --- a/arch/arm/mach-exynos/mach-smdk4x12.c +++ b/arch/arm/mach-exynos/mach-smdk4x12.c | |||
| @@ -317,9 +317,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = { | |||
| 317 | &s5p_device_mfc, | 317 | &s5p_device_mfc, |
| 318 | &s5p_device_mfc_l, | 318 | &s5p_device_mfc_l, |
| 319 | &s5p_device_mfc_r, | 319 | &s5p_device_mfc_r, |
| 320 | #ifdef CONFIG_DRM_EXYNOS | ||
| 321 | &exynos_device_drm, | ||
| 322 | #endif | ||
| 323 | &samsung_device_keypad, | 320 | &samsung_device_keypad, |
| 324 | }; | 321 | }; |
| 325 | 322 | ||
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index ee4fb1a9cb72..4f0ac5397ba3 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
| @@ -300,9 +300,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
| 300 | &s5p_device_fimc_md, | 300 | &s5p_device_fimc_md, |
| 301 | &s5p_device_g2d, | 301 | &s5p_device_g2d, |
| 302 | &s5p_device_jpeg, | 302 | &s5p_device_jpeg, |
| 303 | #ifdef CONFIG_DRM_EXYNOS | ||
| 304 | &exynos_device_drm, | ||
| 305 | #endif | ||
| 306 | &exynos4_device_ac97, | 303 | &exynos4_device_ac97, |
| 307 | &exynos4_device_i2s0, | 304 | &exynos4_device_i2s0, |
| 308 | &exynos4_device_ohci, | 305 | &exynos4_device_ohci, |
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index ebc9dd339a38..cfdf876a8626 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
| @@ -1081,9 +1081,6 @@ static struct platform_device *universal_devices[] __initdata = { | |||
| 1081 | &s5p_device_onenand, | 1081 | &s5p_device_onenand, |
| 1082 | &s5p_device_fimd0, | 1082 | &s5p_device_fimd0, |
| 1083 | &s5p_device_jpeg, | 1083 | &s5p_device_jpeg, |
| 1084 | #ifdef CONFIG_DRM_EXYNOS | ||
| 1085 | &exynos_device_drm, | ||
| 1086 | #endif | ||
| 1087 | &s3c_device_usb_hsotg, | 1084 | &s3c_device_usb_hsotg, |
| 1088 | &s5p_device_mfc, | 1085 | &s5p_device_mfc, |
| 1089 | &s5p_device_mfc_l, | 1086 | &s5p_device_mfc_l, |
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 5da4b4f38f40..133e3e4170fb 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -133,8 +133,6 @@ extern struct platform_device exynos4_device_pcm1; | |||
| 133 | extern struct platform_device exynos4_device_pcm2; | 133 | extern struct platform_device exynos4_device_pcm2; |
| 134 | extern struct platform_device exynos4_device_spdif; | 134 | extern struct platform_device exynos4_device_spdif; |
| 135 | 135 | ||
| 136 | extern struct platform_device exynos_device_drm; | ||
| 137 | |||
| 138 | extern struct platform_device samsung_asoc_dma; | 136 | extern struct platform_device samsung_asoc_dma; |
| 139 | extern struct platform_device samsung_asoc_idma; | 137 | extern struct platform_device samsung_asoc_idma; |
| 140 | extern struct platform_device samsung_device_keypad; | 138 | extern struct platform_device samsung_device_keypad; |
