diff mbox

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

Message ID 1443692504-6421-1-git-send-email-sr@denx.de
State Accepted
Delegated to: Hans de Goede
Headers show

Commit Message

Stefan Roese Oct. 1, 2015, 9:41 a.m. UTC
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.

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

Comments

Hans de Goede Oct. 17, 2015, 1:47 p.m. UTC | #1
Hi,

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.

> 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>
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + *  a) This file is free software; you can redistribute it and/or
> + *     modify it under the terms of the GNU General Public License as
> + *     published by the Free Software Foundation; either version 2 of the
> + *     License, or (at your option) any later version.
> + *
> + *     This file is distributed in the hope that it will be useful,
> + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *     GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + *  b) Permission is hereby granted, free of charge, to any person
> + *     obtaining a copy of this software and associated documentation
> + *     files (the "Software"), to deal in the Software without
> + *     restriction, including without limitation the rights to use,
> + *     copy, modify, merge, publish, distribute, sublicense, and/or
> + *     sell copies of the Software, and to permit persons to whom the
> + *     Software is furnished to do so, subject to the following
> + *     conditions:
> + *
> + *     The above copyright notice and this permission notice shall be
> + *     included in all copies or substantial portions of the Software.
> + *
> + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + *     OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/dts-v1/;
> +#include "sun7i-a20.dtsi"
> +#include "sunxi-common-regulators.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/pinctrl/sun4i-a10.h>
> +
> +/ {
> +	model = "ICnova-A20 SWAC";
> +	compatible = "swac,icnova-a20-swac", "allwinner,sun7i-a20";
> +
> +	aliases {
> +		serial0 = &uart0;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial0:115200n8";
> +	};
> +};
> +
> +&cpu0 {
> +	cpu-supply = <&reg_dcdc2>;
> +};
> +
> +&ehci0 {
> +	status = "okay";
> +};
> +
> +&ehci1 {
> +	status = "okay";
> +};
> +
> +&gmac {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&gmac_pins_mii_a>;
> +	phy = <&phy1>;
> +	phy-mode = "mii";
> +	status = "okay";
> +
> +	phy1: ethernet-phy@1 {
> +		reg = <1>;
> +	};
> +};
> +
> +&i2c0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c0_pins_a>;
> +	status = "okay";
> +
> +	axp209: pmic@34 {
> +		reg = <0x34>;
> +		interrupt-parent = <&nmi_intc>;
> +		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +	};
> +};
> +
> +&i2c1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c1_pins_a>;
> +	status = "okay";
> +};
> +
> +&ir0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&ir0_rx_pins_a>;
> +	status = "okay";
> +};
> +
> +&mmc0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
> +	vmmc-supply = <&reg_vcc3v3>;
> +	bus-width = <4>;
> +	cd-gpios = <&pio 8 5 GPIO_ACTIVE_HIGH>; /* PI5 */
> +	cd-inverted;
> +	status = "okay";
> +};
> +
> +&ohci0 {
> +	status = "okay";
> +};
> +
> +&ohci1 {
> +	status = "okay";
> +};
> +
> +#include "axp209.dtsi"
> +
> +&reg_dcdc2 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <1000000>;
> +	regulator-max-microvolt = <1450000>;
> +	regulator-name = "vdd-cpu";
> +};
> +
> +&reg_dcdc3 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <1000000>;
> +	regulator-max-microvolt = <1400000>;
> +	regulator-name = "vdd-int-dll";
> +};
> +
> +&reg_ldo1 {
> +	regulator-name = "vdd-rtc";
> +};
> +
> +&reg_ldo2 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "avcc";
> +};
> +
> +&reg_usb1_vbus {
> +	status = "okay";
> +};
> +
> +&reg_usb2_vbus {
> +	status = "okay";
> +};
> +
> +&uart0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart0_pins_a>;
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	usb1_vbus-supply = <&reg_usb1_vbus>;
> +	usb2_vbus-supply = <&reg_usb2_vbus>;
> +	status = "okay";
> +};
> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
> index 8f95867..c60fda5 100644
> --- a/board/sunxi/MAINTAINERS
> +++ b/board/sunxi/MAINTAINERS
> @@ -112,6 +112,11 @@ M:	Chen-Yu Tsai <wens@csie.org>
>   S:	Maintained
>   F:	configs/Hummingbird_A31_defconfig
>
> +ICnova-A20-SWAC BOARD
> +M:	Stefan Roese <sr@denx.de>
> +S:	Maintained
> +F:	configs/icnova-a20-swac_defconfig
> +
>   INET 3F BOARD
>   M:	Paul Kocialkowski <contact@paulk.fr>
>   S:	Maintained
> diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
> new file mode 100644
> index 0000000..bd6e0c5
> --- /dev/null
> +++ b/configs/icnova-a20-swac_defconfig
> @@ -0,0 +1,21 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN7I=y
> +CONFIG_DRAM_CLK=384
> +CONFIG_OLD_SUNXI_KERNEL_COMPAT=y

