Skip to contentSkip to conversation

arm: sunxi: Add icnova-a20-swac defconfig and dts file

PATCH New Stefan Roese 4 participants 14 messages Oct 1, 2015 – Oct 22, 2015

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Stefan Roese

author
#0 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

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 <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +177 -0

177 lines not on this page · raw message

board/sunxi/MAINTAINERS +5 -0
index 8f95867..c60fda5 100644
@@ -112,6 +112,11 @@ M:	Chen-Yu Tsai <[email protected]>
 S:	Maintained
 F:	configs/Hummingbird_A31_defconfig
 
+ICnova-A20-SWAC BOARD
+M:	Stefan Roese <[email protected]>
+S:	Maintained
+F:	configs/icnova-a20-swac_defconfig
+
 INET 3F BOARD
 M:	Paul Kocialkowski <[email protected]>
 S:	Maintained
configs/icnova-a20-swac_defconfig new file +21 -0
new file mode 100644
index 0000000..bd6e0c5
@@ -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
Signature · 1 line
2.5.3
#1 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi,

Quoted 8 lines · Stefan Roese

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.

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 27 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
  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

arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
new file mode 100644

Please submit this file also to the upstream kernel.

Quoted 203 lines

index 0000000..773fb6f

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +177 -0
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <[email protected]>
+ *
+ * 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 at 1 {
+		reg = <1>;
+	};
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp209: pmic at 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";
+};
board/sunxi/MAINTAINERS +5 -0
index 8f95867..c60fda5 100644
@@ -112,6 +112,11 @@ M:	Chen-Yu Tsai <[email protected]>
  S:	Maintained
  F:	configs/Hummingbird_A31_defconfig
 
+ICnova-A20-SWAC BOARD
+M:	Stefan Roese <[email protected]>
+S:	Maintained
+F:	configs/icnova-a20-swac_defconfig
+
  INET 3F BOARD
  M:	Paul Kocialkowski <[email protected]>
  S:	Maintained
configs/icnova-a20-swac_defconfig new file +0 -0
new file mode 100644
index 0000000..bd6e0c5

configs/icnova-a20-swac_defconfig line 5

Quoted 5 lines
configs/icnova-a20-swac_defconfig new file +5 -0
@@ -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.

configs/icnova-a20-swac_defconfig line 16

Quoted 11 lines
configs/icnova-a20-swac_defconfig new file +11 -0
+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.

configs/icnova-a20-swac_defconfig line 21

Quoted 5 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+# 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

#2 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Quoted 29 lines · Hans de Goede

Hi,

Quoted 8 lines · Stefan Roese

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.

Quoted 13 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
 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
Quoted 16 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 14 lines
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
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)

Quoted 9 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts line 4

Quoted 9 lines

index 0000000..773fb6f

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +4 -0
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <[email protected]>

And I'm *not* the copyright owner here.

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151018/aef0992b/attachment.sig>
author
#3 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi Maxime,

Quoted 44 lines · Maxime Ripard
Quoted 27 lines · Stefan Roese
Quoted 8 lines

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.

Quoted 13 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
  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

Quoted 16 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 14 lines
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
new file mode 100644

Please submit this file also to the upstream kernel.

Quoted 4 lines

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

?

Quoted 11 lines
Quoted 9 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts line 4

Quoted 9 lines

index 0000000..773fb6f

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +4 -0
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <[email protected]>

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

#4 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi,

Quoted 74 lines · Stefan Roese

Hi Maxime,

Quoted 44 lines · Maxime Ripard
Quoted 27 lines · Stefan Roese
Quoted 8 lines

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.

Quoted 13 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
  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

Quoted 16 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 14 lines
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
new file mode 100644

Please submit this file also to the upstream kernel.

Quoted 4 lines

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

?

Quoted 11 lines
Quoted 9 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts line 4

Quoted 9 lines

index 0000000..773fb6f

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +4 -0
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <[email protected]>

And I'm *not* the copyright owner here.

Quoted 3 lines

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

author
#5 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi Hans,

On 19.10.2015 13:44, Hans de Goede wrote:

<snip>

Quoted 37 lines
Quoted 33 lines
Quoted 10 lines
Quoted 5 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 3 lines
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
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

?

