ARM: dt: sunxi: Add Itead Ibox support
Subsystems (2)
v2 cover ARM: dt: sunxi: Add Itead Ibox support
From: Marcus Cooper <[email protected]>
This patch delivers the uboot changes required for the Itead Ibox A20. As there are a few Itead variants out there based on their A10/A20 core module; I have created a common dtsi for all of them.
I've also converted the A10 Itead Iteaduino dts to use this common file. BR,
CK
---
Changes since v1:
- removed enabling of codec as it's not needed and the dtsi doesn't include it
---
Marcus Cooper (2):
sun7i: Add support for the Itead Ibox
sun4i: Convert Iteadunio plus dts
arch/arm/dts/Makefile | 1 + arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts | 86 +-------------- arch/arm/dts/sun7i-a20-itead-ibox.dts | 121 +++++++++++++++++++++ arch/arm/dts/sunxi-itead-core-common.dtsi | 136 ++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 + configs/Itead_Ibox_A20_defconfig | 16 +++ 6 files changed, 281 insertions(+), 84 deletions(-) create mode 100644 arch/arm/dts/sun7i-a20-itead-ibox.dts create mode 100644 arch/arm/dts/sunxi-itead-core-common.dtsi create mode 100644 configs/Itead_Ibox_A20_defconfig
Signature · 1 line
2.7.3
PATCH v2 1/2 sun7i: Add support for the Itead Ibox
From: Marcus Cooper <[email protected]>
Add dts and defconfig for the multi board device based on the Allwinner A20 SoC. It contains the A20 Itead Core module and a base board for the external interfaces.
The core module comes with 4GB NAND and 1GB DDR RAM. As this is a generic design which has also been used on a A10 board then a common core dtsi file is included.
The base board to which the core board is connected provides 3 USB 2.0 Host ports, 1 USB 2.0 OTG, 1 uSD slot, 10/100 Ethernet port, HDMI, IR receiver, SPDIF and a 32-pin GPIO header. This header expands the features of core board by exposing the VGA pins, audio In/Out pins, SATA, SPI, I2C, UARTS, USB-OTG and power..
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun7i-a20-itead-ibox.dts | 121 ++++++++++++++++++++++++++ arch/arm/dts/sunxi-itead-core-common.dtsi | 136 ++++++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/Itead_Ibox_A20_defconfig | 16 ++++ 5 files changed, 279 insertions(+) create mode 100644 arch/arm/dts/sun7i-a20-itead-ibox.dts create mode 100644 arch/arm/dts/sunxi-itead-core-common.dtsi create mode 100644 configs/Itead_Ibox_A20_defconfig
arch/arm/dts/Makefile +1 -0
@@ -162,6 +162,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-itead-ibox.dtb \ sun7i-a20-lamobo-r1.dtb \ sun7i-a20-m3.dtb \ sun7i-a20-m5.dtb \
arch/arm/dts/sun7i-a20-itead-ibox.dts new file +121 -0
121 lines not on this page · raw message
arch/arm/dts/sunxi-itead-core-common.dtsi new file +136 -0
136 lines not on this page · raw message
board/sunxi/MAINTAINERS +5 -0
@@ -112,6 +112,11 @@ M: Chen-Yu Tsai <[email protected]> S: Maintained F: configs/Hummingbird_A31_defconfig +ITEAD IBOX BOARD +M: Marcus Cooper <[email protected]> +S: Maintained +F: configs/Itead_Ibox_A20_defconfig + INET 3F BOARD M: Paul Kocialkowski <[email protected]> S: Maintained
configs/Itead_Ibox_A20_defconfig new file +16 -0
@@ -0,0 +1,16 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)" +#CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)" +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_USB_EHCI_HCD=y
Signature · 1 line
2.7.3
PATCH v2 1/2 sun7i: Add support for the Itead Ibox
Hi,
Quoted 10 lines · codekipper at gmail.com
From: Marcus Cooper <[email protected]>
Add dts and defconfig for the multi board device based on the Allwinner A20 SoC. It contains the A20 Itead Core module and a base board for the external interfaces.
The core module comes with 4GB NAND and 1GB DDR RAM. As this is a generic design which has also been used on a A10 board then a common core dtsi file is included.
Quoted 7 lines
The base board to which the core board is connected provides 3 USB 2.0 Host ports, 1 USB 2.0 OTG, 1 uSD slot, 10/100 Ethernet port, HDMI, IR receiver, SPDIF and a 32-pin GPIO header. This header expands the features of core board by exposing the VGA pins, audio In/Out pins, SATA, SPI, I2C, UARTS, USB-OTG and power..
Signed-off-by Marcus Cooper <[email protected]>
Thanks, since my sunxi-wip branch already contains a commit syncing all the sunxi u-boot dts files with the upstream kernel, the dts file bits are not needed.
I've merged this patch without the dts file bits. This also means that your second patch is not needed.
Regards,
Hans
Quoted 331 lines
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun7i-a20-itead-ibox.dts | 121 ++++++++++++++++++++++++++ arch/arm/dts/sunxi-itead-core-common.dtsi | 136 ++++++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/Itead_Ibox_A20_defconfig | 16 ++++ 5 files changed, 279 insertions(+)create mode 100644
arch/arm/dts/sun7i-a20-itead-ibox.dtscreate mode 100644arch/arm/dts/sunxi-itead-core-common.dtsicreate mode 100644 configs/Itead_Ibox_A20_defconfigarch/arm/dts/Makefile +1
-0@@ -162,6 +162,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-itead-ibox.dtb \ sun7i-a20-lamobo-r1.dtb \ sun7i-a20-m3.dtb \ sun7i-a20-m5.dtb \arch/arm/dts/sun7i-a20-itead-ibox.dts new file +121
-0@@ -0,0 +1,121 @@ +/* + * Copyright 2015 - Marcus Cooper <[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-itead-core-common.dtsi" + +/ { + model = "Itead Ibox A20"; + compatible = "itead,itead-ibox-a20", "allwinner,sun7i-a20"; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_itead_core>; + + green { + label = "itead_core:green:usr"; + gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + + blue { + label = "itead_core:blue:usr"; + gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; +}; + +&ahci { + target-supply = <®_ahci_5v>; + 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 { + axp209: pmic at 34 { + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + }; +}; + +&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 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ + cd-inverted; + status = "okay"; +}; + +&pio { + led_pins_itead_core: led_pins at 0 { + allwinner,pins = "PH20","PH21"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_20_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +®_ahci_5v { + status = "okay"; +};arch/arm/dts/sunxi-itead-core-common.dtsi new file +136
-0@@ -0,0 +1,136 @@ +/* + * Copyright 2015 - Marcus Cooper <[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. + */ + +#include "sunxi-common-regulators.dtsi" + +/ { + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_a>; + status = "okay"; + + axp209: pmic at 34 { + reg = <0x34>; + }; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_a>; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +#include "axp209.dtsi" + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + 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"; +};board/sunxi/MAINTAINERS +5
-0@@ -112,6 +112,11 @@ M: Chen-Yu Tsai <[email protected]> S: Maintained F: configs/Hummingbird_A31_defconfig +ITEAD IBOX BOARD +M: Marcus Cooper <[email protected]> +S: Maintained +F: configs/Itead_Ibox_A20_defconfig + INET 3F BOARD M: Paul Kocialkowski <[email protected]> S: Maintainedconfigs/Itead_Ibox_A20_defconfig new file +16
-0@@ -0,0 +1,16 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)" +#CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)" +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_USB_EHCI_HCD=y
PATCH v2 2/2 sun4i: Convert Iteadunio plus dts
In reply to codekipper at gmail.comFrom: Marcus Cooper <[email protected]>
The delivery of the Itead Ibox A20 contained a common include dtsi file for the core module which this Itead Iteadunio Plus uses.
This patch modifies the dts to use this include dtsi.
--- arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts | 86 +------------------------ 1 file changed, 2 insertions(+), 84 deletions(-)
arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts +2 -84
@@ -1,5 +1,6 @@ /* * Copyright 2015 Josef Gajdusek <[email protected]> + * Copyright 2015 - Marcus Cooper <[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
@@ -42,22 +43,11 @@ /dts-v1/; #include "sun4i-a10.dtsi" -#include "sunxi-common-regulators.dtsi" - -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/pinctrl/sun4i-a10.h> +#include "sunxi-itead-core-common.dtsi" / { model = "Iteaduino Plus A10"; compatible = "itead,iteaduino-plus-a10", "allwinner,sun4i-a10"; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; }; &ahci {
@@ -65,18 +55,6 @@ status = "okay"; }; -&cpu0 { - cpu-supply = <®_dcdc2>; -}; - -&ehci0 { - status = "okay"; -}; - -&ehci1 { - status = "okay"; -}; - &emac { pinctrl-names = "default"; pinctrl-0 = <&emac_pins_a>;
@@ -89,12 +67,7 @@ }; &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - status = "okay"; - axp209: pmic at 34 { - reg = <0x34>; interrupts = <0>; }; };
@@ -135,68 +108,13 @@ status = "okay"; }; -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - ®_ahci_5v { 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"; -}; - &spi0 { pinctrl-names = "default"; pinctrl-0 = <&spi0_pins_a>, <&spi0_cs0_pins_a>; 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"; -};
Signature · 1 line
2.7.3