| Message ID | 87k3l8v9s1.fsf@natisbad.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/03/2013 01:09 AM, Arnaud Ebalard wrote: > Hi Sebastian, > > Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> writes: > >> With DT support for mv643xx_eth board specific init for some boards now >> is unneccessary. Remove those board files, Kconfig entries, and >> corresponding entries in kirkwood_defconfig. > > Applying above your set an old quilt cleaning patch Jason asked at some > point, it became empty except for arch/arm/mach_kirkwood/common.h in > which some declarations were left behind. If this is correct, can you > just merge the hunks below in your 5/7 in next round? > > AFAICT, only dnskw_init() remains, which matches the list of board-*.c > files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). Arnaud, thanks for sending this! I will squash it into v6 and send a v7 of this patch. Looks like ARM SoC pull request causes some issues with Russell's tree, so there is plenty of time left to resend (and re-test :)) And you are right, only board-dt.c and board-dnskw.c remain in mach-kirkwood. With irqchip/clocksource patches in, IMHO kirkwood is quite ready for mach-mvebu. mach-dove is still missing DT pcie, and I haven't had any success to get my hands on a board with pcie to test, yet. Sebastian > Signed-off-by: Arnaud Ebalard<arno@natisbad.org> > --- > arch/arm/mach-kirkwood/common.h | 108 ---------------------------------------- > 1 file changed, 108 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h > index 1c09f3f..1cbdd2b 100644 > --- a/arch/arm/mach-kirkwood/common.h > +++ b/arch/arm/mach-kirkwood/common.h > @@ -57,26 +57,6 @@ void kirkwood_restart(char, const char *); > void kirkwood_clk_init(void); > > /* board init functions for boards not fully converted to fdt */ > -#ifdef CONFIG_MACH_DREAMPLUG_DT > -void dreamplug_init(void); > -#else > -static inline void dreamplug_init(void) {}; > -#endif > -#ifdef CONFIG_MACH_GURUPLUG_DT > -void guruplug_dt_init(void); > -#else > -static inline void guruplug_dt_init(void) {}; > -#endif > -#ifdef CONFIG_MACH_SHEEVAPLUG_DT > -void sheevaplug_dt_init(void); > -#else > -static inline void sheevaplug_dt_init(void) {}; > -#endif > -#ifdef CONFIG_MACH_TS219_DT > -void qnap_dt_ts219_init(void); > -#else > -static inline void qnap_dt_ts219_init(void) {}; > -#endif > > #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT > void dnskw_init(void); > @@ -84,94 +64,6 @@ void dnskw_init(void); > static inline void dnskw_init(void) {}; > #endif > > -#ifdef CONFIG_MACH_ICONNECT_DT > -void iconnect_init(void); > -#else > -static inline void iconnect_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_IB62X0_DT > -void ib62x0_init(void); > -#else > -static inline void ib62x0_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_DOCKSTAR_DT > -void dockstar_dt_init(void); > -#else > -static inline void dockstar_dt_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_GOFLEXNET_DT > -void goflexnet_init(void); > -#else > -static inline void goflexnet_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_LSXL_DT > -void lsxl_init(void); > -#else > -static inline void lsxl_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT > -void iomega_ix2_200_init(void); > -#else > -static inline void iomega_ix2_200_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_KM_KIRKWOOD_DT > -void km_kirkwood_init(void); > -#else > -static inline void km_kirkwood_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_DB88F628X_BP_DT > -void db88f628x_init(void); > -#else > -static inline void db88f628x_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_MPLCEC4_DT > -void mplcec4_init(void); > -#else > -static inline void mplcec4_init(void) {}; > -#endif > - > -#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \ > - defined(CONFIG_MACH_NETSPACE_V2_DT) || \ > - defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \ > - defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \ > - defined(CONFIG_MACH_NETSPACE_MINI_V2_DT) > -void ns2_init(void); > -#else > -static inline void ns2_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT > -void openblocks_a6_init(void); > -#else > -static inline void openblocks_a6_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_READYNAS_DT > -void netgear_readynas_init(void); > -#else > -static inline void netgear_readynas_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_TOPKICK_DT > -void usi_topkick_init(void); > -#else > -static inline void usi_topkick_init(void) {}; > -#endif > - > -#ifdef CONFIG_MACH_CLOUDBOX_DT > -void cloudbox_init(void); > -#else > -static inline void cloudbox_init(void) {}; > -#endif > - > /* early init functions not converted to fdt yet */ > char *kirkwood_id(void); > void kirkwood_l2_init(void);
On 07/03/13 01:09, Arnaud Ebalard wrote: > Hi Sebastian, > > Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes: > >> With DT support for mv643xx_eth board specific init for some boards now >> is unneccessary. Remove those board files, Kconfig entries, and >> corresponding entries in kirkwood_defconfig. > > Applying above your set an old quilt cleaning patch Jason asked at some > point, it became empty except for arch/arm/mach_kirkwood/common.h in > which some declarations were left behind. If this is correct, can you > just merge the hunks below in your 5/7 in next round? > > AFAICT, only dnskw_init() remains, which matches the list of board-*.c > files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). While updating the patch with yours, I stumbled upon MACH_TS219_DT that also remains because it includes tsx1x-common.c. I cannot recall if Jason or Andrew said something about removing it.. Sebastian
On Wed, Jul 03, 2013 at 01:31:47PM +0200, Sebastian Hesselbarth wrote: > On 07/03/13 01:09, Arnaud Ebalard wrote: > >Hi Sebastian, > > > >Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes: > > > >>With DT support for mv643xx_eth board specific init for some boards now > >>is unneccessary. Remove those board files, Kconfig entries, and > >>corresponding entries in kirkwood_defconfig. > > > >Applying above your set an old quilt cleaning patch Jason asked at some > >point, it became empty except for arch/arm/mach_kirkwood/common.h in > >which some declarations were left behind. If this is correct, can you > >just merge the hunks below in your 5/7 in next round? > > > >AFAICT, only dnskw_init() remains, which matches the list of board-*.c > >files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). > > While updating the patch with yours, I stumbled upon MACH_TS219_DT that > also remains because it includes tsx1x-common.c. > > I cannot recall if Jason or Andrew said something about removing it.. board-ts219.c can be removed as well. It needed a check for running on the 6282 variant in order to set the phy address properly. This can now be handled in kirkwood-ts219-628[12].dts. thx, Jason.
On Wed, Jul 03, 2013 at 01:31:47PM +0200, Sebastian Hesselbarth wrote: > On 07/03/13 01:09, Arnaud Ebalard wrote: > >Hi Sebastian, > > > >Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes: > > > >>With DT support for mv643xx_eth board specific init for some boards now > >>is unneccessary. Remove those board files, Kconfig entries, and > >>corresponding entries in kirkwood_defconfig. > > > >Applying above your set an old quilt cleaning patch Jason asked at some > >point, it became empty except for arch/arm/mach_kirkwood/common.h in > >which some declarations were left behind. If this is correct, can you > >just merge the hunks below in your 5/7 in next round? > > > >AFAICT, only dnskw_init() remains, which matches the list of board-*.c > >files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). > > While updating the patch with yours, I stumbled upon MACH_TS219_DT that > also remains because it includes tsx1x-common.c. Oh yeah, that line can be removed as well. It was originally included for qnap_tsx1x_power_off(). This was replaced by e8fc721 power/reset: Add a new driver to turn QNAP board power off thx, Jason.
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 1c09f3f..1cbdd2b 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -57,26 +57,6 @@ void kirkwood_restart(char, const char *); void kirkwood_clk_init(void); /* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_DREAMPLUG_DT -void dreamplug_init(void); -#else -static inline void dreamplug_init(void) {}; -#endif -#ifdef CONFIG_MACH_GURUPLUG_DT -void guruplug_dt_init(void); -#else -static inline void guruplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_SHEEVAPLUG_DT -void sheevaplug_dt_init(void); -#else -static inline void sheevaplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_TS219_DT -void qnap_dt_ts219_init(void); -#else -static inline void qnap_dt_ts219_init(void) {}; -#endif #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT void dnskw_init(void); @@ -84,94 +64,6 @@ void dnskw_init(void); static inline void dnskw_init(void) {}; #endif -#ifdef CONFIG_MACH_ICONNECT_DT -void iconnect_init(void); -#else -static inline void iconnect_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IB62X0_DT -void ib62x0_init(void); -#else -static inline void ib62x0_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DOCKSTAR_DT -void dockstar_dt_init(void); -#else -static inline void dockstar_dt_init(void) {}; -#endif - -#ifdef CONFIG_MACH_GOFLEXNET_DT -void goflexnet_init(void); -#else -static inline void goflexnet_init(void) {}; -#endif - -#ifdef CONFIG_MACH_LSXL_DT -void lsxl_init(void); -#else -static inline void lsxl_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT -void iomega_ix2_200_init(void); -#else -static inline void iomega_ix2_200_init(void) {}; -#endif - -#ifdef CONFIG_MACH_KM_KIRKWOOD_DT -void km_kirkwood_init(void); -#else -static inline void km_kirkwood_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DB88F628X_BP_DT -void db88f628x_init(void); -#else -static inline void db88f628x_init(void) {}; -#endif - -#ifdef CONFIG_MACH_MPLCEC4_DT -void mplcec4_init(void); -#else -static inline void mplcec4_init(void) {}; -#endif - -#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MINI_V2_DT) -void ns2_init(void); -#else -static inline void ns2_init(void) {}; -#endif - -#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT -void openblocks_a6_init(void); -#else -static inline void openblocks_a6_init(void) {}; -#endif - -#ifdef CONFIG_MACH_READYNAS_DT -void netgear_readynas_init(void); -#else -static inline void netgear_readynas_init(void) {}; -#endif - -#ifdef CONFIG_MACH_TOPKICK_DT -void usi_topkick_init(void); -#else -static inline void usi_topkick_init(void) {}; -#endif - -#ifdef CONFIG_MACH_CLOUDBOX_DT -void cloudbox_init(void); -#else -static inline void cloudbox_init(void) {}; -#endif - /* early init functions not converted to fdt yet */ char *kirkwood_id(void); void kirkwood_l2_init(void);