Quoted 11 lines
Quoted 9 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts line 4

Quoted 9 lines

index 0000000..773fb6f

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +4 -0
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <[email protected]>

And I'm *not* the copyright owner here.

Quoted 3 lines

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?

Quoted 6 lines

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

#6 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

In reply to Hans de Goede
Quoted 10 lines · Hans de Goede
Quoted 3 lines

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.

#7 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

In reply to Stefan Roese
Quoted 47 lines · Stefan Roese

Hi Maxime,

Quoted 44 lines · Maxime Ripard
Quoted 43 lines · Stefan Roese
Quoted 8 lines

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.

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 27 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
 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
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
new file mode 100644

Please submit this file also to the upstream kernel.

Quoted 7 lines
Quoted 4 lines

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.

Quoted 8 lines

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

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151021/1bf7e222/attachment.sig>
author
#8 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi Maxime,

Quoted 50 lines · Maxime Ripard
Quoted 50 lines · Maxime Ripard
Quoted 48 lines
Quoted 27 lines · Stefan Roese
Quoted 8 lines

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.

Quoted 13 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Marcus Heuer <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Ian Campbell <[email protected]>
---
  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

Quoted 16 lines

arch/arm/dts/sun7i-a20-icnova-a20-swac.dts

Quoted 14 lines
arch/arm/dts/Makefile +1 -0
index 5f10243..1f2661c 100644
@@ -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 \
arch/arm/dts/sun7i-a20-icnova-a20-swac.dts new file +0 -0
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)

Quoted 5 lines
Quoted 2 lines

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.

Quoted 7 lines
Quoted 7 lines

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

Quoted 5 lines
Quoted 1 line

?

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

#9 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Quoted 9 lines · Stefan Roese
Quoted 9 lines
Quoted 8 lines

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

?

Quoted 7 lines
Quoted 3 lines

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

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151022/0bfb82c1/attachment.sig>
author
#10 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

In reply to Hans de Goede

Hi Hans,

Quoted 11 lines · Hans de Goede
Quoted 8 lines · Stefan Roese

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.

Quoted 1 line

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

<snip>

Quoted 7 lines
Quoted 7 lines
configs/icnova-a20-swac_defconfig new file +0 -0
new file mode 100644
index 0000000..bd6e0c5
@@ -0,0 +1,21 @@
Quoted 8 lines

configs/icnova-a20-swac_defconfig line 5

Quoted 5 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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?

Quoted 6 lines
Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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"
Quoted 9 lines

configs/icnova-a20-swac_defconfig line 16

Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +6 -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

#11 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Hi,

Quoted 37 lines · Stefan Roese

Hi Hans,

Quoted 11 lines · Hans de Goede
Quoted 8 lines · Stefan Roese

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.

Quoted 1 line

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

<snip>

Quoted 7 lines
Quoted 7 lines
configs/icnova-a20-swac_defconfig new file +0 -0
new file mode 100644
index 0000000..bd6e0c5
@@ -0,0 +1,21 @@
Quoted 8 lines

configs/icnova-a20-swac_defconfig line 5

Quoted 5 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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.

Quoted 4 lines

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

Quoted 16 lines
Quoted 6 lines
Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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"
Quoted 9 lines

configs/icnova-a20-swac_defconfig line 16

Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +6 -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.

Quoted 4 lines

Understood.

Thanks,
Stefan

Regards,

Hans

#12 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

Quoted 5 lines · Hans de Goede

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.

author
#13 lore raw

PATCH 1/1 arm: sunxi: Add icnova-a20-swac defconfig and dts file

In reply to Hans de Goede

Hi Hans,

Quoted 11 lines · Hans de Goede
Quoted 8 lines · Stefan Roese

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.

Quoted 1 line

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

<snip>

Quoted 7 lines
Quoted 7 lines
configs/icnova-a20-swac_defconfig new file +0 -0
new file mode 100644
index 0000000..bd6e0c5
@@ -0,0 +1,21 @@
Quoted 8 lines

configs/icnova-a20-swac_defconfig line 5

Quoted 5 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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?

Quoted 6 lines
Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +5 -0
+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"
Quoted 9 lines

configs/icnova-a20-swac_defconfig line 16

Quoted 6 lines
configs/icnova-a20-swac_defconfig new file +6 -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