Commit 6251c156 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-cleanup' of... 

Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim:
Samsung Cleanup for v3.13
- remove unnecessary config options and header inclusions
- use CONFIG_ARCH_S3C64XX instead of PLAT_S3C64XX

* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options
  ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file
  ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX
  ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
  s3c-camif: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
  gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support
  ARM: S3C64XX: Move if ARCH_S3C64XX statement into mach-s3c64xx

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 76df26b5 ae3c5d74

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -731,11 +731,13 @@ config ARCH_S3C64XX 
	select NEED_MACH_GPIO_H

	select NO_IOPORT

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_CLKSRC

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WDT_RESET

	select USB_ARCH_HAS_OHCI

	help
@@ -983,9 +985,7 @@ source "arch/arm/mach-sti/Kconfig" 


source "arch/arm/mach-s3c24xx/Kconfig"



if ARCH_S3C64XX

source "arch/arm/mach-s3c64xx/Kconfig"

endif



source "arch/arm/mach-s5p64x0/Kconfig"

arch/arm/mach-exynos/Kconfig

+9 −29
Original line number Diff line number Diff line
@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" 
config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	default y

	select ARM_AMBA

	select CLKSRC_OF

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select GIC_NON_BANKED

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select PINCTRL

	select S5P_DEV_MFC

	help

	  Samsung EXYNOS4 SoCs based systems



config ARCH_EXYNOS5

	bool "SAMSUNG EXYNOS5"

	select ARM_AMBA

	select CLKSRC_OF

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select PINCTRL

	select USB_ARCH_HAS_XHCI

	help

	  Samsung EXYNOS5 (Cortex-A15) SoC based systems
@@ -110,35 +119,6 @@ config SOC_EXYNOS5440 
	help

	  Enable EXYNOS5440 SoC support



comment "Flattened Device Tree based board for EXYNOS SoCs"



config MACH_EXYNOS4_DT

	bool "Samsung Exynos4 Machine using device tree"

	default y

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select CLKSRC_OF

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select S5P_DEV_MFC

	help

	  Machine support for Samsung Exynos4 machine with device tree enabled.

	  Select this if a fdt blob is available for the Exynos4 SoC based board.

	  Note: This is under development and not all peripherals can be supported

	  with this machine file.



config MACH_EXYNOS5_DT

	bool "SAMSUNG EXYNOS5 Machine using device tree"

	default y

	depends on ARCH_EXYNOS5

	select ARM_AMBA

	select CLKSRC_OF

	select USB_ARCH_HAS_XHCI

	help

	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.



endmenu



endif

arch/arm/mach-exynos/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) 


# machine support



obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o

obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 
obj-$(CONFIG_ARCH_EXYNOS4)	+= mach-exynos4-dt.o

obj-$(CONFIG_ARCH_EXYNOS5)	+= mach-exynos5-dt.o

arch/arm/mach-exynos/mach-exynos4-dt.c

+0 −3
Original line number Diff line number Diff line
@@ -11,11 +11,8 @@ 
 * published by the Free Software Foundation.

*/



#include <linux/kernel.h>

#include <linux/of_platform.h>

#include <linux/of_fdt.h>

#include <linux/serial_core.h>

#include <linux/memblock.h>



#include <asm/mach/arch.h>

#include <plat/mfc.h>

arch/arm/mach-exynos/mach-exynos5-dt.c

+0 −3
Original line number Diff line number Diff line
@@ -11,13 +11,10 @@ 


#include <linux/of_platform.h>

#include <linux/of_fdt.h>

#include <linux/memblock.h>

#include <linux/io.h>



#include <asm/mach/arch.h>

#include <mach/regs-pmu.h>



#include <plat/cpu.h>

#include <plat/mfc.h>



#include "common.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE