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

Commit 0a9d5ac3 authored by Rahul Sharma's avatar Rahul Sharma Committed by Kukjin Kim
Browse files

ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms 



As exynos-drm is a software device, its registration is moved to the
exynos drm driver. This will provide generic solution for device registration
for dt and non-dt platforms. Corresponding patches are posted to dri-devel
list.

Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent cf3a97b4

arch/arm/mach-exynos/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o 
obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o

obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o

obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o

obj-$(CONFIG_EXYNOS_DEV_DRM)		+= dev-drm.o

obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o



obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o

arch/arm/mach-exynos/dev-drm.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-exynos/dev-drm.c

 *

 * Copyright (c) 2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS - core DRM device

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>



#include <plat/devs.h>



static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32);



struct platform_device exynos_device_drm = {

	.name	= "exynos-drm",

	.dev	= {

		.dma_mask		= &exynos_drm_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};

arch/arm/mach-exynos/mach-nuri.c

+0 −3
Original line number Diff line number Diff line
@@ -1327,9 +1327,6 @@ static struct platform_device *nuri_devices[] __initdata = { 
	&cam_vdda_fixed_rdev,

	&cam_8m_12v_fixed_rdev,

	&exynos4_bus_devfreq,

#ifdef CONFIG_DRM_EXYNOS

	&exynos_device_drm,

#endif

};



static void __init nuri_map_io(void)

arch/arm/mach-exynos/mach-origen.c

+0 −3
Original line number Diff line number Diff line
@@ -709,9 +709,6 @@ static struct platform_device *origen_devices[] __initdata = { 
	&s5p_device_mfc_l,

	&s5p_device_mfc_r,

	&s5p_device_mixer,

#ifdef CONFIG_DRM_EXYNOS

	&exynos_device_drm,

#endif

	&exynos4_device_ohci,

	&origen_device_gpiokeys,

	&origen_lcd_hv070wsa,

arch/arm/mach-exynos/mach-smdk4x12.c

+0 −3
Original line number Diff line number Diff line
@@ -317,9 +317,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = { 
	&s5p_device_mfc,

	&s5p_device_mfc_l,

	&s5p_device_mfc_r,

#ifdef CONFIG_DRM_EXYNOS

	&exynos_device_drm,

#endif

	&samsung_device_keypad,

};