[U-Boot] [PATCH] arm: sunxi: Add icnova-a20-swac defconfig and dts file

[Hans de Goede <hdegoede@redhat.com>]

Hi,

On 19-10-15 12:48, Stefan Roese wrote:
> Hi Maxime,
>
> On 18.10.2015 11:34, Maxime Ripard wrote:
>>> On 01-10-15 11:41, Stefan Roese wrote:
>>>> The ICnova-A20-SWAC is a baseboard, equipped with the ICnova-A20 SoM from
>>>> In-Circuit:
>>>>
>>>> http://wiki.in-circuit.de/index.php5?title=ICnova_A20_SODIMM
>>>> http://linux-sunxi.org/In-Circuit_ICnova_A20
>>>>
>>>> This patch adds support for this board, including ethernet, LCD and USB
>>>> support.
>>>
>>> Thanks, I've merged this and it will show up in u-boot-sunxi/next soon.
>>>
>>> I've made 2 small changes, see comments inline.
>>>
>>>> Signed-off-by: Stefan Roese <sr@denx.de>
>>>> Cc: Marcus Heuer <marcus.heuer@swac.de>
>>>> Cc: Hans de Goede <hdegoede@redhat.com>
>>>> Cc: Ian Campbell <ijc@hellion.org.uk>
>>>> ---
>>>>   arch/arm/dts/Makefile                      |   1 +
>>>>   arch/arm/dts/sun7i-a20-icnova-a20-swac.dts | 177 +++++++++++++++++++++++++++++
>>>>   board/sunxi/MAINTAINERS                    |   5 +
>>>>   configs/icnova-a20-swac_defconfig          |  21 ++++
>>>>   4 files changed, 204 insertions(+)
>>>>   create mode 100644 arch/arm/dts/sun7i-a20-icnova-a20-swac.dts
>>>>   create mode 100644 configs/icnova-a20-swac_defconfig
>>>>
>>>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>>>> index 5f10243..1f2661c 100644
>>>> --- a/arch/arm/dts/Makefile
>>>> +++ b/arch/arm/dts/Makefile
>>>> @@ -134,6 +134,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>>>>       sun7i-a20-cubietruck.dtb \
>>>>       sun7i-a20-hummingbird.dtb \
>>>>       sun7i-a20-i12-tvbox.dtb \
>>>> +    sun7i-a20-icnova-a20-swac.dtb \
>>>>       sun7i-a20-m3.dtb \
>>>>       sun7i-a20-m5.dtb \
>>>>       sun7i-a20-mk808c.dtb \
>>>> diff --git a/arch/arm/dts/sun7i-a20-icnova-a20-swac.dts b/arch/arm/dts/sun7i-a20-icnova-a20-swac.dts
>>>> new file mode 100644
>>>
>>> Please submit this file also to the upstream kernel.
>>
>> Yes. The name of the DT especially doesn't really make sense. The
>> "SWAC" name isn't referenced anywhere, the module cannot be used
>> alone, and there's a single combination available (A20 SODIMM +
>> ADB4006)
>
> At least one other combination is available. A custom board from SWAC
> equipped with the SoM. What is the preferred method to support SoM's
> with multiple baseboards? Something like:
>
> sun7i-a20-icnova.dtsi
> sun7i-a20-icnova-adb4006.dts
> sun7i-a20-icnova-swac.dts
>
> ?
>
>>>
>>>> index 0000000..773fb6f
>>>> --- /dev/null
>>>> +++ b/arch/arm/dts/sun7i-a20-icnova-a20-swac.dts
>>>> @@ -0,0 +1,177 @@
>>>> +/*
>>>> + * Copyright 2013 Maxime Ripard
>>>> + *
>>>> + * Maxime Ripard <maxime.ripard@free-electrons.com>
>>
>> And I'm *not* the copyright owner here.
>
> Okay. Hans, do you want me to change this (and potential other
> changes as well - see file naming above) via a follow-up patch
> once its available in mainline U-Boot?

Actually I would prefer to get this right in one go, esp. the
filename bits, having u-boot and the kernel disagreeing on the
dtb filename is no good. So I plan to remove this version of
the patch from u-boot-sunxi/next for now. Once you and Maxime
agree on a dts / dtb filename please submit a new version and
I'll merge that one instead.

Regards,

Hans