On 05/06/13 18:07, Jason Cooper wrote:
Sebastian,
Thanks for picking this up! A few comments about merging strategy:
On Mon, May 06, 2013 at 05:33:33PM +0200, Sebastian Hesselbarth wrote:
This patch set picks up work by Florian Fainelli bringing full DT
support to mv643xx_eth and Marvell SoCs using it.
The current patch set drops Florian's device tree conversions for
Kirkwood, Dove, and Orion5x in favour of split patches for board
files and board descriptor files.
Device tree conversion for Dove and Kirkwood is added. Dove has
been fully tested, while Kirkwood is compile-tested only.
Florian Fainelli (2):
net: mv643xx_eth: add Device Tree bindings
net: mv643xx_eth: update Device Tree bindings documentation
Obviously, these will go through -net once the submission window opens.
Sebastian Hesselbarth (5):
(reordered for clarity)
ARM: dove: remove legacy mv643xx_eth setup
ARM: kirkwood: remove legacy mv643xx_eth board setup
ARM: kirkwood: remove legacy clk alias for mv643xx_eth
mvebu/boards or /soc.
ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes
ARM: dove: add gigabit ethernet and mvmdio device tree nodes
mvebu/dt
mvebu/dt and -net are fine. They have no dependencies. The problem is
mvebu/boards. To boot with networking, it needs -net *and* mvebu/dt.
Otherwise, the board needs to do legacy init.
I'd like to attempt to remove this dependency-hell with code. eg some
quick pseudo-code:
if (!dt_node_present("marvell,mv643xx_eth") ||
!mvebu_dt_bindings_present())
kirkwood_ge00_init();
The advantages of figuring this out are:
- *no* branch dependencies
- whole conversion done in one merge window
The drawbacks:
- need to remember to do a follow-on patch if all branches are
successfuly merged, removing the unneeded logic (after -rc1)
- considered churn?
The easy answer is to merge mvebu/dt, and -net, wait one cycle, and
merge the board stuff as you have it now (with Thomas' comment).
If we can figure this out, I'd like to do the same for the kirkwood-pcie
series.
Jason,
I suggest to take the "easy answer", i.e. merge mvebu/dt and -net and
take all board merges one cycle later.
Waiting for -net will stall irqchip but will give us enough time to
add DT timer and get rid of any legacy init code introduced for irqchip.
Also orion5x and mv78x00 can be added to mv643xx_eth conversion.
I am preparing empty board files removal as Thomas suggested.
Sebastian
P.S.: I was hoping that adding all people scripts/get_maintainers.pl
throws out, will notice all kirkwood board users ever committed to
mainline kernel. But as David Miller pointed out, it will not go through
SPAM filters that way. So have an eye open for v4 on mailing lists as
soon as -net merge window re-opens.
_______________________________________________
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
