Skip to contentSkip to conversation

ARM: debug: move StrongARM debug include to arch/arm/include/debug

PATCH RESEND Superseded Dmitry Eremin-Solenikov 2 participants 3 messages Nov 6, 2014 – Nov 20, 2014

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Dmitry Eremin-Solenikov

author
#0 lore raw

PATCH RESEND v2 1/1 ARM: debug: move StrongARM debug include to arch/arm/include/debug

StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
[Changes since V1: keep Kconfig.debug sorted alphabetically]

 arch/arm/Kconfig.debug                                         |  9 +++++++++
 .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)
arch/arm/Kconfig.debug +9 -0
index b11ad54..9a3bff0 100644
@@ -699,6 +699,14 @@ choice
 		  their output to UART 2. The port must have been initialised
 		  by the boot-loader before use.
 
+	config DEBUG_SA1100
+		depends on ARCH_SA1100
+		bool "Use SA1100 UARTs for low-level debug"
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on SA-11x0 UART ports. The kernel will check for the first
+		  enabled UART in a sequence 3-1-2.
+
 	config DEBUG_SOCFPGA_UART
 		depends on ARCH_SOCFPGA
 		bool "Use SOCFPGA UART for low-level debug"

@@ -1009,6 +1017,7 @@ config DEBUG_STI_UART
 
 config DEBUG_LL_INCLUDE
 	string
+	default "debug/sa1100.S" if DEBUG_SA1100
 	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
 	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
 	default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
arch/arm/include/debug/sa1100.S renamed from arch/arm/mach-sa1100/include/mach/debug-macro.S +8 -2
similarity index 83%
rename from arch/arm/mach-sa1100/include/mach/debug-macro.S
rename to arch/arm/include/debug/sa1100.S
index 530772d..a0ae4f4 100644
@@ -1,4 +1,4 @@
-/* arch/arm/mach-sa1100/include/mach/debug-macro.S
+/* arch/arm/include/debug/sa1100.S
  *
  * Debugging macro include header
  *

@@ -10,7 +10,13 @@
  * published by the Free Software Foundation.
  *
 */
-#include <mach/hardware.h>
+
+#define UTCR3		0x0c
+#define UTDR		0x14
+#define UTSR1		0x20
+#define UTCR3_TXE	0x00000002	/* Transmit Enable                 */
+#define UTSR1_TBY	0x00000001	/* Transmitter BusY (read)         */
+#define UTSR1_TNF	0x00000004	/* Transmit FIFO Not Full (read)   */
 
 		.macro	addruart, rp, rv, tmp
 		mrc	p15, 0, \rp, c1, c0
Signature · 1 line
2.1.1
author
#1 lore raw

PATCH RESEND v2 1/1 ARM: debug: move StrongARM debug include to arch/arm/include/debug

2014-11-06 10:20 GMT+03:00 Dmitry Eremin-Solenikov <[email protected]>:

Quoted 11 lines

StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
[Changes since V1: keep Kconfig.debug sorted alphabetically]

 arch/arm/Kconfig.debug                                         |  9 +++++++++
 .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)

Dear Russell,

Is it ok to merge this patch? Would you like to pick it on your own? Would you like
for Arnd to take it through arm-soc? Would you like for me to throw it out (and why)?

Signature · 2 lines
With best wishes
Dmitry
#2 lore raw

PATCH RESEND v2 1/1 ARM: debug: move StrongARM debug include to arch/arm/include/debug

Quoted 14 lines · Dmitry Eremin-Solenikov

2014-11-06 10:20 GMT+03:00 Dmitry Eremin-Solenikov <[email protected]>:

Quoted 11 lines

StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>

---
[Changes since V1: keep Kconfig.debug sorted alphabetically]

 arch/arm/Kconfig.debug                                         |  9 +++++++++
 .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)
Quoted 6 lines

Dear Russell,

Is it ok to merge this patch? Would you like to pick it on your own? Would you like
for Arnd to take it through arm-soc? Would you like for me to throw it out (and why)?

I've merged it into the next/soc branch of arm-soc now. Russell, let me know if you have any objections.

There was a trivial merge conflict that I resolved.

Arnd