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

Commit 7dcbeef7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-s3c24xx' of... 

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

From Kukjin Kim:
Basically, this patch merges mach-s3c2410, mach-s3c2412 and mach-s3c2440
into mach-s3c24xx.

* 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: Move mach-s3c2440/ pll into mach-s3c24xx/
  ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/
  ARM: S3C24XX: Move mach-s3c2412/ cpufreq driver into mach-s3c24xx/
  ARM: S3C2412: Remove useless codes mach-s3c2412/gpio.c
  ARM: S3C24XX: Move mach-s3c2410/ pll into mach-s3c24xx/
  ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/
parents f0390669 acf2d41d

arch/arm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1086,10 +1086,6 @@ source "arch/arm/mach-socfpga/Kconfig" 
source "arch/arm/plat-spear/Kconfig"



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

if ARCH_S3C24XX

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

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

endif



if ARCH_S3C64XX

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

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2 
machine-$(CONFIG_ARCH_PXA)		+= pxa

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_RPC)		+= rpc

machine-$(CONFIG_ARCH_S3C24XX)		+= s3c24xx s3c2412 s3c2440

machine-$(CONFIG_ARCH_S3C24XX)		+= s3c24xx

machine-$(CONFIG_ARCH_S3C64XX)		+= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		+= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		+= s5pc100

arch/arm/mach-s3c2410/Kconfig

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



# cpu frequency scaling support



config S3C2410_CPUFREQ

	bool

	depends on CPU_FREQ_S3C24XX && CPU_S3C2410

	select S3C2410_CPUFREQ_UTILS

	help

	  CPU Frequency scaling support for S3C2410



config S3C2410_PLLTABLE

	bool

	depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL

	default y

	help

	  Select the PLL table for the S3C2410

arch/arm/mach-s3c2410/Makefile

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# arch/arm/mach-s3c2410/Makefile

#

# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



obj-$(CONFIG_S3C2410_CPUFREQ)	+= cpu-freq.o

obj-$(CONFIG_S3C2410_PLLTABLE)	+= pll.o

arch/arm/mach-s3c2412/Kconfig

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
# Copyright 2007 Simtec Electronics

#

# Licensed under GPLv2



# Note, the S3C2412 IOtiming support is in plat-s3c24xx



config S3C2412_CPUFREQ

	bool

	depends on CPU_FREQ_S3C24XX && CPU_S3C2412

	default y

	select S3C2412_IOTIMING

	help

	  CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.