I've dropped this, I understand that you need it, but I do not believe that
ANY defconfig's as shipped upstream should set this.

> +CONFIG_MMC0_CD_PIN="PI5"
> +CONFIG_USB0_VBUS_PIN="PG11"
> +CONFIG_USB0_VBUS_DET="PH7"
> +CONFIG_USB1_VBUS_PIN="PG10"
> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0"
> +CONFIG_VIDEO_LCD_POWER="PH22"
> +CONFIG_VIDEO_LCD_PANEL_LVDS=y
> +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-swac"
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_SPL=y
> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"

I've dropped AXP209_POWER from these, in u-boot-sunxi/next this has been
turned into a Kconfig bool which is enabled by default on sun7i.

> +# CONFIG_CMD_IMLS is not set
> +# CONFIG_CMD_FLASH is not set
> +# CONFIG_CMD_FPGA is not set
> +CONFIG_ETH_DESIGNWARE=y
> +CONFIG_USB_EHCI_HCD=y

Regards,

Hans
Maxime Ripard Oct. 18, 2015, 9:34 a.m. UTC | #2
On Sat, Oct 17, 2015 at 03:47:51PM +0200, Hans de Goede wrote:
> Hi,
> 
> 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)

> 
> >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.

Maxime
Stefan Roese Oct. 19, 2015, 10:38 a.m. UTC | #3
Hi Hans,

On 17.10.2015 15:47, Hans de Goede 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.

Thanks.

> I've made 2 small changes, see comments inline.

<snip>

>> diff --git a/configs/icnova-a20-swac_defconfig
>> b/configs/icnova-a20-swac_defconfig
>> new file mode 100644
>> index 0000000..bd6e0c5
>> --- /dev/null
>> +++ b/configs/icnova-a20-swac_defconfig
>> @@ -0,0 +1,21 @@
>> +CONFIG_ARM=y
>> +CONFIG_ARCH_SUNXI=y
>> +CONFIG_MACH_SUN7I=y
>> +CONFIG_DRAM_CLK=384
>> +CONFIG_OLD_SUNXI_KERNEL_COMPAT=y
>
> I've dropped this, I understand that you need it, but I do not believe that
> ANY defconfig's as shipped upstream should set this.

Hmmm. I would prefer to have this added to the defconfig as well.
As it very likely leads to confusion when updating to a newer
U-Boot version which will not support the old kernel. Why not give
the users / maintainers the freedom to choose this for themselves?

>> +CONFIG_MMC0_CD_PIN="PI5"
>> +CONFIG_USB0_VBUS_PIN="PG11"
>> +CONFIG_USB0_VBUS_DET="PH7"
>> +CONFIG_USB1_VBUS_PIN="PG10"
>> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0"
>>
>> +CONFIG_VIDEO_LCD_POWER="PH22"
>> +CONFIG_VIDEO_LCD_PANEL_LVDS=y
>> +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-swac"
>> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>> +CONFIG_SPL=y
>> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"
>
> I've dropped AXP209_POWER from these, in u-boot-sunxi/next this has been
> turned into a Kconfig bool which is enabled by default on sun7i.

Understood.

Thanks,
Stefan
Stefan Roese Oct. 19, 2015, 10:38 a.m. UTC | #4
Hi Hans,

On 17.10.2015 15:47, Hans de Goede 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.

Thanks.

> I've made 2 small changes, see comments inline.

<snip>

>> diff --git a/configs/icnova-a20-swac_defconfig
>> b/configs/icnova-a20-swac_defconfig
>> new file mode 100644
>> index 0000000..bd6e0c5
>> --- /dev/null
>> +++ b/configs/icnova-a20-swac_defconfig
>> @@ -0,0 +1,21 @@
>> +CONFIG_ARM=y
>> +CONFIG_ARCH_SUNXI=y
>> +CONFIG_MACH_SUN7I=y
>> +CONFIG_DRAM_CLK=384
>> +CONFIG_OLD_SUNXI_KERNEL_COMPAT=y
>
> I've dropped this, I understand that you need it, but I do not believe that
> ANY defconfig's as shipped upstream should set this.

Hmmm. I would prefer to have this added to the defconfig as well.
As it very likely leads to confusion when updating to a newer
U-Boot version which will not support the old kernel. Why not give
the users / maintainers the freedom to choose this for themselves?

