aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2014-05-30 13:36:49 -0400
committerKukjin Kim <kgene.kim@samsung.com>2014-05-30 13:36:49 -0400
commitfced6dee29f6fb143fe16ea90331176ff77e6120 (patch)
tree5b6e57e7a757adc2a6518ce291a4d2914397b917 /arch/arm/mach-s3c24xx
parentbfed1074f213051e94648bfad0d0611a16d81366 (diff)
parentbe1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff)
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig28
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/debug-macro.S101
2 files changed, 0 insertions, 129 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 1e52b6926374..04284de7aca5 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -28,7 +28,6 @@ config CPU_S3C2410
28 bool "SAMSUNG S3C2410" 28 bool "SAMSUNG S3C2410"
29 default y 29 default y
30 select CPU_ARM920T 30 select CPU_ARM920T
31 select CPU_LLSERIAL_S3C2410
32 select S3C2410_COMMON_CLK 31 select S3C2410_COMMON_CLK
33 select S3C2410_DMA if S3C24XX_DMA 32 select S3C2410_DMA if S3C24XX_DMA
34 select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ 33 select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
@@ -41,7 +40,6 @@ config CPU_S3C2410
41config CPU_S3C2412 40config CPU_S3C2412
42 bool "SAMSUNG S3C2412" 41 bool "SAMSUNG S3C2412"
43 select CPU_ARM926T 42 select CPU_ARM926T
44 select CPU_LLSERIAL_S3C2440
45 select S3C2412_COMMON_CLK 43 select S3C2412_COMMON_CLK
46 select S3C2412_DMA if S3C24XX_DMA 44 select S3C2412_DMA if S3C24XX_DMA
47 select S3C2412_PM if PM 45 select S3C2412_PM if PM
@@ -51,7 +49,6 @@ config CPU_S3C2412
51config CPU_S3C2416 49config CPU_S3C2416
52 bool "SAMSUNG S3C2416/S3C2450" 50 bool "SAMSUNG S3C2416/S3C2450"
53 select CPU_ARM926T 51 select CPU_ARM926T
54 select CPU_LLSERIAL_S3C2440
55 select S3C2416_PM if PM 52 select S3C2416_PM if PM
56 select S3C2443_COMMON_CLK 53 select S3C2443_COMMON_CLK
57 select S3C2443_DMA if S3C24XX_DMA 54 select S3C2443_DMA if S3C24XX_DMA
@@ -61,7 +58,6 @@ config CPU_S3C2416
61config CPU_S3C2440 58config CPU_S3C2440
62 bool "SAMSUNG S3C2440" 59 bool "SAMSUNG S3C2440"
63 select CPU_ARM920T 60 select CPU_ARM920T
64 select CPU_LLSERIAL_S3C2440
65 select S3C2410_COMMON_CLK 61 select S3C2410_COMMON_CLK
66 select S3C2410_PM if PM 62 select S3C2410_PM if PM
67 select S3C2440_DMA if S3C24XX_DMA 63 select S3C2440_DMA if S3C24XX_DMA
@@ -71,7 +67,6 @@ config CPU_S3C2440
71config CPU_S3C2442 67config CPU_S3C2442
72 bool "SAMSUNG S3C2442" 68 bool "SAMSUNG S3C2442"
73 select CPU_ARM920T 69 select CPU_ARM920T
74 select CPU_LLSERIAL_S3C2440
75 select S3C2410_COMMON_CLK 70 select S3C2410_COMMON_CLK
76 select S3C2410_DMA if S3C24XX_DMA 71 select S3C2410_DMA if S3C24XX_DMA
77 select S3C2410_PM if PM 72 select S3C2410_PM if PM
@@ -86,7 +81,6 @@ config CPU_S3C244X
86config CPU_S3C2443 81config CPU_S3C2443
87 bool "SAMSUNG S3C2443" 82 bool "SAMSUNG S3C2443"
88 select CPU_ARM920T 83 select CPU_ARM920T
89 select CPU_LLSERIAL_S3C2440
90 select S3C2443_COMMON_CLK 84 select S3C2443_COMMON_CLK
91 select S3C2443_DMA if S3C24XX_DMA 85 select S3C2443_DMA if S3C24XX_DMA
92 help 86 help
@@ -148,28 +142,6 @@ config S3C2410_PM
148 help 142 help
149 Power Management code common to S3C2410 and better 143 Power Management code common to S3C2410 and better
150 144
151# low-level serial option nodes
152
153config CPU_LLSERIAL_S3C2410_ONLY
154 bool
155 default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
156
157config CPU_LLSERIAL_S3C2440_ONLY
158 bool
159 default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
160
161config CPU_LLSERIAL_S3C2410
162 bool
163 help
164 Selected if there is an S3C2410 (or register compatible) serial
165 low-level implementation needed
166
167config CPU_LLSERIAL_S3C2440
168 bool
169 help
170 Selected if there is an S3C2440 (or register compatible) serial
171 low-level implementation needed
172
173config S3C24XX_PLL 145config S3C24XX_PLL
174 bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" 146 bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
175 depends on ARM_S3C24XX_CPUFREQ 147 depends on ARM_S3C24XX_CPUFREQ
diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
deleted file mode 100644
index 2f39737544c0..000000000000
--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,101 +0,0 @@
1/* arch/arm/mach-s3c2410/include/mach/debug-macro.S
2 *
3 * Debugging macro include header
4 *
5 * Copyright (C) 1994-1999 Russell King
6 * Copyright (C) 2005 Simtec Electronics
7 *
8 * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation.
13*/
14
15#include <mach/map.h>
16#include <mach/regs-gpio.h>
17#include <linux/serial_s3c.h>
18
19#define S3C2410_UART1_OFF (0x4000)
20#define SHIFT_2440TXF (14-9)
21
22 .macro addruart, rp, rv, tmp
23 ldr \rp, = S3C24XX_PA_UART
24 ldr \rv, = S3C24XX_VA_UART
25#if CONFIG_DEBUG_S3C_UART != 0
26 add \rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
27 add \rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
28#endif
29 .endm
30
31 .macro fifo_full_s3c24xx rd, rx
32 @ check for arm920 vs arm926. currently assume all arm926
33 @ devices have an 64 byte FIFO identical to the s3c2440
34 mrc p15, 0, \rd, c0, c0
35 and \rd, \rd, #0xff0
36 teq \rd, #0x260
37 beq 1004f
38 mrc p15, 0, \rd, c1, c0
39 tst \rd, #1
40 addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
41 addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
42 bic \rd, \rd, #0xff000
43 ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
44 and \rd, \rd, #0x00ff0000
45 teq \rd, #0x00440000 @ is it 2440?
461004:
47 ldr \rd, [\rx, # S3C2410_UFSTAT]
48 moveq \rd, \rd, lsr #SHIFT_2440TXF
49 tst \rd, #S3C2410_UFSTAT_TXFULL
50 .endm
51
52 .macro fifo_full_s3c2410 rd, rx
53 ldr \rd, [\rx, # S3C2410_UFSTAT]
54 tst \rd, #S3C2410_UFSTAT_TXFULL
55 .endm
56
57/* fifo level reading */
58
59 .macro fifo_level_s3c24xx rd, rx
60 @ check for arm920 vs arm926. currently assume all arm926
61 @ devices have an 64 byte FIFO identical to the s3c2440
62 mrc p15, 0, \rd, c0, c0
63 and \rd, \rd, #0xff0
64 teq \rd, #0x260
65 beq 10000f
66 mrc p15, 0, \rd, c1, c0
67 tst \rd, #1
68 addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
69 addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
70 bic \rd, \rd, #0xff000
71 ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
72 and \rd, \rd, #0x00ff0000
73 teq \rd, #0x00440000 @ is it 2440?
74
7510000:
76 ldr \rd, [\rx, # S3C2410_UFSTAT]
77 andne \rd, \rd, #S3C2410_UFSTAT_TXMASK
78 andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK
79 .endm
80
81 .macro fifo_level_s3c2410 rd, rx
82 ldr \rd, [\rx, # S3C2410_UFSTAT]
83 and \rd, \rd, #S3C2410_UFSTAT_TXMASK
84 .endm
85
86/* Select the correct implementation depending on the configuration. The
87 * S3C2440 will get selected by default, as these are the most widely
88 * used variants of these
89*/
90
91#if defined(CONFIG_CPU_LLSERIAL_S3C2410_ONLY)
92#define fifo_full fifo_full_s3c2410
93#define fifo_level fifo_level_s3c2410
94#elif !defined(CONFIG_CPU_LLSERIAL_S3C2440_ONLY)
95#define fifo_full fifo_full_s3c24xx
96#define fifo_level fifo_level_s3c24xx
97#endif
98
99/* include the reset of the code which will do the work */
100
101#include <debug/samsung.S>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 11:32:05 -0500