diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:31:57 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:31:57 -0400 |
commit | 4909e13cd9d864f95f63d2d16489778fff483460 (patch) | |
tree | 2e6693a64f3955e40fcc92b674be3ec20753eb15 /arch/arm/plat-samsung | |
parent | 92202876a3cc6b7fb0bbb52a5059e02c2c2e2186 (diff) | |
parent | fe72e27368265a99f6a0a189a5d593aac320a59d (diff) |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 14 | ||||
-rw-r--r-- | arch/arm/plat-samsung/dma-ops.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/rtc-core.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 4 |
6 files changed, 4 insertions, 28 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index a9d52167e16e..91c2d72e689b 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -37,14 +37,6 @@ if PLAT_SAMSUNG | |||
37 | 37 | ||
38 | comment "Boot options" | 38 | comment "Boot options" |
39 | 39 | ||
40 | config S3C_BOOT_WATCHDOG | ||
41 | bool "S3C Initialisation watchdog" | ||
42 | depends on S3C2410_WATCHDOG | ||
43 | help | ||
44 | Say y to enable the watchdog during the kernel decompression | ||
45 | stage. If the kernel fails to uncompress, then the watchdog | ||
46 | will trigger a reset and the system should restart. | ||
47 | |||
48 | config S3C_BOOT_ERROR_RESET | 40 | config S3C_BOOT_ERROR_RESET |
49 | bool "S3C Reboot on decompression error" | 41 | bool "S3C Reboot on decompression error" |
50 | help | 42 | help |
@@ -125,12 +117,6 @@ config SAMSUNG_GPIOLIB_4BIT | |||
125 | configuration. GPIOlib shall be compiled only for S3C64XX and S5P | 117 | configuration. GPIOlib shall be compiled only for S3C64XX and S5P |
126 | series of processors. | 118 | series of processors. |
127 | 119 | ||
128 | config S3C_GPIO_CFG_S3C64XX | ||
129 | bool | ||
130 | help | ||
131 | Internal configuration to enable S3C64XX style GPIO configuration | ||
132 | functions. | ||
133 | |||
134 | config S5P_GPIO_DRVSTR | 120 | config S5P_GPIO_DRVSTR |
135 | bool | 121 | bool |
136 | help | 122 | help |
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 71d58ddea9c1..ec0d731b0e7b 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c | |||
@@ -23,23 +23,15 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch, | |||
23 | struct device *dev, char *ch_name) | 23 | struct device *dev, char *ch_name) |
24 | { | 24 | { |
25 | dma_cap_mask_t mask; | 25 | dma_cap_mask_t mask; |
26 | void *filter_param; | ||
27 | 26 | ||
28 | dma_cap_zero(mask); | 27 | dma_cap_zero(mask); |
29 | dma_cap_set(param->cap, mask); | 28 | dma_cap_set(param->cap, mask); |
30 | 29 | ||
31 | /* | ||
32 | * If a dma channel property of a device node from device tree is | ||
33 | * specified, use that as the fliter parameter. | ||
34 | */ | ||
35 | filter_param = (dma_ch == DMACH_DT_PROP) ? | ||
36 | (void *)param->dt_dmach_prop : (void *)dma_ch; | ||
37 | |||
38 | if (dev->of_node) | 30 | if (dev->of_node) |
39 | return (unsigned)dma_request_slave_channel(dev, ch_name); | 31 | return (unsigned)dma_request_slave_channel(dev, ch_name); |
40 | else | 32 | else |
41 | return (unsigned)dma_request_channel(mask, pl330_filter, | 33 | return (unsigned)dma_request_channel(mask, pl330_filter, |
42 | filter_param); | 34 | (void *)dma_ch); |
43 | } | 35 | } |
44 | 36 | ||
45 | static int samsung_dmadev_release(unsigned ch, void *param) | 37 | static int samsung_dmadev_release(unsigned ch, void *param) |
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index 114178268b75..ce6d7634b6cb 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | struct samsung_dma_req { | 19 | struct samsung_dma_req { |
20 | enum dma_transaction_type cap; | 20 | enum dma_transaction_type cap; |
21 | struct property *dt_dmach_prop; | ||
22 | struct s3c2410_dma_client *client; | 21 | struct s3c2410_dma_client *client; |
23 | }; | 22 | }; |
24 | 23 | ||
diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index d384a8016b47..abe07fae71db 100644 --- a/arch/arm/plat-samsung/include/plat/dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h | |||
@@ -21,7 +21,6 @@ | |||
21 | * use these just as IDs. | 21 | * use these just as IDs. |
22 | */ | 22 | */ |
23 | enum dma_ch { | 23 | enum dma_ch { |
24 | DMACH_DT_PROP = -1, | ||
25 | DMACH_UART0_RX = 0, | 24 | DMACH_UART0_RX = 0, |
26 | DMACH_UART0_TX, | 25 | DMACH_UART0_TX, |
27 | DMACH_UART1_RX, | 26 | DMACH_UART1_RX, |
diff --git a/arch/arm/plat-samsung/include/plat/rtc-core.h b/arch/arm/plat-samsung/include/plat/rtc-core.h index 21d8594d37ca..7b542f7b7938 100644 --- a/arch/arm/plat-samsung/include/plat/rtc-core.h +++ b/arch/arm/plat-samsung/include/plat/rtc-core.h | |||
@@ -19,7 +19,7 @@ | |||
19 | /* re-define device name depending on support. */ | 19 | /* re-define device name depending on support. */ |
20 | static inline void s3c_rtc_setname(char *name) | 20 | static inline void s3c_rtc_setname(char *name) |
21 | { | 21 | { |
22 | #if defined(CONFIG_SAMSUNG_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX) | 22 | #if defined(CONFIG_S3C_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX) |
23 | s3c_device_rtc.name = name; | 23 | s3c_device_rtc.name = name; |
24 | #endif | 24 | #endif |
25 | } | 25 | } |
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index 9b87f38fc4f4..5560586abec0 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h | |||
@@ -206,7 +206,7 @@ static inline void s3c6400_default_sdhci2(void) { } | |||
206 | 206 | ||
207 | /* S5P64X0 SDHCI setup */ | 207 | /* S5P64X0 SDHCI setup */ |
208 | 208 | ||
209 | #ifdef CONFIG_S5P64X0_SETUP_SDHCI | 209 | #ifdef CONFIG_S5P64X0_SETUP_SDHCI_GPIO |
210 | static inline void s5p64x0_default_sdhci0(void) | 210 | static inline void s5p64x0_default_sdhci0(void) |
211 | { | 211 | { |
212 | #ifdef CONFIG_S3C_DEV_HSMMC | 212 | #ifdef CONFIG_S3C_DEV_HSMMC |
@@ -241,7 +241,7 @@ static inline void s5p64x0_default_sdhci1(void) { } | |||
241 | static inline void s5p6440_default_sdhci2(void) { } | 241 | static inline void s5p6440_default_sdhci2(void) { } |
242 | static inline void s5p6450_default_sdhci2(void) { } | 242 | static inline void s5p6450_default_sdhci2(void) { } |
243 | 243 | ||
244 | #endif /* CONFIG_S5P64X0_SETUP_SDHCI */ | 244 | #endif /* CONFIG_S5P64X0_SETUP_SDHCI_GPIO */ |
245 | 245 | ||
246 | /* S5PC100 SDHCI setup */ | 246 | /* S5PC100 SDHCI setup */ |
247 | 247 | ||