>> +CONFIG_MMC0_CD_PIN="PI5"
>> +CONFIG_USB0_VBUS_PIN="PG11"
>> +CONFIG_USB0_VBUS_DET="PH7"
>> +CONFIG_USB1_VBUS_PIN="PG10"
>> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0"
>>
>> +CONFIG_VIDEO_LCD_POWER="PH22"
>> +CONFIG_VIDEO_LCD_PANEL_LVDS=y
>> +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-swac"
>> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>> +CONFIG_SPL=y
>> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"
>
> I've dropped AXP209_POWER from these, in u-boot-sunxi/next this has been
> turned into a Kconfig bool which is enabled by default on sun7i.

Understood.

Thanks,
Stefan
Stefan Roese Oct. 19, 2015, 10:48 a.m. UTC | #5
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?

Thanks,
Stefan
Hans de Goede Oct. 19, 2015, 11:42 a.m. UTC | #6
Hi,

On 19-10-15 12:38, Stefan Roese wrote:
> Hi Hans,
>
> On 17.10.2015 15:47, Hans de Goede 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.
>
> Thanks.
>
>> I've made 2 small changes, see comments inline.
>
> <snip>
>
>>> diff --git a/configs/icnova-a20-swac_defconfig
>>> b/configs/icnova-a20-swac_defconfig
>>> new file mode 100644
>>> index 0000000..bd6e0c5
>>> --- /dev/null
>>> +++ b/configs/icnova-a20-swac_defconfig
>>> @@ -0,0 +1,21 @@
>>> +CONFIG_ARM=y
>>> +CONFIG_ARCH_SUNXI=y
>>> +CONFIG_MACH_SUN7I=y
>>> +CONFIG_DRAM_CLK=384
>>> +CONFIG_OLD_SUNXI_KERNEL_COMPAT=y
>>
>> I've dropped this, I understand that you need it, but I do not believe that
>> ANY defconfig's as shipped upstream should set this.
>
> Hmmm. I would prefer to have this added to the defconfig as well.
> As it very likely leads to confusion when updating to a newer
> U-Boot version which will not support the old kernel. Why not give
> the users / maintainers the freedom to choose this for themselves?

Users are free to choose this, they can always enable this themselves
after running make foo_defconfig.

As for why not give the MAINTAINERS a choice on this, as said
I believe that we should not shipp defconfigs with this set by default
as part of mainline u-boot. The reasons for this are:

1) It is inconsistent with what we are doing for all other sunxi boards
where we are primarily targetting mainline

2) It communicates that CONFIG_OLD_SUNXI_KERNEL_COMPAT is an officially
supported end-user feature, where as in reality it is targeted at developers
who need to run an old sunxi kernel every now and then to see how that
kernel exactly programs certain registers, etc.

3) It means we ship with a severely crippled defconfig for mainline kernel
users, mainline users will loose both smp and hyp mode support on the A20
when this option is set.

I'm sorry but I'm not going to budge on this one, having
CONFIG_OLD_SUNXI_KERNEL_COMPAT=y in a defconfig is simply not acceptable
IMHO. It is not a board specific thing, and there are very good reasons
why it defaults to n in board/sunxi/Kconfig

>>> +CONFIG_MMC0_CD_PIN="PI5"
>>> +CONFIG_USB0_VBUS_PIN="PG11"
>>> +CONFIG_USB0_VBUS_DET="PH7"
>>> +CONFIG_USB1_VBUS_PIN="PG10"
>>> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0"
>>>
>>> +CONFIG_VIDEO_LCD_POWER="PH22"
>>> +CONFIG_VIDEO_LCD_PANEL_LVDS=y
>>> +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-swac"
>>> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>>> +CONFIG_SPL=y
>>> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"
>>
>> I've dropped AXP209_POWER from these, in u-boot-sunxi/next this has been
>> turned into a Kconfig bool which is enabled by default on sun7i.
>
> Understood.
>
> Thanks,
> Stefan

Regards,

Hans
Hans de Goede Oct. 19, 2015, 11:44 a.m. UTC | #7
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
Stefan Roese Oct. 19, 2015, 11:53 a.m. UTC | #8
Hi Hans,

On 19.10.2015 13:44, Hans de Goede wrote:

<snip>

>>>>> 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.

Sure. Lets do it this way.

Thanks,
Stefan
Ian Campbell Oct. 20, 2015, 8:05 a.m. UTC | #9
On Mon, 2015-10-19 at 13:42 +0200, Hans de Goede wrote:
> 
> I'm sorry but I'm not going to budge on this one, having
> CONFIG_OLD_SUNXI_KERNEL_COMPAT=y in a defconfig is simply not acceptable
> IMHO. It is not a board specific thing, and there are very good reasons
> why it defaults to n in board/sunxi/Kconfig

Agreed.

