aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-07-07 07:32:16 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-25 12:11:05 -0400
commit5c972af407419c79e1e922fb241fa0d06b4f1ffd (patch)
treede278f0e6111103cbc6efdad8250e2dbc443f15f /arch
parent0b4cccbec60678212eccdb42dc1e1c233ddf7092 (diff)
ARM: debug: provide PL01x debug uart phys/virt address configuration options
Move the definition of the UART register addresses out of the platform specific header files into the Kconfig files. Acked-by: Ryan Mallon <rmallon@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig.debug54
-rw-r--r--arch/arm/include/asm/hardware/debug-pl01x.S7
-rw-r--r--arch/arm/include/debug/bcm2835.S9
-rw-r--r--arch/arm/include/debug/cns3xxx.S7
-rw-r--r--arch/arm/include/debug/highbank.S6
-rw-r--r--arch/arm/include/debug/mxs.S14
-rw-r--r--arch/arm/include/debug/nomadik.S8
-rw-r--r--arch/arm/include/debug/nspire.S10
-rw-r--r--arch/arm/include/debug/u300.S11
-rw-r--r--arch/arm/include/debug/vexpress.S46
-rw-r--r--arch/arm/mach-ep93xx/include/mach/debug-macro.S9
-rw-r--r--arch/arm/mach-integrator/include/mach/debug-macro.S7
-rw-r--r--arch/arm/mach-realview/include/mach/debug-macro.S17
-rw-r--r--arch/arm/mach-versatile/include/mach/debug-macro.S8
14 files changed, 57 insertions, 156 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 09e70090cfdc..f9573d9a6d96 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -92,6 +92,7 @@ choice
92 config DEBUG_BCM2835 92 config DEBUG_BCM2835
93 bool "Kernel low-level debugging on BCM2835 PL011 UART" 93 bool "Kernel low-level debugging on BCM2835 PL011 UART"
94 depends on ARCH_BCM2835 94 depends on ARCH_BCM2835
95 select DEBUG_UART_PL01X
95 96
96 config DEBUG_CLPS711X_UART1 97 config DEBUG_CLPS711X_UART1
97 bool "Kernel low-level debugging messages via UART1" 98 bool "Kernel low-level debugging messages via UART1"
@@ -110,6 +111,7 @@ choice
110 config DEBUG_CNS3XXX 111 config DEBUG_CNS3XXX
111 bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx" 112 bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"
112 depends on ARCH_CNS3XXX 113 depends on ARCH_CNS3XXX
114 select DEBUG_UART_PL01X
113 help 115 help
114 Say Y here if you want the debug print routines to direct 116 Say Y here if you want the debug print routines to direct
115 their output to the CNS3xxx UART0. 117 their output to the CNS3xxx UART0.
@@ -177,6 +179,7 @@ choice
177 config DEBUG_HIGHBANK_UART 179 config DEBUG_HIGHBANK_UART
178 bool "Kernel low-level debugging messages via Highbank UART" 180 bool "Kernel low-level debugging messages via Highbank UART"
179 depends on ARCH_HIGHBANK 181 depends on ARCH_HIGHBANK
182 select DEBUG_UART_PL01X
180 help 183 help
181 Say Y here if you want the debug print routines to direct 184 Say Y here if you want the debug print routines to direct
182 their output to the UART on Highbank based devices. 185 their output to the UART on Highbank based devices.
@@ -191,6 +194,7 @@ choice
191 config DEBUG_IMX23_UART 194 config DEBUG_IMX23_UART
192 bool "i.MX23 Debug UART" 195 bool "i.MX23 Debug UART"
193 depends on SOC_IMX23 196 depends on SOC_IMX23
197 select DEBUG_UART_PL01X
194 help 198 help
195 Say Y here if you want kernel low-level debugging support 199 Say Y here if you want kernel low-level debugging support
196 on i.MX23. 200 on i.MX23.
@@ -212,6 +216,7 @@ choice
212 config DEBUG_IMX28_UART 216 config DEBUG_IMX28_UART
213 bool "i.MX28 Debug UART" 217 bool "i.MX28 Debug UART"
214 depends on SOC_IMX28 218 depends on SOC_IMX28
219 select DEBUG_UART_PL01X
215 help 220 help
216 Say Y here if you want kernel low-level debugging support 221 Say Y here if you want kernel low-level debugging support
217 on i.MX28. 222 on i.MX28.
@@ -362,6 +367,7 @@ choice
362 config DEBUG_NOMADIK_UART 367 config DEBUG_NOMADIK_UART
363 bool "Kernel low-level debugging messages via NOMADIK UART" 368 bool "Kernel low-level debugging messages via NOMADIK UART"
364 depends on ARCH_NOMADIK 369 depends on ARCH_NOMADIK
370 select DEBUG_UART_PL01X
365 help 371 help
366 Say Y here if you want kernel low-level debugging support 372 Say Y here if you want kernel low-level debugging support
367 on NOMADIK based platforms. 373 on NOMADIK based platforms.
@@ -377,6 +383,7 @@ choice
377 config DEBUG_NSPIRE_CX_UART 383 config DEBUG_NSPIRE_CX_UART
378 bool "Kernel low-level debugging via TI-NSPIRE PL011 UART" 384 bool "Kernel low-level debugging via TI-NSPIRE PL011 UART"
379 depends on ARCH_NSPIRE 385 depends on ARCH_NSPIRE
386 select DEBUG_UART_PL01X
380 help 387 help
381 Say Y here if you want kernel low-level debugging support 388 Say Y here if you want kernel low-level debugging support
382 on TI-NSPIRE CX models. 389 on TI-NSPIRE CX models.
@@ -467,6 +474,7 @@ choice
467 config DEBUG_REALVIEW_STD_PORT 474 config DEBUG_REALVIEW_STD_PORT
468 bool "RealView Default UART" 475 bool "RealView Default UART"
469 depends on ARCH_REALVIEW 476 depends on ARCH_REALVIEW
477 select DEBUG_UART_PL01X
470 help 478 help
471 Say Y here if you want the debug print routines to direct 479 Say Y here if you want the debug print routines to direct
472 their output to the serial port on RealView EB, PB11MP, PBA8 480 their output to the serial port on RealView EB, PB11MP, PBA8
@@ -475,6 +483,7 @@ choice
475 config DEBUG_REALVIEW_PB1176_PORT 483 config DEBUG_REALVIEW_PB1176_PORT
476 bool "RealView PB1176 UART" 484 bool "RealView PB1176 UART"
477 depends on MACH_REALVIEW_PB1176 485 depends on MACH_REALVIEW_PB1176
486 select DEBUG_UART_PL01X
478 help 487 help
479 Say Y here if you want the debug print routines to direct 488 Say Y here if you want the debug print routines to direct
480 their output to the standard serial port on the RealView 489 their output to the standard serial port on the RealView
@@ -706,6 +715,7 @@ choice
706 config DEBUG_U300_UART 715 config DEBUG_U300_UART
707 bool "Kernel low-level debugging messages via U300 UART0" 716 bool "Kernel low-level debugging messages via U300 UART0"
708 depends on ARCH_U300 717 depends on ARCH_U300
718 select DEBUG_UART_PL01X
709 help 719 help
710 Say Y here if you want the debug print routines to direct 720 Say Y here if you want the debug print routines to direct
711 their output to the uart port on U300 devices. 721 their output to the uart port on U300 devices.
@@ -731,6 +741,7 @@ choice
731 config DEBUG_VEXPRESS_UART0_CA9 741 config DEBUG_VEXPRESS_UART0_CA9
732 bool "Use PL011 UART0 at 0x10009000 (V2P-CA9 core tile)" 742 bool "Use PL011 UART0 at 0x10009000 (V2P-CA9 core tile)"
733 depends on ARCH_VEXPRESS 743 depends on ARCH_VEXPRESS
744 select DEBUG_UART_PL01X
734 help 745 help
735 This option selects UART0 at 0x10009000. Except for custom models, 746 This option selects UART0 at 0x10009000. Except for custom models,
736 this applies only to the V2P-CA9 tile. 747 this applies only to the V2P-CA9 tile.
@@ -738,6 +749,7 @@ choice
738 config DEBUG_VEXPRESS_UART0_RS1 749 config DEBUG_VEXPRESS_UART0_RS1
739 bool "Use PL011 UART0 at 0x1c090000 (RS1 complaint tiles)" 750 bool "Use PL011 UART0 at 0x1c090000 (RS1 complaint tiles)"
740 depends on ARCH_VEXPRESS 751 depends on ARCH_VEXPRESS
752 select DEBUG_UART_PL01X
741 help 753 help
742 This option selects UART0 at 0x1c090000. This applies to most 754 This option selects UART0 at 0x1c090000. This applies to most
743 of the tiles using the RS1 memory map, including all new A-class 755 of the tiles using the RS1 memory map, including all new A-class
@@ -746,6 +758,7 @@ choice
746 config DEBUG_VEXPRESS_UART0_CRX 758 config DEBUG_VEXPRESS_UART0_CRX
747 bool "Use PL011 UART0 at 0xb0090000 (Cortex-R compliant tiles)" 759 bool "Use PL011 UART0 at 0xb0090000 (Cortex-R compliant tiles)"
748 depends on ARCH_VEXPRESS && !MMU 760 depends on ARCH_VEXPRESS && !MMU
761 select DEBUG_UART_PL01X
749 help 762 help
750 This option selects UART0 at 0xb0090000. This is appropriate for 763 This option selects UART0 at 0xb0090000. This is appropriate for
751 Cortex-R series tiles and SMMs, such as Cortex-R5 and Cortex-R7 764 Cortex-R series tiles and SMMs, such as Cortex-R5 and Cortex-R7
@@ -865,6 +878,11 @@ config DEBUG_LL_INCLUDE
865 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 878 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
866 default "mach/debug-macro.S" 879 default "mach/debug-macro.S"
867 880
881config DEBUG_UART_PL01X
882 def_bool ARCH_EP93XX || \
883 ARCH_INTEGRATOR || \
884 ARCH_VERSATILE
885
868config DEBUG_UART_8250 886config DEBUG_UART_8250
869 def_bool ARCH_DOVE || ARCH_EBSA110 || \ 887 def_bool ARCH_DOVE || ARCH_EBSA110 || \
870 (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ 888 (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
@@ -877,17 +895,30 @@ config DEBUG_UART_PHYS
877 default 0x01c28000 if DEBUG_SUNXI_UART0 895 default 0x01c28000 if DEBUG_SUNXI_UART0
878 default 0x01c28400 if DEBUG_SUNXI_UART1 896 default 0x01c28400 if DEBUG_SUNXI_UART1
879 default 0x03010fe0 if ARCH_RPC 897 default 0x03010fe0 if ARCH_RPC
898 default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \
899 DEBUG_VEXPRESS_UART0_CA9
900 default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
880 default 0x10124000 if DEBUG_RK3X_UART0 901 default 0x10124000 if DEBUG_RK3X_UART0
881 default 0x10126000 if DEBUG_RK3X_UART1 902 default 0x10126000 if DEBUG_RK3X_UART1
903 default 0x101f1000 if ARCH_VERSATILE
904 default 0x101fb000 if DEBUG_NOMADIK_UART
905 default 0x16000000 if ARCH_INTEGRATOR
906 default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
882 default 0x20060000 if DEBUG_RK29_UART0 907 default 0x20060000 if DEBUG_RK29_UART0
883 default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 908 default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
884 default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 909 default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
910 default 0x20201000 if DEBUG_BCM2835
885 default 0x40090000 if ARCH_LPC32XX 911 default 0x40090000 if ARCH_LPC32XX
886 default 0x40100000 if DEBUG_PXA_UART1 912 default 0x40100000 if DEBUG_PXA_UART1
887 default 0x42000000 if ARCH_GEMINI 913 default 0x42000000 if ARCH_GEMINI
888 default 0x7c0003f8 if FOOTBRIDGE 914 default 0x7c0003f8 if FOOTBRIDGE
889 default 0x80230000 if DEBUG_PICOXCELL_UART 915 default 0x80230000 if DEBUG_PICOXCELL_UART
890 default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART 916 default 0x80070000 if DEBUG_IMX23_UART
917 default 0x80074000 if DEBUG_IMX28_UART
918 default 0x808c0000 if ARCH_EP93XX
919 default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
920 default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
921 default 0xc0013000 if DEBUG_U300_UART
891 default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN 922 default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
892 default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN 923 default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
893 default 0xd0012000 if DEBUG_MVEBU_UART 924 default 0xd0012000 if DEBUG_MVEBU_UART
@@ -900,23 +931,34 @@ config DEBUG_UART_PHYS
900 default 0xfe800000 if ARCH_IOP32X 931 default 0xfe800000 if ARCH_IOP32X
901 default 0xffc02000 if DEBUG_SOCFPGA_UART 932 default 0xffc02000 if DEBUG_SOCFPGA_UART
902 default 0xffd82340 if ARCH_IOP13XX 933 default 0xffd82340 if ARCH_IOP13XX
934 default 0xfff36000 if DEBUG_HIGHBANK_UART
903 default 0xfffff700 if ARCH_IOP33X 935 default 0xfffff700 if ARCH_IOP33X
904 depends on DEBUG_UART_8250 936 depends on DEBUG_UART_8250 || DEBUG_UART_PL01X
905 937
906config DEBUG_UART_VIRT 938config DEBUG_UART_VIRT
907 hex "Virtual base address of debug UART" 939 hex "Virtual base address of debug UART"
908 default 0xe0010fe0 if ARCH_RPC 940 default 0xe0010fe0 if ARCH_RPC
909 default 0xf0000be0 if ARCH_EBSA110 941 default 0xf0000be0 if ARCH_EBSA110
942 default 0xf0009000 if DEBUG_CNS3XXX
943 default 0xf01fb000 if DEBUG_NOMADIK_UART
944 default 0xf0201000 if DEBUG_BCM2835
945 default 0xf11f1000 if ARCH_VERSATILE
946 default 0xf1600000 if ARCH_INTEGRATOR
910 default 0xf1c28000 if DEBUG_SUNXI_UART0 947 default 0xf1c28000 if DEBUG_SUNXI_UART0
911 default 0xf1c28400 if DEBUG_SUNXI_UART1 948 default 0xf1c28400 if DEBUG_SUNXI_UART1
912 default 0xf2100000 if DEBUG_PXA_UART1 949 default 0xf2100000 if DEBUG_PXA_UART1
913 default 0xf4090000 if ARCH_LPC32XX 950 default 0xf4090000 if ARCH_LPC32XX
914 default 0xf4200000 if ARCH_GEMINI 951 default 0xf4200000 if ARCH_GEMINI
952 default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
953 default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
954 default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
955 default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
915 default 0xfd012000 if ARCH_MV78XX0 956 default 0xfd012000 if ARCH_MV78XX0
916 default 0xfde12000 if ARCH_DOVE 957 default 0xfde12000 if ARCH_DOVE
917 default 0xfe012000 if ARCH_ORION5X 958 default 0xfe012000 if ARCH_ORION5X
918 default 0xfe017000 if DEBUG_MMP_UART2 959 default 0xfe017000 if DEBUG_MMP_UART2
919 default 0xfe018000 if DEBUG_MMP_UART3 960 default 0xfe018000 if DEBUG_MMP_UART3
961 default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
920 default 0xfe230000 if DEBUG_PICOXCELL_UART 962 default 0xfe230000 if DEBUG_PICOXCELL_UART
921 default 0xfe800000 if ARCH_IOP32X 963 default 0xfe800000 if ARCH_IOP32X
922 default 0xfeb24000 if DEBUG_RK3X_UART0 964 default 0xfeb24000 if DEBUG_RK3X_UART0
@@ -927,13 +969,17 @@ config DEBUG_UART_VIRT
927 default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 969 default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
928 default 0xfec02000 if DEBUG_SOCFPGA_UART 970 default 0xfec02000 if DEBUG_SOCFPGA_UART
929 default 0xfed12000 if ARCH_KIRKWOOD 971 default 0xfed12000 if ARCH_KIRKWOOD
972 default 0xfedc0000 if ARCH_EP93XX
930 default 0xfee003f8 if FOOTBRIDGE 973 default 0xfee003f8 if FOOTBRIDGE
931 default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART 974 default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
975 default 0xfee36000 if DEBUG_HIGHBANK_UART
932 default 0xfee82340 if ARCH_IOP13XX 976 default 0xfee82340 if ARCH_IOP13XX
933 default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN 977 default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
934 default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN 978 default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
935 default 0xfefff700 if ARCH_IOP33X 979 default 0xfefff700 if ARCH_IOP33X
936 depends on DEBUG_UART_8250 980 default 0xff003000 if DEBUG_U300_UART
981 default DEBUG_UART_PHYS if !MMU
982 depends on DEBUG_UART_8250 || DEBUG_UART_PL01X
937 983
938config DEBUG_UART_8250_SHIFT 984config DEBUG_UART_8250_SHIFT
939 int "Register offset shift for the 8250 debug UART" 985 int "Register offset shift for the 8250 debug UART"
diff --git a/arch/arm/include/asm/hardware/debug-pl01x.S b/arch/arm/include/asm/hardware/debug-pl01x.S
index f9fd083eff63..9d1e286cecfd 100644
--- a/arch/arm/include/asm/hardware/debug-pl01x.S
+++ b/arch/arm/include/asm/hardware/debug-pl01x.S
@@ -12,6 +12,13 @@
12*/ 12*/
13#include <linux/amba/serial.h> 13#include <linux/amba/serial.h>
14 14
15#ifdef CONFIG_DEBUG_UART_PHYS
16 .macro addruart, rp, rv, tmp
17 ldr \rp, =CONFIG_DEBUG_UART_PHYS
18 ldr \rv, =CONFIG_DEBUG_UART_VIRT
19 .endm
20#endif
21
15 .macro senduart,rd,rx 22 .macro senduart,rd,rx
16 strb \rd, [\rx, #UART01x_DR] 23 strb \rd, [\rx, #UART01x_DR]
17 .endm 24 .endm
diff --git a/arch/arm/include/debug/bcm2835.S b/arch/arm/include/debug/bcm2835.S
index aed9199bd847..726e06942933 100644
--- a/arch/arm/include/debug/bcm2835.S
+++ b/arch/arm/include/debug/bcm2835.S
@@ -10,13 +10,4 @@
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 *
12 */ 12 */
13
14#define BCM2835_DEBUG_PHYS 0x20201000
15#define BCM2835_DEBUG_VIRT 0xf0201000
16
17 .macro addruart, rp, rv, tmp
18 ldr \rp, =BCM2835_DEBUG_PHYS
19 ldr \rv, =BCM2835_DEBUG_VIRT
20 .endm
21
22#include <asm/hardware/debug-pl01x.S> 13#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/cns3xxx.S b/arch/arm/include/debug/cns3xxx.S
index d04c150baa1c..2d5fb519df2b 100644
--- a/arch/arm/include/debug/cns3xxx.S
+++ b/arch/arm/include/debug/cns3xxx.S
@@ -9,11 +9,4 @@
9 * it under the terms of the GNU General Public License, Version 2, as 9 * it under the terms of the GNU General Public License, Version 2, as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 */ 11 */
12
13 .macro addruart,rp,rv,tmp
14 mov \rp, #0x00009000
15 orr \rv, \rp, #0xf0000000 @ virtual base
16 orr \rp, \rp, #0x10000000
17 .endm
18
19#include <asm/hardware/debug-pl01x.S> 12#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/highbank.S b/arch/arm/include/debug/highbank.S
index 8cad4322a5a2..3c6f63ff0d37 100644
--- a/arch/arm/include/debug/highbank.S
+++ b/arch/arm/include/debug/highbank.S
@@ -8,10 +8,4 @@
8 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 */ 10 */
11
12 .macro addruart,rp,rv,tmp
13 ldr \rv, =0xfee36000
14 ldr \rp, =0xfff36000
15 .endm
16
17#include <asm/hardware/debug-pl01x.S> 11#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/mxs.S b/arch/arm/include/debug/mxs.S
index d86951551ca1..8a10ed264b0f 100644
--- a/arch/arm/include/debug/mxs.S
+++ b/arch/arm/include/debug/mxs.S
@@ -10,18 +10,4 @@
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 *
12 */ 12 */
13
14#ifdef CONFIG_DEBUG_IMX23_UART
15#define UART_PADDR 0x80070000
16#elif defined (CONFIG_DEBUG_IMX28_UART)
17#define UART_PADDR 0x80074000
18#endif
19
20#define UART_VADDR 0xfe100000
21
22 .macro addruart, rp, rv, tmp
23 ldr \rp, =UART_PADDR @ physical
24 ldr \rv, =UART_VADDR @ virtual
25 .endm
26
27#include <asm/hardware/debug-pl01x.S> 13#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nomadik.S b/arch/arm/include/debug/nomadik.S
index 735417922ce2..a6d238eba216 100644
--- a/arch/arm/include/debug/nomadik.S
+++ b/arch/arm/include/debug/nomadik.S
@@ -9,12 +9,4 @@
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 * 10 *
11*/ 11*/
12
13 .macro addruart, rp, rv, tmp
14 mov \rp, #0x00100000
15 add \rp, \rp, #0x000fb000
16 add \rv, \rp, #0xf0000000 @ virtual base
17 add \rp, \rp, #0x10000000 @ physical base address
18 .endm
19
20#include <asm/hardware/debug-pl01x.S> 12#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S
index 9c2fbeceedd0..fc17e50cc6d4 100644
--- a/arch/arm/include/debug/nspire.S
+++ b/arch/arm/include/debug/nspire.S
@@ -8,14 +8,4 @@
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 * 9 *
10 */ 10 */
11#ifdef CONFIG_DEBUG_NSPIRE_CX_UART
12#define NSPIRE_EARLY_UART_PHYS_BASE 0x90020000
13#define NSPIRE_EARLY_UART_VIRT_BASE 0xfee20000
14
15.macro addruart, rp, rv, tmp
16 ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE) @ physical base address
17 ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE) @ virtual base address
18.endm
19
20#include <asm/hardware/debug-pl01x.S> 11#include <asm/hardware/debug-pl01x.S>
21#endif
diff --git a/arch/arm/include/debug/u300.S b/arch/arm/include/debug/u300.S
index 6f04f08a203c..58b9d6286cd4 100644
--- a/arch/arm/include/debug/u300.S
+++ b/arch/arm/include/debug/u300.S
@@ -4,15 +4,4 @@
4 * Debugging macro include header. 4 * Debugging macro include header.
5 * Author: Linus Walleij <linus.walleij@stericsson.com> 5 * Author: Linus Walleij <linus.walleij@stericsson.com>
6 */ 6 */
7#define U300_SLOW_PER_PHYS_BASE 0xc0010000
8#define U300_SLOW_PER_VIRT_BASE 0xff000000
9
10 .macro addruart, rp, rv, tmp
11 /* If we move the address using MMU, use this. */
12 ldr \rp, = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
13 ldr \rv, = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
14 orr \rp, \rp, #0x00003000
15 orr \rv, \rv, #0x00003000
16 .endm
17
18#include <asm/hardware/debug-pl01x.S> 7#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
index acafb229e2b6..114bf4cc6ea1 100644
--- a/arch/arm/include/debug/vexpress.S
+++ b/arch/arm/include/debug/vexpress.S
@@ -48,50 +48,4 @@
48 .endm 48 .endm
49 49
50#include <asm/hardware/debug-pl01x.S> 50#include <asm/hardware/debug-pl01x.S>
51
52#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CA9)
53
54 .macro addruart,rp,rv,tmp
55 mov \rp, #DEBUG_LL_UART_OFFSET
56 orr \rv, \rp, #DEBUG_LL_VIRT_BASE
57 orr \rp, \rp, #DEBUG_LL_PHYS_BASE
58 .endm
59
60#include <asm/hardware/debug-pl01x.S>
61
62#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_RS1)
63
64 .macro addruart,rp,rv,tmp
65 mov \rp, #DEBUG_LL_UART_OFFSET_RS1
66 orr \rv, \rp, #DEBUG_LL_VIRT_BASE
67 orr \rp, \rp, #DEBUG_LL_PHYS_BASE_RS1
68 .endm
69
70#include <asm/hardware/debug-pl01x.S>
71
72#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CRX)
73
74 .macro addruart,rp,tmp,tmp2
75 ldr \rp, =DEBUG_LL_UART_PHYS_CRX
76 .endm
77
78#include <asm/hardware/debug-pl01x.S>
79
80#else /* CONFIG_DEBUG_LL_UART_NONE */
81
82 .macro addruart, rp, rv, tmp
83 /* Safe dummy values */
84 mov \rp, #0
85 mov \rv, #DEBUG_LL_VIRT_BASE
86 .endm
87
88 .macro senduart,rd,rx
89 .endm
90
91 .macro waituart,rd,rx
92 .endm
93
94 .macro busyuart,rd,rx
95 .endm
96
97#endif 51#endif
diff --git a/arch/arm/mach-ep93xx/include/mach/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S
index af54e43132cf..a1bfe4cbf74a 100644
--- a/arch/arm/mach-ep93xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-ep93xx/include/mach/debug-macro.S
@@ -9,13 +9,4 @@
9 * the Free Software Foundation; either version 2 of the License, or (at 9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version. 10 * your option) any later version.
11 */ 11 */
12#include <mach/ep93xx-regs.h>
13
14 .macro addruart, rp, rv, tmp
15 ldr \rp, =EP93XX_APB_PHYS_BASE @ Physical base
16 ldr \rv, =EP93XX_APB_VIRT_BASE @ virtual base
17 orr \rp, \rp, #0x000c0000
18 orr \rv, \rv, #0x000c0000
19 .endm
20
21#include <asm/hardware/debug-pl01x.S> 12#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-integrator/include/mach/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S
index 411b116077e4..03ee0fd88605 100644
--- a/arch/arm/mach-integrator/include/mach/debug-macro.S
+++ b/arch/arm/mach-integrator/include/mach/debug-macro.S
@@ -10,11 +10,4 @@
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 *
12*/ 12*/
13
14 .macro addruart, rp, rv, tmp
15 mov \rp, #0x16000000 @ physical base address
16 mov \rv, #0xf0000000 @ virtual base
17 add \rv, \rv, #0x16000000 >> 4
18 .endm
19
20#include <asm/hardware/debug-pl01x.S> 13#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index 8cc372dc66a8..99488f4a7d41 100644
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -9,21 +9,4 @@
9 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 */ 11 */
12
13#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
14#define DEBUG_LL_UART_OFFSET 0x00009000
15#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
16#define DEBUG_LL_UART_OFFSET 0x0010c000
17#endif
18
19#ifndef DEBUG_LL_UART_OFFSET
20#error "Unknown RealView platform"
21#endif
22
23 .macro addruart, rp, rv, tmp
24 mov \rp, #DEBUG_LL_UART_OFFSET
25 orr \rv, \rp, #0xfb000000 @ virtual base
26 orr \rp, \rp, #0x10000000 @ physical base
27 .endm
28
29#include <asm/hardware/debug-pl01x.S> 12#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-versatile/include/mach/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S
index d0fbd7f1cb00..c25697774d10 100644
--- a/arch/arm/mach-versatile/include/mach/debug-macro.S
+++ b/arch/arm/mach-versatile/include/mach/debug-macro.S
@@ -10,12 +10,4 @@
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 *
12*/ 12*/
13
14 .macro addruart, rp, rv, tmp
15 mov \rp, #0x001F0000
16 orr \rp, \rp, #0x00001000
17 orr \rv, \rp, #0xf1000000 @ virtual base
18 orr \rp, \rp, #0x10000000 @ physical base
19 .endm
20
21#include <asm/hardware/debug-pl01x.S> 13#include <asm/hardware/debug-pl01x.S>
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-23 22:26:30 -0400