| Message ID | 1408461407-10429-5-git-send-email-daniel.thompson@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Daniel, On 20/08/14 01:16, Daniel Thompson wrote: > As part of the migration a couple of uart definitions have been copied > from of the platform specific header files. > > Note that, in order to keep oldconfig working nicely we must defer the > removal of arch/arm/mach-ks8695/include/mach/debug-macro.S until > DEBUG_LL_UART_NONE has been removed. > > Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Greg Ungerer <gerg@uclinux.org> > Cc: Arnd Bergmann <arnd.bergmann@linaro.org> > --- > arch/arm/Kconfig.debug | 8 ++++++++ > .../include/mach/debug-macro.S => include/debug/ks8695.S} | 10 +++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 9c46729..97c3058 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -348,6 +348,13 @@ choice > Say Y here if you want the debug print routines to direct > their output to UART1 serial port on KEYSTONE2 devices. > > + config DEBUG_KS8695_UART > + bool "KS8695 Debug UART" > + depends on ARCH_KS8695 > + help > + Say Y here if you want kernel low-level debugging support > + on KS8695. > + > config DEBUG_MMP_UART2 > bool "Kernel low-level debugging message via MMP UART2" > depends on ARCH_MMP > @@ -1017,6 +1024,7 @@ config DEBUG_LL_INCLUDE > DEBUG_IMX6Q_UART || \ > DEBUG_IMX6SL_UART || \ > DEBUG_IMX6SX_UART > + default "debug/ks8695.S" if DEBUG_KS8695_UART > default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM > default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART > default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART > diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/include/debug/ks8695.S > similarity index 80% > rename from arch/arm/mach-ks8695/include/mach/debug-macro.S > rename to arch/arm/include/debug/ks8695.S > index a79e489..961da1f 100644 > --- a/arch/arm/mach-ks8695/include/mach/debug-macro.S > +++ b/arch/arm/include/debug/ks8695.S > @@ -1,5 +1,5 @@ > /* > - * arch/arm/mach-ks8695/include/mach/debug-macro.S > + * arch/arm/include/debug/ks8695.S > * > * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> > * Copyright (C) 2006 Simtec Electronics > @@ -11,8 +11,12 @@ > * published by the Free Software Foundation. > */ > > -#include <mach/hardware.h> > -#include <mach/regs-uart.h> > +#define KS8695_UART_PA 0x03ffe000 > +#define KS8695_UART_VA 0xf00fe000 > +#define KS8695_URTH (0x04) > +#define KS8695_URLS (0x14) > +#define URLS_URTE (1 << 6) > +#define URLS_URTHRE (1 << 5) Whats the thinking behind moving these definitions here? Is there a plan to move/change regs-uart.h? Regards Greg
On 21/08/14 12:46, Greg Ungerer wrote: > Hi Daniel, > > On 20/08/14 01:16, Daniel Thompson wrote: >> As part of the migration a couple of uart definitions have been copied >> from of the platform specific header files. >> >> Note that, in order to keep oldconfig working nicely we must defer the >> removal of arch/arm/mach-ks8695/include/mach/debug-macro.S until >> DEBUG_LL_UART_NONE has been removed. >> >> Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> >> Cc: Russell King <linux@arm.linux.org.uk> >> Cc: Greg Ungerer <gerg@uclinux.org> >> Cc: Arnd Bergmann <arnd.bergmann@linaro.org> >> --- >> arch/arm/Kconfig.debug | 8 >> ++++++++ >> .../include/mach/debug-macro.S => include/debug/ks8695.S} | 10 >> +++++++--- >> 2 files changed, 15 insertions(+), 3 deletions(-) >> rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => >> include/debug/ks8695.S} (80%) >> >> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug >> index 9c46729..97c3058 100644 >> --- a/arch/arm/Kconfig.debug >> +++ b/arch/arm/Kconfig.debug >> @@ -348,6 +348,13 @@ choice >> Say Y here if you want the debug print routines to direct >> their output to UART1 serial port on KEYSTONE2 devices. >> + config DEBUG_KS8695_UART >> + bool "KS8695 Debug UART" >> + depends on ARCH_KS8695 >> + help >> + Say Y here if you want kernel low-level debugging support >> + on KS8695. >> + >> config DEBUG_MMP_UART2 >> bool "Kernel low-level debugging message via MMP UART2" >> depends on ARCH_MMP >> @@ -1017,6 +1024,7 @@ config DEBUG_LL_INCLUDE >> DEBUG_IMX6Q_UART || \ >> DEBUG_IMX6SL_UART || \ >> DEBUG_IMX6SX_UART >> + default "debug/ks8695.S" if DEBUG_KS8695_UART >> default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM >> default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART >> default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART >> diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S >> b/arch/arm/include/debug/ks8695.S >> similarity index 80% >> rename from arch/arm/mach-ks8695/include/mach/debug-macro.S >> rename to arch/arm/include/debug/ks8695.S >> index a79e489..961da1f 100644 >> --- a/arch/arm/mach-ks8695/include/mach/debug-macro.S >> +++ b/arch/arm/include/debug/ks8695.S >> @@ -1,5 +1,5 @@ >> /* >> - * arch/arm/mach-ks8695/include/mach/debug-macro.S >> + * arch/arm/include/debug/ks8695.S >> * >> * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> >> * Copyright (C) 2006 Simtec Electronics >> @@ -11,8 +11,12 @@ >> * published by the Free Software Foundation. >> */ >> -#include <mach/hardware.h> >> -#include <mach/regs-uart.h> >> +#define KS8695_UART_PA 0x03ffe000 >> +#define KS8695_UART_VA 0xf00fe000 >> +#define KS8695_URTH (0x04) >> +#define KS8695_URLS (0x14) >> +#define URLS_URTE (1 << 6) >> +#define URLS_URTHRE (1 << 5) > > Whats the thinking behind moving these definitions here? > Is there a plan to move/change regs-uart.h? I am trying to move *all* the debug macros into arch/arm/include/debug thus making all the debug macros multi-platform. To do this the macros cannot use headers found in mach-ks8695 because that would not be available on multi-platform builds. The approach of moving a limited set of definitions into the macro is how other debug macros have been migrated. To make ks8695 fully multi-platform would likely require regs-uart.h (and any associated driver) to migrate into drivers/tty/serial/ together with a *huge* pile of other work that I doubt anyone has much appetite for. Certainly I have no personal plans to seek further change on ks8695. To be honest I'm only dabbling in this area at all in order to allow us to remove a nasty KConfig hack for that breaks multi_v7_defconfig+debug_ll on my two favoured test boards.
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9c46729..97c3058 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -348,6 +348,13 @@ choice Say Y here if you want the debug print routines to direct their output to UART1 serial port on KEYSTONE2 devices. + config DEBUG_KS8695_UART + bool "KS8695 Debug UART" + depends on ARCH_KS8695 + help + Say Y here if you want kernel low-level debugging support + on KS8695. + config DEBUG_MMP_UART2 bool "Kernel low-level debugging message via MMP UART2" depends on ARCH_MMP @@ -1017,6 +1024,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART || \ DEBUG_IMX6SX_UART + default "debug/ks8695.S" if DEBUG_KS8695_UART default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/include/debug/ks8695.S similarity index 80% rename from arch/arm/mach-ks8695/include/mach/debug-macro.S rename to arch/arm/include/debug/ks8695.S index a79e489..961da1f 100644 --- a/arch/arm/mach-ks8695/include/mach/debug-macro.S +++ b/arch/arm/include/debug/ks8695.S @@ -1,5 +1,5 @@ /* - * arch/arm/mach-ks8695/include/mach/debug-macro.S + * arch/arm/include/debug/ks8695.S * * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk> * Copyright (C) 2006 Simtec Electronics @@ -11,8 +11,12 @@ * published by the Free Software Foundation. */ -#include <mach/hardware.h> -#include <mach/regs-uart.h> +#define KS8695_UART_PA 0x03ffe000 +#define KS8695_UART_VA 0xf00fe000 +#define KS8695_URTH (0x04) +#define KS8695_URLS (0x14) +#define URLS_URTE (1 << 6) +#define URLS_URTHRE (1 << 5) .macro addruart, rp, rv, tmp ldr \rp, =KS8695_UART_PA @ physical base address
As part of the migration a couple of uart definitions have been copied from of the platform specific header files. Note that, in order to keep oldconfig working nicely we must defer the removal of arch/arm/mach-ks8695/include/mach/debug-macro.S until DEBUG_LL_UART_NONE has been removed. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Greg Ungerer <gerg@uclinux.org> Cc: Arnd Bergmann <arnd.bergmann@linaro.org> --- arch/arm/Kconfig.debug | 8 ++++++++ .../include/mach/debug-macro.S => include/debug/ks8695.S} | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%)