Skip to content

Commit

Permalink
ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
Browse files Browse the repository at this point in the history
Signed-off-by: Kukjin Kim <[email protected]>
  • Loading branch information
kgene committed May 12, 2012
1 parent cfe370f commit d9c452f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
10 changes: 0 additions & 10 deletions arch/arm/plat-s5p/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 0 additions & 5 deletions arch/arm/plat-s5p/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions arch/arm/plat-samsung/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,23 @@ 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
help
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
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/plat-samsung/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* linux/arch/arm/plat-s5p/dev-mfc.c
*
/*
* Copyright (C) 2010-2011 Samsung Electronics Co.Ltd
*
* Base S5P MFC resource and device definitions
Expand All @@ -9,7 +8,6 @@
* published by the Free Software Foundation.
*/


#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
Expand Down
File renamed without changes.

0 comments on commit d9c452f

Please sign in to comment.