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

Commit d9c452f4 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung 



Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent cfe370f8

arch/arm/plat-s5p/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ config S5P_DEV_I2C_HDMIPHY 
	help

	  Compile in platform device definitions for I2C HDMIPHY controller



config S5P_DEV_MFC

	bool

	help

	  Compile in platform device definitions for MFC



config S5P_DEV_ONENAND

	bool

	help
@@ -92,8 +87,3 @@ config S5P_DEV_USB_EHCI 
	bool

	help

	  Compile in platform device definition for USB EHCI
 


config S5P_SETUP_MIPIPHY

	bool

	help

	  Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices

arch/arm/plat-s5p/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -9,8 +9,3 @@ obj-y := 
obj-m				:=

obj-n				:= dummy.o

obj-				:=
 


# devices



obj-$(CONFIG_S5P_DEV_MFC)	+= dev-mfc.o

obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o

arch/arm/plat-samsung/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -309,6 +309,11 @@ config SAMSUNG_DEV_BACKLIGHT 
	help

	  Compile in platform device definition LCD backlight with PWM Timer



config S5P_DEV_MFC

	bool

	help

	  Compile in setup memory (init) code for MFC



config S3C24XX_PWM

	bool "PWM device support"

	select HAVE_PWM
@@ -316,6 +321,11 @@ config S3C24XX_PWM 
	  Support for exporting the PWM timer blocks via the pwm device

	  system



config S5P_SETUP_MIPIPHY

	bool

	help

	  Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices



# DMA



config S3C_DMA

arch/arm/plat-samsung/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -36,10 +36,13 @@ obj-y += platformdata.o 


obj-y				+= devs.o

obj-y				+= dev-uart.o

obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o

obj-$(CONFIG_S5P_DEV_UART)	+= s5p-dev-uart.o



obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o



obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o



# DMA support



obj-$(CONFIG_S3C_DMA)		+= dma.o s3c-dma-ops.o

arch/arm/plat-s5p/dev-mfc.c→arch/arm/plat-samsung/s5p-dev-mfc.c

+1 −3
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s5p/dev-mfc.c

 *

/*

 * Copyright (C) 2010-2011 Samsung Electronics Co.Ltd

 *

 * Base S5P MFC resource and device definitions
@@ -9,7 +8,6 @@ 
 * published by the Free Software Foundation.

 */





#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>