| Message ID | 1370702843-27172-7-git-send-email-haojian.zhuang@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, Jun 08, 2013 at 10:47:22PM +0800, Haojian Zhuang wrote: > Add board support with device tree for Hisilicon Hi36xx/Hi37xx platform. > > Changelog: > v3: > 1. Remove .map_io() in DT machine descriptor. Since debug_ll_io_init() > is called by default. > 2. Remove .init_machine() in DT machine descriptor. Since > of_platform_populate() is called by default in DT mode. > > v2: > 1. Remove .init_irq() in DT machine descriptor. Since irqchip_init() > is called by default in DT mode. > > Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> > --- > .../bindings/arm/hisilicon/hisilicon.txt | 10 ++++++ > arch/arm/Kconfig | 2 ++ > arch/arm/Makefile | 1 + > arch/arm/mach-hi3xxx/Kconfig | 13 ++++++++ > arch/arm/mach-hi3xxx/Makefile | 5 +++ > arch/arm/mach-hi3xxx/hi3xxx.c | 37 ++++++++++++++++++++++ > 6 files changed, 68 insertions(+) > create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt > create mode 100644 arch/arm/mach-hi3xxx/Kconfig > create mode 100644 arch/arm/mach-hi3xxx/Makefile > create mode 100644 arch/arm/mach-hi3xxx/hi3xxx.c > > diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt > new file mode 100644 > index 0000000..3be60c8 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt > @@ -0,0 +1,10 @@ > +Hisilicon Platforms Device Tree Bindings > +---------------------------------------------------- > + > +Hi3716 Development Board > +Required root node properties: > + - compatible = "hisilicon,hi3716-dkb"; > + > +Hi4511 Board > +Required root node properties: > + - compatible = "hisilicon,hi3620-hi4511"; Having the same namespace for boards and for SoCs is _extremely_ confusing. I know it's not something you made up, but if you have a chance to influence future naming, please do so. Or maybe consider using a different naming scheme than just "hixxxx" for boards in the sources. > diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hi3xxx/hi3xxx.c > new file mode 100644 > index 0000000..064b303 > --- /dev/null > +++ b/arch/arm/mach-hi3xxx/hi3xxx.c > @@ -0,0 +1,37 @@ > +/* > + * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine > + * > + * Copyright (c) 2012-2013 Hisilicon Ltd. > + * Copyright (c) 2012-2013 Linaro Ltd. > + * > + * Author: Haojian Zhuang <haojian.zhuang@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > +*/ > + > +#include <linux/clk-provider.h> > +#include <linux/clocksource.h> > +#include <linux/irqchip.h> > +#include <linux/of_platform.h> > + > +#include <asm/mach/arch.h> > +#include <asm/mach/map.h> > + > +static void __init hi3xxx_timer_init(void) > +{ > + of_clk_init(NULL); > + clocksource_of_init(); > +} > + > +static const char *hs_compat[] __initdata = { > + "hisilicon,hi3620-hi4511", > + NULL, Should you list the hisilicon,hi3716-dkb board here too, since you add the bindings doc for it? -Olof
On 13 June 2013 03:54, Olof Johansson <olof@lixom.net> wrote: > On Sat, Jun 08, 2013 at 10:47:22PM +0800, Haojian Zhuang wrote: >> Add board support with device tree for Hisilicon Hi36xx/Hi37xx platform. >> >> Changelog: >> v3: >> 1. Remove .map_io() in DT machine descriptor. Since debug_ll_io_init() >> is called by default. >> 2. Remove .init_machine() in DT machine descriptor. Since >> of_platform_populate() is called by default in DT mode. >> >> v2: >> 1. Remove .init_irq() in DT machine descriptor. Since irqchip_init() >> is called by default in DT mode. >> >> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> >> --- >> .../bindings/arm/hisilicon/hisilicon.txt | 10 ++++++ >> arch/arm/Kconfig | 2 ++ >> arch/arm/Makefile | 1 + >> arch/arm/mach-hi3xxx/Kconfig | 13 ++++++++ >> arch/arm/mach-hi3xxx/Makefile | 5 +++ >> arch/arm/mach-hi3xxx/hi3xxx.c | 37 ++++++++++++++++++++++ >> 6 files changed, 68 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt >> create mode 100644 arch/arm/mach-hi3xxx/Kconfig >> create mode 100644 arch/arm/mach-hi3xxx/Makefile >> create mode 100644 arch/arm/mach-hi3xxx/hi3xxx.c >> >> diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt >> new file mode 100644 >> index 0000000..3be60c8 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt >> @@ -0,0 +1,10 @@ >> +Hisilicon Platforms Device Tree Bindings >> +---------------------------------------------------- >> + >> +Hi3716 Development Board >> +Required root node properties: >> + - compatible = "hisilicon,hi3716-dkb"; >> + >> +Hi4511 Board >> +Required root node properties: >> + - compatible = "hisilicon,hi3620-hi4511"; > > Having the same namespace for boards and for SoCs is _extremely_ confusing. > I know it's not something you made up, but if you have a chance to influence > future naming, please do so. Or maybe consider using a different naming > scheme than just "hixxxx" for boards in the sources. Maybe. But it's still their choice. > >> diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hi3xxx/hi3xxx.c >> new file mode 100644 >> index 0000000..064b303 >> --- /dev/null >> +++ b/arch/arm/mach-hi3xxx/hi3xxx.c >> @@ -0,0 +1,37 @@ >> +/* >> + * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine >> + * >> + * Copyright (c) 2012-2013 Hisilicon Ltd. >> + * Copyright (c) 2012-2013 Linaro Ltd. >> + * >> + * Author: Haojian Zhuang <haojian.zhuang@linaro.org> >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> +*/ >> + >> +#include <linux/clk-provider.h> >> +#include <linux/clocksource.h> >> +#include <linux/irqchip.h> >> +#include <linux/of_platform.h> >> + >> +#include <asm/mach/arch.h> >> +#include <asm/mach/map.h> >> + >> +static void __init hi3xxx_timer_init(void) >> +{ >> + of_clk_init(NULL); >> + clocksource_of_init(); >> +} >> + >> +static const char *hs_compat[] __initdata = { >> + "hisilicon,hi3620-hi4511", >> + NULL, > > Should you list the hisilicon,hi3716-dkb board here too, since you add the > bindings doc for it? > > > -Olof If all of these patches are merged, I can submit hi3716-dkb continuously. The more things what I add only cause me pending more time. Regards Haojian
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt new file mode 100644 index 0000000..3be60c8 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt @@ -0,0 +1,10 @@ +Hisilicon Platforms Device Tree Bindings +---------------------------------------------------- + +Hi3716 Development Board +Required root node properties: + - compatible = "hisilicon,hi3716-dkb"; + +Hi4511 Board +Required root node properties: + - compatible = "hisilicon,hi3620-hi4511"; diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49d993c..acd2358 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -936,6 +936,8 @@ source "arch/arm/mach-footbridge/Kconfig" source "arch/arm/mach-gemini/Kconfig" +source "arch/arm/mach-hi3xxx/Kconfig" + source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-integrator/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1ba358b..748a9ca 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -147,6 +147,7 @@ machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_GEMINI) += gemini +machine-$(CONFIG_ARCH_HI3xxx) += hi3xxx machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx diff --git a/arch/arm/mach-hi3xxx/Kconfig b/arch/arm/mach-hi3xxx/Kconfig new file mode 100644 index 0000000..a991dee --- /dev/null +++ b/arch/arm/mach-hi3xxx/Kconfig @@ -0,0 +1,13 @@ +config ARCH_HI3xxx + bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select CACHE_L2X0 + select CACHE_PL310 + select CLKSRC_OF + select PINCTRL + select PINCTRL_SINGLE + select SERIAL_AMBA_PL011 + select SERIAL_AMBA_PL011_CONSOLE + help + Support for Hisilicon Hi36xx/Hi37xx processor family diff --git a/arch/arm/mach-hi3xxx/Makefile b/arch/arm/mach-hi3xxx/Makefile new file mode 100644 index 0000000..d68ebb3 --- /dev/null +++ b/arch/arm/mach-hi3xxx/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for Hisilicon Hi36xx/Hi37xx processors line +# + +obj-y += hi3xxx.o diff --git a/arch/arm/mach-hi3xxx/hi3xxx.c b/arch/arm/mach-hi3xxx/hi3xxx.c new file mode 100644 index 0000000..064b303 --- /dev/null +++ b/arch/arm/mach-hi3xxx/hi3xxx.c @@ -0,0 +1,37 @@ +/* + * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine + * + * Copyright (c) 2012-2013 Hisilicon Ltd. + * Copyright (c) 2012-2013 Linaro Ltd. + * + * Author: Haojian Zhuang <haojian.zhuang@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <linux/clk-provider.h> +#include <linux/clocksource.h> +#include <linux/irqchip.h> +#include <linux/of_platform.h> + +#include <asm/mach/arch.h> +#include <asm/mach/map.h> + +static void __init hi3xxx_timer_init(void) +{ + of_clk_init(NULL); + clocksource_of_init(); +} + +static const char *hs_compat[] __initdata = { + "hisilicon,hi3620-hi4511", + NULL, +}; + +DT_MACHINE_START(HI3xxx, "Hisilicon Hi36xx/Hi37xx (Flattened Device Tree)") + /* Maintainer: Haojian Zhuang <haojian.zhuang@linaro.org> */ + .init_time = hi3xxx_timer_init, + .dt_compat = hs_compat, +MACHINE_END
Add board support with device tree for Hisilicon Hi36xx/Hi37xx platform. Changelog: v3: 1. Remove .map_io() in DT machine descriptor. Since debug_ll_io_init() is called by default. 2. Remove .init_machine() in DT machine descriptor. Since of_platform_populate() is called by default in DT mode. v2: 1. Remove .init_irq() in DT machine descriptor. Since irqchip_init() is called by default in DT mode. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> --- .../bindings/arm/hisilicon/hisilicon.txt | 10 ++++++ arch/arm/Kconfig | 2 ++ arch/arm/Makefile | 1 + arch/arm/mach-hi3xxx/Kconfig | 13 ++++++++ arch/arm/mach-hi3xxx/Makefile | 5 +++ arch/arm/mach-hi3xxx/hi3xxx.c | 37 ++++++++++++++++++++++ 6 files changed, 68 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt create mode 100644 arch/arm/mach-hi3xxx/Kconfig create mode 100644 arch/arm/mach-hi3xxx/Makefile create mode 100644 arch/arm/mach-hi3xxx/hi3xxx.c