On Sat, Sep 1, 2012 at 8:41 PM, Arnd Bergmann <[email protected]> wrote: > On Saturday 01 September 2012, Linus Walleij wrote: >> diff --git a/arch/arm/boot/dts/integratorcp.dts >> b/arch/arm/boot/dts/integratorcp.dts >> +/ { >> + model = "ARM Integrator/CP"; >> + compatible = "arm,integrator-cp"; >> + ranges; >> + >> + aliases { >> + arm,integrator-clocksource = &timer2; >> + arm,integrator-clockevent = &timer1; >> + }; > > It looks like this file is almost a direct superset of the integratorap.dts > file. How about including the other file from here and just adding the > extra nodes and overriding the few bits that are actually different?
Isn't it more apropriate to create an integrator.dtsi for the common stuff and include that into integratorap.dts and integratorcp.dts? >> +#ifdef CONFIG_OF >> + > ... >> +DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)") >> + .reserve = integrator_reserve, >> + .map_io = ap_map_io, >> + .nr_irqs = NR_IRQS_INTEGRATOR_AP, >> + .init_early = ap_init_early, >> + .init_irq = ap_init_irq_of, >> + .handle_irq = fpga_handle_irq, >> + .timer = &ap_of_timer, >> + .init_machine = ap_init, >> + .restart = integrator_restart, >> + .dt_compat = ap_dt_board_compat, >> +MACHINE_END >> + >> +#else >> + > ... >> MACHINE_START(INTEGRATOR, "ARM-Integrator") >> /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ >> .atag_offset = 0x100, >> @@ -486,3 +571,5 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator") >> .init_machine = ap_init, >> .restart = integrator_restart, >> MACHINE_END >> + >> +#endif > > I think we discussed this before. It would be nice to replace the #if/#else > with > > #ifdef CONFIG_OF > ... > #endif > #ifdef CONFIG_ATAG > ... > #endif Sure, have you applied Nico's patch adding CONFIG_ATAG to and ARM SoC branch so I can base my patches on it? I was under the impression that his patch would go through Russell's tree and I would thus not be able to rely on it until it has landed there and you have pulled Russell's stuff into your tree. Currently I would make it impossible to use ATAGs if I do this since the symbol does not exist, so I really need to base such an approach in a tree which has CONFIG_ATAG in the first place. Yours, Linus Walleij _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
