| Message ID | 1377336603-10303-2-git-send-email-haojian.zhuang@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Aug 24, 2013 at 05:29:56PM +0800, Haojian Zhuang wrote: > Support UART0 debug ll on Hisilicon Hi3620 SoC & Hi3716 SoC. > > Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> > --- > arch/arm/Kconfig.debug | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 814d224..bba9662 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -194,6 +194,22 @@ choice > Say Y here if you want kernel low-level debugging support > on HI3716 UART. > I'm having problems applying this patch - I don't have the above context lines in my tree, or anything remotely resembling them. Neither can I find anything remotely similar in mainline. What did you generate this patch against? It can't be v3.11-rc6 as you put in your KernelVersion: line for the patch system. Your diff above says that this was generated against blob 814d224, which doesn't exist in mainline either. Neither does it seem to appear in my build tree which includes arm-soc's for-next branch.
On 26 August 2013 00:19, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Sat, Aug 24, 2013 at 05:29:56PM +0800, Haojian Zhuang wrote: >> Support UART0 debug ll on Hisilicon Hi3620 SoC & Hi3716 SoC. >> >> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> >> --- >> arch/arm/Kconfig.debug | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug >> index 814d224..bba9662 100644 >> --- a/arch/arm/Kconfig.debug >> +++ b/arch/arm/Kconfig.debug >> @@ -194,6 +194,22 @@ choice >> Say Y here if you want kernel low-level debugging support >> on HI3716 UART. >> > > I'm having problems applying this patch - I don't have the above context > lines in my tree, or anything remotely resembling them. Neither can I > find anything remotely similar in mainline. > > What did you generate this patch against? It can't be v3.11-rc6 as you > put in your KernelVersion: line for the patch system. > > Your diff above says that this was generated against blob 814d224, which > doesn't exist in mainline either. Neither does it seem to appear in > my build tree which includes arm-soc's for-next branch. Because there's some optimization on debug ll in your tree, I only find those commits in linux-next git tree. So I based this commit in linux-next. Could you help me to figure out which branch should I base in your git tree? Since I can't find a right one. Regards Haojian
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 814d224..bba9662 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -194,6 +194,22 @@ choice Say Y here if you want kernel low-level debugging support on HI3716 UART. + config DEBUG_HI3620_UART + bool "Hisilicon HI3620 Debug UART" + depends on ARCH_HI3xxx + select DEBUG_UART_PL01X + help + Say Y here if you want kernel low-level debugging support + on HI3620 UART. + + config DEBUG_HI3716_UART + bool "Hisilicon Hi3716 Debug UART" + depends on ARCH_HI3xxx + select DEBUG_UART_PL01X + help + Say Y here if you want kernel low-level debugging support + on HI3716 UART. + config DEBUG_HIGHBANK_UART bool "Kernel low-level debugging messages via Highbank UART" depends on ARCH_HIGHBANK @@ -980,6 +996,8 @@ config DEBUG_UART_PHYS default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \ ARCH_ORION5X + default 0xf8b00000 if DEBUG_HI3716_UART + default 0xfcb00000 if DEBUG_HI3620_UART default 0xfe800000 if ARCH_IOP32X default 0xffc02000 if DEBUG_SOCFPGA_UART default 0xffd82340 if ARCH_IOP13XX @@ -1016,6 +1034,7 @@ config DEBUG_UART_VIRT default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART default 0xfe230000 if DEBUG_PICOXCELL_UART default 0xfe800000 if ARCH_IOP32X + default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART default 0xfeb24000 if DEBUG_RK3X_UART0 default 0xfeb26000 if DEBUG_RK3X_UART1 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
Support UART0 debug ll on Hisilicon Hi3620 SoC & Hi3716 SoC. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> --- arch/arm/Kconfig.debug | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)