Ian.
Ian Campbell Oct. 20, 2015, 8:06 a.m. UTC | #10
On Mon, 2015-10-19 at 13:44 +0200, Hans de Goede wrote:
> > 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.

Wasn't our policy supposed to be that we (u-boot) would only take DTS
files which were at least on their way to mainline Linux (i.e. in
Maxime's tree)?

Ian.
Maxime Ripard Oct. 21, 2015, 2:31 p.m. UTC | #11
On Mon, Oct 19, 2015 at 12:48:35PM +0200, 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.

Ah, my bad then. I was under the impression that you were adding
support for the SoM + ADB4006. Sorry.

> 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
> 
> ?

Yep, that would make much more sense. I have an ADB4006 here, so I can
do that one if you want, but we should totally split the common part
in a DTSI.

Maxime
Stefan Roese Oct. 21, 2015, 2:44 p.m. UTC | #12
Hi Maxime,

On 21.10.2015 16:31, Maxime Ripard wrote:
>> 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.
>
> Ah, my bad then. I was under the impression that you were adding
> support for the SoM + ADB4006. Sorry.

No problem.

>> 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
>>
>> ?
>
> Yep, that would make much more sense. I have an ADB4006 here, so I can
> do that one if you want, but we should totally split the common part
> in a DTSI.

Okay. I'll try to find some time tomorrow to split this and send
you a first version for Linux this time. Since I don't have the
ADB4006 baseboard it would be great if you could step in here.

Thanks,
Stefan
Maxime Ripard Oct. 22, 2015, 7:57 a.m. UTC | #13
On Wed, Oct 21, 2015 at 04:44:00PM +0200, Stefan Roese wrote:
> >>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
> >>
> >>?
> >
> >Yep, that would make much more sense. I have an ADB4006 here, so I can
> >do that one if you want, but we should totally split the common part
> >in a DTSI.
> 
> Okay. I'll try to find some time tomorrow to split this and send
> you a first version for Linux this time. Since I don't have the
> ADB4006 baseboard it would be great if you could step in here.

That can come as a second step, but yep, let's do it this way.

Thanks!
Maxime
diff mbox

Patch

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
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>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
+
+/ {
+	model = "ICnova-A20 SWAC";
+	compatible = "swac,icnova-a20-swac", "allwinner,sun7i-a20";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
+&ehci0 {
+	status = "okay";
+};
+
+&ehci1 {
+	status = "okay";
+};
+
+&gmac {
+	pinctrl-names = "default";
+	pinctrl-0 = <&gmac_pins_mii_a>;
+	phy = <&phy1>;
+	phy-mode = "mii";
+	status = "okay";
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+	};
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp209: pmic@34 {
+		reg = <0x34>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
+};
+
+&ir0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&ir0_rx_pins_a>;
+	status = "okay";
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	cd-gpios = <&pio 8 5 GPIO_ACTIVE_HIGH>; /* PI5 */
+	cd-inverted;
+	status = "okay";
+};
+
+&ohci0 {
+	status = "okay";
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+#include "axp209.dtsi"
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1450000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+	regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "avcc";
+};
+
+&reg_usb1_vbus {
+	status = "okay";
+};
+
+&reg_usb2_vbus {
+	status = "okay";
+};
+
+&uart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins_a>;
+	status = "okay";
+};
+
+&usbphy {
+	usb1_vbus-supply = <&reg_usb1_vbus>;
+	usb2_vbus-supply = <&reg_usb2_vbus>;
+	status = "okay";
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 8f95867..c60fda5 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -112,6 +112,11 @@  M:	Chen-Yu Tsai <wens@csie.org>
 S:	Maintained
 F:	configs/Hummingbird_A31_defconfig
 
+ICnova-A20-SWAC BOARD
+M:	Stefan Roese <sr@denx.de>
+S:	Maintained
+F:	configs/icnova-a20-swac_defconfig
+
 INET 3F BOARD
 M:	Paul Kocialkowski <contact@paulk.fr>
 S:	Maintained
diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
new file mode 100644
index 0000000..bd6e0c5
--- /dev/null
+++ b/configs/icnova-a20-swac_defconfig
@@ -0,0 +1,21 @@ 
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y
+CONFIG_DRAM_CLK=384
+CONFIG_OLD_SUNXI_KERNEL_COMPAT=y
+CONFIG_MMC0_CD_PIN="PI5"
+CONFIG_USB0_VBUS_PIN="PG11"
+CONFIG_USB0_VBUS_DET="PH7"
+CONFIG_USB1_VBUS_PIN="PG10"
+CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0"
+CONFIG_VIDEO_LCD_POWER="PH22"
+CONFIG_VIDEO_LCD_PANEL_LVDS=y
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-swac"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,CMD_BMP,CMD_UNZIP"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_USB_EHCI_HCD=y