* [PATCH] ARM: debug: move StrongARM debug include to arch/arm/include/debug
@ 2013-12-10 22:44 Dmitry Eremin-Solenikov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Eremin-Solenikov @ 2013-12-10 22:44 UTC (permalink / raw)
To: linux-arm-kernel
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 <dbaryshkov@gmail.com>
---
arch/arm/Kconfig.debug | 9 +++++++++
.../include/mach/debug-macro.S => include/debug/sa1100.S} | 0
2 files changed, 9 insertions(+)
rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (100%)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9762c84..55ae5cf 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -493,6 +493,14 @@ choice
Say Y here if you want kernel low-level debugging support
on PXA UART1.
+ 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_REALVIEW_STD_PORT
bool "RealView Default UART"
depends on ARCH_REALVIEW
@@ -882,6 +890,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/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
default "debug/exynos.S" if DEBUG_EXYNOS_UART
diff --git a/arch/arm/mach-sa1100/include/mach/debug-macro.S b/arch/arm/include/debug/sa1100.S
similarity index 100%
rename from arch/arm/mach-sa1100/include/mach/debug-macro.S
rename to arch/arm/include/debug/sa1100.S
--
1.8.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: debug: move StrongARM debug include to arch/arm/include/debug
@ 2014-10-16 7:31 Dmitry Eremin-Solenikov
2014-10-20 19:43 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-10-16 7:31 UTC (permalink / raw)
To: linux-arm-kernel
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 <dbaryshkov@gmail.com>
---
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%)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index b11ad54..8adf043 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -547,6 +547,14 @@ choice
Say Y here if you want kernel low-level debugging support
on PXA UART1.
+ 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_REALVIEW_STD_PORT
bool "RealView Default UART"
depends on ARCH_REALVIEW
@@ -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
diff --git a/arch/arm/mach-sa1100/include/mach/debug-macro.S b/arch/arm/include/debug/sa1100.S
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
--- a/arch/arm/mach-sa1100/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/sa1100.S
@@ -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
--
2.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: debug: move StrongARM debug include to arch/arm/include/debug
2014-10-16 7:31 [PATCH] ARM: debug: move StrongARM debug include to arch/arm/include/debug Dmitry Eremin-Solenikov
@ 2014-10-20 19:43 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2014-10-20 19:43 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 16 October 2014 11:31:36 Dmitry Eremin-Solenikov wrote:
> 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 <dbaryshkov@gmail.com>
Looks good to me in principle. Russell, are you ok with us picking this
up through arm-soc?
> 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%)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index b11ad54..8adf043 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -547,6 +547,14 @@ choice
> Say Y here if you want kernel low-level debugging support
> on PXA UART1.
>
> + 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_REALVIEW_STD_PORT
> bool "RealView Default UART"
> depends on ARCH_REALVIEW
Note that the symbols are ordered alphabetically. Please fix this.
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-20 19:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-16 7:31 [PATCH] ARM: debug: move StrongARM debug include to arch/arm/include/debug Dmitry Eremin-Solenikov
2014-10-20 19:43 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2013-12-10 22:44 Dmitry Eremin-Solenikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).