[PATCH v2] ARM: dts: Convert Linkstation Mini to Device Tree
benoar at dolka.fr
Mon Jul 27 13:11:33 PDT 2015
Le samedi 25 juillet 2015 à 16:01 +0200, Gregory CLEMENT a écrit :
> On 18/07/2015 20:52, Andrew Lunn wrote:
> > On Tue, Jul 14, 2015 at 04:54:01PM +0200, Benjamin Cama wrote:
> > > The name of the file better reflects the manufacturer's device name
> > > (LS-WSGL) than the original (lsmini), which exists in a kirkwood version
> > > too.
> > >
> > > Signed-off-by: Benjamin Cama <benoar at dolka.fr>
> > > ---
> > > Alexey, Thomas,
> > >
> > > I need your approval to change the license, as Jason and Andrew
> > > suggested using dual licensing. Do you agree with it?
> > >
> > > The changes since the first version are:
> > > * the license change;
> > > * the more precise attribution to Alexey;
> > > * gpio keys are now named, even if I find them not to be the good ones;
> > > at least they fit with the old numbers and the recently submitted
> > > LS-WSXL scheme;
> > > * added "earlyprintk" to the command-line
> > >
> > > I did not rename the leds to be like LS-WSXL, as they are a bit
> > > different. I also did not take time to look at the NOR flash layout to
> > > separate uboot from the config (that must be all there is in these
> > > 256KB).
> > >
> > > Hope the patch is OK like that. Sorry for the long delay, I spent quite
> > > some time on the IRQ0 fix, and did not have so much of it lately???
> > >
> > > arch/arm/boot/dts/Makefile | 3 +-
> > > arch/arm/boot/dts/orion5x-lswsgl.dts | 276 ++++++++++++++++++++++++++++++++++
> > > arch/arm/mach-orion5x/Kconfig | 6 +-
> > > arch/arm/mach-orion5x/lsmini-setup.c | 280 -----------------------------------
> > > 4 files changed, 281 insertions(+), 284 deletions(-)
> > > create mode 100644 arch/arm/boot/dts/orion5x-lswsgl.dts
> > > delete mode 100644 arch/arm/mach-orion5x/lsmini-setup.c
> > >
> > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > > index 992736b..bd5ad2f 100644
> > > --- a/arch/arm/boot/dts/Makefile
> > > +++ b/arch/arm/boot/dts/Makefile
> > > @@ -441,7 +441,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
> > > > > > > > > orion5x-lacie-d2-network.dtb \
> > > > > > > > > orion5x-lacie-ethernet-disk-mini-v2.dtb \
> > > > > > > > > orion5x-maxtor-shared-storage-2.dtb \
> > > -> > > > > > orion5x-rd88f5182-nas.dtb
> > > +> > > > > > orion5x-rd88f5182-nas.dtb \
> > > +> > > > > > orion5x-lswsgl.dtb
> > Hi Benjamin
> > Please keep these in alphabetical order.
> > Other than that:
> > Acked-by: Andrew Lunn <andrew at lunn.ch>
> With the Acked-by from Andrew Lunn I am ready to apply your patch.
> However for the device tree I need the acked-by from Thomas Petazzoni but I
> am sure he will give it as he already agreed for the armada-*.dts* files.
> I am not sure we need the formal acked-by from Alexey because the dts is
> not based on a dts written by him.
It's just that I took all the devices definition from his .c; to me, it
counts as derived work, but IANAL.
> When you will send the v3 with the alphabetical order fixed and the acked-by
> from Thomas Petazzoni I will apply it on the mvebu branches.
> In this v3, could you also remove the reference to lsmini-setup.o in
> arch/arm/mach-orion5x/Makefile ?
Yes, I spotted that lately.
Still, I am struggling with some more mistakes: the kernel boot with
everything included, but for some reason it cannot boot with an initrd.
At first, I got an “INITRD: […] overlaps in-use memory region -
disabling initrd” that disappeared when removing the memory node from
the dts. But I cannot reproduce it since, and now I sometimes get told
that the initrd is corrupt, sometimes it isn't taken into account… my
way of tweaking my configs and not being strict enough in keeping them
around leads to a nightmare tracking this problem.
I now learned that I need CONFIG_ARM_ATAG_DTB_COMPAT to get the
bootloader command-line and initrd address, but sometimes it mess with
my setup. I have very weird behavior regarding console output
(sometimes working, sometimes only with earlyprintk) and options around
dtb/ATAGS. I am trying to sort this out.
BTW, during orion5x conversion to DT (for boards that support it),
tag_fixup_mem32 was lost. It should not be needed as
arch/arm/boot/compressed/atags_to_fdt.c:atags_to_fdt ditches zero-sized
memory banks, and mines don't have anything above PAGE_MASK, but maybe
it happens on some strange boards. I noticed it while looking at my
overlapping memory regions bug.
More information about the linux-arm-kernel