From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Sat, 17 Oct 2015 15:47:51 +0200 Subject: [U-Boot] [PATCH] arm: sunxi: Add icnova-a20-swac defconfig and dts file In-Reply-To: <1443692504-6421-1-git-send-email-sr@denx.de> References: <1443692504-6421-1-git-send-email-sr@denx.de> Message-ID: <56225187.6030009@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > Cc: Marcus Heuer > Cc: Hans de Goede > Cc: Ian Campbell > --- > 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 > + * > + * 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 > +#include > +#include > + > +/ { > + model = "ICnova-A20 SWAC"; > + compatible = "swac,icnova-a20-swac", "allwinner,sun7i-a20"; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > +}; > + > +&cpu0 { > + cpu-supply = <®_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 = <®_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" > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1450000>; > + regulator-name = "vdd-cpu"; > +}; > + > +®_dcdc3 { > + regulator-always-on; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-int-dll"; > +}; > + > +®_ldo1 { > + regulator-name = "vdd-rtc"; > +}; > + > +®_ldo2 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "avcc"; > +}; > + > +®_usb1_vbus { > + status = "okay"; > +}; > + > +®_usb2_vbus { > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_a>; > + status = "okay"; > +}; > + > +&usbphy { > + usb1_vbus-supply = <®_usb1_vbus>; > + usb2_vbus-supply = <®_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 > S: Maintained > F: configs/Hummingbird_A31_defconfig > > +ICnova-A20-SWAC BOARD > +M: Stefan Roese > +S: Maintained > +F: configs/icnova-a20-swac_defconfig > + > INET 3F BOARD > M: Paul Kocialkowski > 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