On 01/09/2014 19:38, Nicolas Ferre : > Arnd, Olof, Kevin, > > A little bit more material for the DT branch. I didn't want to the one I've > just sent you because this material is not related to the big cleanup > addressed > by previous 3 pull-requests. > It is very basic and simple DT updates and a use of phy fixup infrastructure > that is now present in phy subsystem. > > Thanks, best regards, > > The following changes since commit 464d6e18639c4347dafd8dbcee270674dd3d8fba: > > Merge tag 'at91-dt-for-3.17' of > git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux (2014-08-19 > 16:04:10 -0500) > > are available in the git repository at: > > > git://github.com/at91linux/linux-at91.git tags/at91-dt2
FYI, I've just pushed a branch to show the conflict resolution while merging this tag with the tree previous pull-requests: https://github.com/at91linux/linux-at91/commits/at91-3.18-resolved or: git://github.com/at91linux/linux-at91.git at91-3.18-resolved Best regards, > for you to fetch changes up to 5f8157309624929e05ece846d3ca8a3a64988378: > > ARM: at91: remove phy fixup for sama5d3xek boards (2014-09-01 19:30:44 > +0200) > > ---------------------------------------------------------------- > Second batch of AT91 DT patches for 3.18: > - 2 little fixes for at91sam9x5 and at91sam9n12ek > - removal of a board specific hook for sama5d3xek about phy fixup > replaced with proper DT property definition. > > ---------------------------------------------------------------- > Alexandre Belloni (1): > ARM: at91/dt: sam9x5: fix ADC compatible string > > Bo Shen (1): > ARM: at91/dt: sam9n12ek: ohci: add port and vbus property > > Boris BREZILLON (2): > ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards > ARM: at91: remove phy fixup for sama5d3xek boards > > arch/arm/boot/dts/at91sam9n12ek.dts | 2 ++ > arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- > arch/arm/boot/dts/sama5d3xcm.dtsi | 30 ++++++++++++++++++++++++++++++ > arch/arm/mach-at91/board-dt-sama5.c | 22 ---------------------- > 4 files changed, 33 insertions(+), 23 deletions(-) > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
