diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 23 | ||||
-rw-r--r-- | arch/arm/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 36 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/Makefile | 7 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/Makefile.boot | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/cpu.c | 2 |
7 files changed, 24 insertions, 51 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c0c1c3f83679..756711f3095c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -758,26 +758,6 @@ config ARCH_S3C64XX | |||
758 | help | 758 | help |
759 | Samsung S3C64XX series based systems | 759 | Samsung S3C64XX series based systems |
760 | 760 | ||
761 | config ARCH_S5PV210 | ||
762 | bool "Samsung S5PV210/S5PC110" | ||
763 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
764 | select ARCH_SPARSEMEM_ENABLE | ||
765 | select ATAGS | ||
766 | select CLKDEV_LOOKUP | ||
767 | select CLKSRC_SAMSUNG_PWM | ||
768 | select COMMON_CLK_SAMSUNG | ||
769 | select CPU_V7 | ||
770 | select GENERIC_CLOCKEVENTS | ||
771 | select GPIO_SAMSUNG | ||
772 | select HAVE_S3C2410_I2C if I2C | ||
773 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
774 | select HAVE_S3C_RTC if RTC_CLASS | ||
775 | select NEED_MACH_GPIO_H | ||
776 | select NEED_MACH_MEMORY_H | ||
777 | select SAMSUNG_ATAGS | ||
778 | help | ||
779 | Samsung S5PV210/S5PC110 series based systems | ||
780 | |||
781 | config ARCH_DAVINCI | 761 | config ARCH_DAVINCI |
782 | bool "TI DaVinci" | 762 | bool "TI DaVinci" |
783 | select ARCH_HAS_HOLES_MEMORYMODEL | 763 | select ARCH_HAS_HOLES_MEMORYMODEL |
@@ -1515,7 +1495,8 @@ config ARM_PSCI | |||
1515 | config ARCH_NR_GPIO | 1495 | config ARCH_NR_GPIO |
1516 | int | 1496 | int |
1517 | default 1024 if ARCH_SHMOBILE || ARCH_TEGRA | 1497 | default 1024 if ARCH_SHMOBILE || ARCH_TEGRA |
1518 | default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX | 1498 | default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \ |
1499 | SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 | ||
1519 | default 416 if ARCH_SUNXI | 1500 | default 416 if ARCH_SUNXI |
1520 | default 392 if ARCH_U8500 | 1501 | default 392 if ARCH_U8500 |
1521 | default 352 if ARCH_VT8500 | 1502 | default 352 if ARCH_VT8500 |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d3f470c2201b..c13306143493 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -210,11 +210,11 @@ machine-$(CONFIG_PLAT_SPEAR) += spear | |||
210 | plat-$(CONFIG_ARCH_EXYNOS) += samsung | 210 | plat-$(CONFIG_ARCH_EXYNOS) += samsung |
211 | plat-$(CONFIG_ARCH_OMAP) += omap | 211 | plat-$(CONFIG_ARCH_OMAP) += omap |
212 | plat-$(CONFIG_ARCH_S3C64XX) += samsung | 212 | plat-$(CONFIG_ARCH_S3C64XX) += samsung |
213 | plat-$(CONFIG_ARCH_S5PV210) += samsung | ||
213 | plat-$(CONFIG_PLAT_IOP) += iop | 214 | plat-$(CONFIG_PLAT_IOP) += iop |
214 | plat-$(CONFIG_PLAT_ORION) += orion | 215 | plat-$(CONFIG_PLAT_ORION) += orion |
215 | plat-$(CONFIG_PLAT_PXA) += pxa | 216 | plat-$(CONFIG_PLAT_PXA) += pxa |
216 | plat-$(CONFIG_PLAT_S3C24XX) += samsung | 217 | plat-$(CONFIG_PLAT_S3C24XX) += samsung |
217 | plat-$(CONFIG_PLAT_S5P) += samsung | ||
218 | plat-$(CONFIG_PLAT_VERSATILE) += versatile | 218 | plat-$(CONFIG_PLAT_VERSATILE) += versatile |
219 | 219 | ||
220 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 220 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
@@ -238,7 +238,7 @@ MACHINE := | |||
238 | endif | 238 | endif |
239 | 239 | ||
240 | machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) | 240 | machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) |
241 | platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) | 241 | platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) |
242 | 242 | ||
243 | ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) | 243 | ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) |
244 | ifeq ($(KBUILD_SRC),) | 244 | ifeq ($(KBUILD_SRC),) |
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index ffc777dfa8a0..330bfc8fcd52 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -7,32 +7,28 @@ | |||
7 | 7 | ||
8 | # Configuration options for the S5PV210/S5PC110 | 8 | # Configuration options for the S5PV210/S5PC110 |
9 | 9 | ||
10 | config ARCH_S5PV210 | ||
11 | bool "Samsung S5PV210/S5PC110" if ARCH_MULTI_V7 | ||
12 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
13 | select ARCH_REQUIRE_GPIOLIB | ||
14 | select ARM_VIC | ||
15 | select CLKSRC_SAMSUNG_PWM | ||
16 | select COMMON_CLK_SAMSUNG | ||
17 | select HAVE_S3C2410_I2C if I2C | ||
18 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
19 | select HAVE_S3C_RTC if RTC_CLASS | ||
20 | select PINCTRL | ||
21 | select PINCTRL_EXYNOS | ||
22 | help | ||
23 | Samsung S5PV210/S5PC110 series based systems | ||
24 | |||
10 | if ARCH_S5PV210 | 25 | if ARCH_S5PV210 |
11 | 26 | ||
12 | config CPU_S5PV210 | 27 | config CPU_S5PV210 |
13 | bool | 28 | def_bool y |
14 | select ARM_AMBA | 29 | select ARM_AMBA |
15 | select PL330_DMA if DMADEVICES | 30 | select PL330_DMA if DMADEVICES |
16 | select S5P_EXT_INT | ||
17 | help | 31 | help |
18 | Enable S5PV210 CPU support | 32 | Enable S5PV210 CPU support |
19 | 33 | ||
20 | menu "S5PV210 Machines" | ||
21 | |||
22 | config MACH_S5PV210_DT | ||
23 | bool "Samsung S5PV210/S5PC110 machine using Device Tree" | ||
24 | select CLKSRC_OF | ||
25 | select CPU_S5PV210 | ||
26 | select PINCTRL | ||
27 | select PINCTRL_EXYNOS | ||
28 | select USE_OF | ||
29 | help | ||
30 | Machine support for Samsung S5PV210/S5PC110 machines with Device Tree | ||
31 | enabled. | ||
32 | Select this if a fdt blob is available for your S5PV210 SoC based | ||
33 | board. | ||
34 | Note: This is under development and not all peripherals can be | ||
35 | supported with this machine file. | ||
36 | endmenu | ||
37 | |||
38 | endif | 34 | endif |
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 5308225dfdee..7dc2d0e25a83 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile | |||
@@ -5,6 +5,8 @@ | |||
5 | # | 5 | # |
6 | # Licensed under GPLv2 | 6 | # Licensed under GPLv2 |
7 | 7 | ||
8 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include | ||
9 | |||
8 | obj-y := | 10 | obj-y := |
9 | obj-m := | 11 | obj-m := |
10 | obj-n := | 12 | obj-n := |
@@ -16,7 +18,4 @@ obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o | |||
16 | 18 | ||
17 | # machine support | 19 | # machine support |
18 | 20 | ||
19 | obj-$(CONFIG_MACH_S5PV210_DT) += s5pv210.o | 21 | obj-y += s5pv210.o |
20 | # device support | ||
21 | |||
22 | obj-y += setup-i2c0.o | ||
diff --git a/arch/arm/mach-s5pv210/Makefile.boot b/arch/arm/mach-s5pv210/Makefile.boot deleted file mode 100644 index 79ece4055b02..000000000000 --- a/arch/arm/mach-s5pv210/Makefile.boot +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | zreladdr-y += 0x20008000 | ||
2 | params_phys-y := 0x20000100 | ||
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 906f54b11225..97fc15ecc4ae 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -5,7 +5,6 @@ | |||
5 | # Licensed under GPLv2 | 5 | # Licensed under GPLv2 |
6 | 6 | ||
7 | ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include | 7 | ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include |
8 | ccflags-$(CONFIG_ARCH_EXYNOS) += -I$(srctree)/arch/arm/mach-exynos/include | ||
9 | 8 | ||
10 | obj-y := | 9 | obj-y := |
11 | obj-m := | 10 | obj-m := |
diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c index 364963a0a344..945fc3f5b7a2 100644 --- a/arch/arm/plat-samsung/cpu.c +++ b/arch/arm/plat-samsung/cpu.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | 17 | ||
18 | 18 | ||
19 | #include <mach/map.h> | 19 | #include <plat/map-base.h> |
20 | #include <plat/cpu.h> | 20 | #include <plat/cpu.h> |
21 | 21 | ||
22 | unsigned long samsung_cpu_id; | 22 | unsigned long samsung_cpu_id; |