| Message ID | 20140904022856.26216.25574.sendpatchset@w520 (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, Sep 04, 2014 at 11:28:56AM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Enable sh73a0 Multiplatform support for the generic sh73a0 > machine vector. No board support is enabled, and the board > code for KZM9G DT Reference is left by itself. This appears to overlap with: [PATCH v2 03/10] ARM: shmobile: sh73a0: common clock framework board support > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > --- > > arch/arm/mach-shmobile/Kconfig | 5 +++++ > arch/arm/mach-shmobile/Makefile | 4 ++-- > arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++- > 3 files changed, 11 insertions(+), 3 deletions(-) > > --- 0001/arch/arm/mach-shmobile/Kconfig > +++ work/arch/arm/mach-shmobile/Kconfig 2014-09-04 10:48:28.000000000 +0900 > @@ -50,6 +50,11 @@ config ARCH_R7S72100 > bool "RZ/A1H (R7S72100)" > select SYS_SUPPORTS_SH_MTU2 > > +config ARCH_SH73A0 > + bool "SH-Mobile AG5 (R8A73A00)" > + select ARCH_RMOBILE > + select RENESAS_INTC_IRQPIN > + > config ARCH_R8A7740 > bool "R-Mobile A1 (R8A77400)" > select ARCH_RMOBILE > --- 0001/arch/arm/mach-shmobile/Makefile > +++ work/arch/arm/mach-shmobile/Makefile 2014-09-04 10:48:28.000000000 +0900 > @@ -7,7 +7,7 @@ obj-y := timer.o console.o > > # CPU objects > obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o > -obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o > +obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o > obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o > obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o > obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o > @@ -70,7 +70,7 @@ obj-$(CONFIG_MACH_LAGER) += board-lager. > obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o > obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o > obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o > -obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o > +obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o > obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o > endif > > --- 0002/arch/arm/mach-shmobile/setup-sh73a0.c > +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-09-04 10:59:10.000000000 +0900 > @@ -757,7 +757,9 @@ void __init __weak sh73a0_register_twd(v > void __init sh73a0_earlytimer_init(void) > { > sh73a0_init_delay(); > +#ifndef CONFIG_COMMON_CLK > sh73a0_clock_init(); > +#endif > shmobile_earlytimer_init(); > sh73a0_register_twd(); > } > @@ -775,9 +777,10 @@ void __init sh73a0_add_early_devices(voi > > void __init sh73a0_add_standard_devices_dt(void) > { > +#ifndef CONFIG_COMMON_CLK > /* clocks are setup late during boot in the case of DT */ > sh73a0_clock_init(); > - > +#endif > platform_add_devices(sh73a0_devices_dt, > ARRAY_SIZE(sh73a0_devices_dt)); > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Simon, On Thu, Sep 4, 2014 at 3:51 PM, Simon Horman <horms@verge.net.au> wrote: > On Thu, Sep 04, 2014 at 11:28:56AM +0900, Magnus Damm wrote: >> From: Magnus Damm <damm+renesas@opensource.se> >> >> Enable sh73a0 Multiplatform support for the generic sh73a0 >> machine vector. No board support is enabled, and the board >> code for KZM9G DT Reference is left by itself. > > This appears to overlap with: > > [PATCH v2 03/10] ARM: shmobile: sh73a0: common clock framework board support So it seems. I propose that Ulrich will focus on getting the sh73a0 drivers/clk bits merged, while I fix up the generic sh73a0 multiplatform support in parallel. Can you make sure the CMT bits get sorted out independently? Thanks, / magnus -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 04, 2014 at 08:01:53PM +0900, Magnus Damm wrote: > Hi Simon, > > On Thu, Sep 4, 2014 at 3:51 PM, Simon Horman <horms@verge.net.au> wrote: > > On Thu, Sep 04, 2014 at 11:28:56AM +0900, Magnus Damm wrote: > >> From: Magnus Damm <damm+renesas@opensource.se> > >> > >> Enable sh73a0 Multiplatform support for the generic sh73a0 > >> machine vector. No board support is enabled, and the board > >> code for KZM9G DT Reference is left by itself. > > > > This appears to overlap with: > > > > [PATCH v2 03/10] ARM: shmobile: sh73a0: common clock framework board support > > So it seems. I propose that Ulrich will focus on getting the sh73a0 > drivers/clk bits merged, while I fix up the generic sh73a0 > multiplatform support in parallel. > > Can you make sure the CMT bits get sorted out independently? Ok. So the implication is that I can take this series once you've respun it for the minor #ifdef problem that I pointed out earlier today? Sure, but it can't be entirely independent as the CMT need a clock. I believe there are two options. 1. Add CMT first, using legacy clocks. Then later update it to use CCF. 2. Add CMT after CCF Which to you prefer? -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0001/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-09-04 10:48:28.000000000 +0900 @@ -50,6 +50,11 @@ config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select SYS_SUPPORTS_SH_MTU2 +config ARCH_SH73A0 + bool "SH-Mobile AG5 (R8A73A00)" + select ARCH_RMOBILE + select RENESAS_INTC_IRQPIN + config ARCH_R8A7740 bool "R-Mobile A1 (R8A77400)" select ARCH_RMOBILE --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-09-04 10:48:28.000000000 +0900 @@ -7,7 +7,7 @@ obj-y := timer.o console.o # CPU objects obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o -obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o +obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o @@ -70,7 +70,7 @@ obj-$(CONFIG_MACH_LAGER) += board-lager. obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o -obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o +obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o endif --- 0002/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-09-04 10:59:10.000000000 +0900 @@ -757,7 +757,9 @@ void __init __weak sh73a0_register_twd(v void __init sh73a0_earlytimer_init(void) { sh73a0_init_delay(); +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); +#endif shmobile_earlytimer_init(); sh73a0_register_twd(); } @@ -775,9 +777,10 @@ void __init sh73a0_add_early_devices(voi void __init sh73a0_add_standard_devices_dt(void) { +#ifndef CONFIG_COMMON_CLK /* clocks are setup late during boot in the case of DT */ sh73a0_clock_init(); - +#endif platform_add_devices(sh73a0_devices_dt, ARRAY_SIZE(sh73a0_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);