| Message ID | 1407970202-3685-1-git-send-email-computersforpeace@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ping? On Wed, Aug 13, 2014 at 03:50:02PM -0700, Brian Norris wrote: > From: Marc Carino <marc.ceeeee@gmail.com> > > Add the UART definitions needed to support earlyprintk on brcmstb machines. > > Signed-off-by: Marc Carino <marc.ceeeee@gmail.com> > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > Acked-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > --- > This patch was left out in the cold, since Russell wouldn't take it > > Sent against Linus' current head, since there were Kconfig.debug changes merged > from both arm-soc/next/dt and arm-soc/next/soc (this is confusing!) > > arch/arm/Kconfig.debug | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index b11ad54f8d17..a985c2898075 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -130,6 +130,17 @@ choice > Say Y here if you want kernel low-level debugging support > on Marvell Berlin SoC based platforms. > > + config DEBUG_BRCMSTB_UART > + bool "Use BRCMSTB UART for low-level debug" > + depends on ARCH_BRCMSTB > + select DEBUG_UART_8250 > + help > + Say Y here if you want the debug print routines to direct > + their output to the first serial port on these devices. > + > + If you have a Broadcom STB chip and would like early print > + messages to appear over the UART, select this option. > + > config DEBUG_CLPS711X_UART1 > bool "Kernel low-level debugging messages via UART1" > depends on ARCH_CLPS711X > @@ -1110,6 +1121,7 @@ config DEBUG_UART_PHYS > default 0xd4018000 if DEBUG_MMP_UART3 > default 0xe0000000 if ARCH_SPEAR13XX > default 0xf0000be0 if ARCH_EBSA110 > + default 0xf040ab00 if DEBUG_BRCMSTB_UART > default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE > default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \ > ARCH_ORION5X > @@ -1157,6 +1169,7 @@ config DEBUG_UART_VIRT > default 0xfa71e000 if DEBUG_QCOM_UARTDM > default 0xfb009000 if DEBUG_REALVIEW_STD_PORT > default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT > + default 0xfc40ab00 if DEBUG_BRCMSTB_UART > default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX > default 0xfd000000 if ARCH_SPEAR13XX > default 0xfd012000 if ARCH_MV78XX0 > @@ -1210,7 +1223,8 @@ config DEBUG_UART_8250_WORD > ARCH_KEYSTONE || \ > DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ > DEBUG_DAVINCI_DA8XX_UART2 || \ > - DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 > + DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \ > + DEBUG_BRCMSTB_UART > > config DEBUG_UART_8250_FLOW_CONTROL > bool "Enable flow control for 8250 UART" > -- > 1.9.1 >
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index b11ad54f8d17..a985c2898075 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -130,6 +130,17 @@ choice Say Y here if you want kernel low-level debugging support on Marvell Berlin SoC based platforms. + config DEBUG_BRCMSTB_UART + bool "Use BRCMSTB UART for low-level debug" + depends on ARCH_BRCMSTB + select DEBUG_UART_8250 + help + Say Y here if you want the debug print routines to direct + their output to the first serial port on these devices. + + If you have a Broadcom STB chip and would like early print + messages to appear over the UART, select this option. + config DEBUG_CLPS711X_UART1 bool "Kernel low-level debugging messages via UART1" depends on ARCH_CLPS711X @@ -1110,6 +1121,7 @@ config DEBUG_UART_PHYS default 0xd4018000 if DEBUG_MMP_UART3 default 0xe0000000 if ARCH_SPEAR13XX default 0xf0000be0 if ARCH_EBSA110 + default 0xf040ab00 if DEBUG_BRCMSTB_UART default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \ ARCH_ORION5X @@ -1157,6 +1169,7 @@ config DEBUG_UART_VIRT default 0xfa71e000 if DEBUG_QCOM_UARTDM default 0xfb009000 if DEBUG_REALVIEW_STD_PORT default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT + default 0xfc40ab00 if DEBUG_BRCMSTB_UART default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX default 0xfd000000 if ARCH_SPEAR13XX default 0xfd012000 if ARCH_MV78XX0 @@ -1210,7 +1223,8 @@ config DEBUG_UART_8250_WORD ARCH_KEYSTONE || \ DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ DEBUG_DAVINCI_DA8XX_UART2 || \ - DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 + DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2 || \ + DEBUG_BRCMSTB_UART config DEBUG_UART_8250_FLOW_CONTROL bool "Enable flow control for 8250 UART"