| Message ID | 1370358317-12768-6-git-send-email-haojian.zhuang@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Tuesday 04 June 2013 23:05:16 Haojian Zhuang wrote: > +static void __init hi3xxx_timer_init(void) > +{ > + of_clk_init(NULL); > + clocksource_of_init(); > +} I plan to make this the default, so maybe we will be able to get rid of this function soon. Right now it is still needed, as we only call clocksource_of_init() but not of_clk_init(). > +static void __init hs_init(void) > +{ > + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > +} However, this is the default already. You can remove. > +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> */ > + .map_io = debug_ll_io_init, > + .init_time = hi3xxx_timer_init, > + .init_machine = hs_init, > + .dt_compat = hs_compat, > +MACHINE_END Same for debug_ll_io_init. You can remove the map_io and init_machine lines here. With those gone, Acked-by: Arnd Bergmann <arnd@arndb.de> Arnd
On 4 June 2013 23:16, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 04 June 2013 23:05:16 Haojian Zhuang wrote: > >> +static void __init hi3xxx_timer_init(void) >> +{ >> + of_clk_init(NULL); >> + clocksource_of_init(); >> +} > > I plan to make this the default, so maybe we will be able to get rid > of this function soon. Right now it is still needed, as we only > call clocksource_of_init() but not of_clk_init(). > But my timer driver accesses clk. So I need to call of_clk_init() before clocksource_of_init(). Up to now, of_clk_init() isn't called by default. >> +static void __init hs_init(void) >> +{ >> + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); >> +} > > However, this is the default already. You can remove. > I'll update it. >> +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> */ >> + .map_io = debug_ll_io_init, >> + .init_time = hi3xxx_timer_init, >> + .init_machine = hs_init, >> + .dt_compat = hs_compat, >> +MACHINE_END > > Same for debug_ll_io_init. You can remove the map_io and init_machine lines > here. I'll update it. > > With those gone, > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Arnd Thanks Haojian
On Wednesday 05 June 2013 11:04:27 Haojian Zhuang wrote: > On 4 June 2013 23:16, Arnd Bergmann <arnd@arndb.de> wrote: > > On Tuesday 04 June 2013 23:05:16 Haojian Zhuang wrote: > > > >> +static void __init hi3xxx_timer_init(void) > >> +{ > >> + of_clk_init(NULL); > >> + clocksource_of_init(); > >> +} > > > > I plan to make this the default, so maybe we will be able to get rid > > of this function soon. Right now it is still needed, as we only > > call clocksource_of_init() but not of_clk_init(). > > > But my timer driver accesses clk. So I need to call of_clk_init() before > clocksource_of_init(). Up to now, of_clk_init() isn't called by default. Yes, I know. I mean we should change the common code to call of_clk_init by default, and do that before calling clocksource_of_init(). Arnd
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..aaee7db --- /dev/null +++ b/arch/arm/mach-hi3xxx/hi3xxx.c @@ -0,0 +1,44 @@ +/* + * (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 void __init hs_init(void) +{ + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); +} + +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> */ + .map_io = debug_ll_io_init, + .init_time = hi3xxx_timer_init, + .init_machine = hs_init, + .dt_compat = hs_compat, +MACHINE_END
Add board support with device tree for Hisilicon Hi36xx/Hi37xx platform. 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 | 44 ++++++++++++++++++++++ 6 files changed, 75 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