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

Commit 4909e13c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'cleanup-samsung-for-v3.10' of... 

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

From Kukjin Kim <kgene.kim@samsung.com>:

cleanup unused codes for samsung

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

:
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ARM: S3C64XX: remove obsolete Makefile line
  ARM: S3C24XX: remove unneeded "config SMDK2440_CPU2442"
  ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIG
  ARM: SAMSUNG: remove "config S3C_BOOT_WATCHDOG"
  ARM: EXYNOS: change HAVE_SAMSUNG_KEYPAD to KEYBOARD_SAMSUNG
  ARM: EXYNOS: remove duplicated include from common.c
  ARM: EXYNOS: drop "select HAVE_SCHED_CLOCK"
  ARM: S3C24XX: drop "select MACH_NEO1973"
  ARM: S3C24XX: drop "select MACH_N35"

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 92202876 fe72e273

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -1175,7 +1175,6 @@ config PLAT_VERSATILE 
config ARM_TIMER_SP804

config ARM_TIMER_SP804

	bool

	bool

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK





source arch/arm/mm/Kconfig

source arch/arm/mm/Kconfig

arch/arm/mach-exynos/Kconfig

+1 −12
Original line number Original line Diff line number Diff line
@@ -95,11 +95,6 @@ config EXYNOS4_DEV_AHCI 
	help

	help

	  Compile in platform device definitions for AHCI

	  Compile in platform device definitions for AHCI





config EXYNOS_DEV_DRM

	bool

	help

	  Compile in platform device definitions for core DRM device



config EXYNOS4_SETUP_FIMD0

config EXYNOS4_SETUP_FIMD0

	bool

	bool

	help

	help
@@ -199,7 +194,6 @@ config MACH_SMDKV310 
	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C24XX_PWM

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC
@@ -253,9 +247,7 @@ config MACH_UNIVERSAL_C210 
	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select HAVE_SCHED_CLOCK

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_HSMMC3
@@ -294,7 +286,6 @@ config MACH_NURI 
	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_HSMMC3
@@ -330,7 +321,6 @@ config MACH_ORIGEN 
	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C24XX_PWM

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC
@@ -366,7 +356,6 @@ config MACH_SMDK4212 
	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C24XX_PWM

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC2
@@ -407,7 +396,7 @@ config MACH_EXYNOS4_DT 
	depends on ARCH_EXYNOS4

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select ARM_AMBA

	select CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select PINCTRL

	select PINCTRL

	select PINCTRL_EXYNOS

	select PINCTRL_EXYNOS

	select USE_OF

	select USE_OF

arch/arm/mach-exynos/common.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/export.h>

#include <linux/export.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/chained_irq.h>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 




#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/platform_data/usb-exynos.h>

#include <linux/platform_data/usb-ohci-exynos.h>





#include <mach/irqs.h>

#include <mach/irqs.h>

#include <mach/map.h>

#include <mach/map.h>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/platform_data/i2c-s3c2410.h>

#include <linux/platform_data/i2c-s3c2410.h>

#include <linux/platform_data/s3c-hsotg.h>

#include <linux/platform_data/s3c-hsotg.h>

#include <linux/platform_data/usb-ehci-s5p.h>

#include <linux/platform_data/usb-ehci-s5p.h>

#include <linux/platform_data/usb-exynos.h>

#include <linux/platform_data/usb-ohci-exynos.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>