[U-Boot] [PATCH v2 7/7] sunxi: Add CHIP support

Sat Oct 17 16:11:46 CEST 2015

Hi,

On 15-10-15 22:04, Maxime Ripard wrote:
> The C.H.I.P. is a small SBC with an Allwinner R8, 8GB of NAND, 512MB of
> RAM, USB host and OTG, a wifi / bluetooth combo chip, an audio/video jack
> and two connectors to plug additional boards on top of it.
>
> The DT is identical to the DT submitted to the upstream kernel.
>
> Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
>   arch/arm/dts/Makefile          |   3 +-
>   arch/arm/dts/sun5i-r8-chip.dts | 214 +++++++++++++++++++++++++++++++++++++++++
>   configs/CHIP_defconfig         |  14 +++
>   3 files changed, 230 insertions(+), 1 deletion(-)
>   create mode 100644 arch/arm/dts/sun5i-r8-chip.dts
>   create mode 100644 configs/CHIP_defconfig
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index fb953ebd53ee..353855317fe0 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -113,7 +113,8 @@ dtb-$(CONFIG_MACH_SUN5I) += \
>   	sun5i-a13-olinuxino.dtb \
>   	sun5i-a13-olinuxino-micro.dtb \
>   	sun5i-a13-q8-tablet.dtb \
> -	sun5i-a13-utoo-p66.dtb
> +	sun5i-a13-utoo-p66.dtb \
> +	sun5i-r8-chip.dtb
>   dtb-$(CONFIG_MACH_SUN6I) += \
>   	sun6i-a31-app4-evb1.dtb \
>   	sun6i-a31-colombus.dtb \
> diff --git a/arch/arm/dts/sun5i-r8-chip.dts b/arch/arm/dts/sun5i-r8-chip.dts
> new file mode 100644
> index 000000000000..abf3ccb1a82c
> --- /dev/null
> +++ b/arch/arm/dts/sun5i-r8-chip.dts
> @@ -0,0 +1,214 @@
> +/*
> + * Copyright 2015 Free Electrons
> + * Copyright 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard at 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 "sun5i-r8.dtsi"
> +#include "sunxi-common-regulators.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +
> +/ {
> +	model = "NextThing C.H.I.P.";
> +	compatible = "nextthing,chip", "allwinner,sun5i-r8";
> +
> +	aliases {
> +		i2c0 = &i2c0;
> +		i2c2 = &i2c2;
> +		serial0 = &uart1;
> +		serial1 = &uart3;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial0:115200n8";
> +	};
> +};
> +
> +&ehci0 {
> +	status = "okay";
> +};
> +
> +&i2c0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c0_pins_a>;
> +	status = "okay";
> +
> +	axp209: pmic at 34 {
> +		reg = <0x34>;
> +
> +		/*
> +		 * The interrupt is routed through the "External Fast
> +		 * Interrupt Request" pin (ball G13 of the module)
> +		 * directly to the main interrupt controller, without
> +		 * any other controller interfering.
> +		 */
> +		interrupts = <0>;
> +	};
> +};
> +
> +#include "axp209.dtsi"
> +
> +&i2c2 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c2_pins_a>;
> +	status = "okay";
> +
> +	xio: gpio at 38 {
> +		compatible = "nxp,pcf8574a";
> +		reg = <0x38>;
> +
> +		gpio-controller;
> +		#gpio-cells = <2>;
> +
> +		interrupt-parent = <&pio>;
> +		interrupts = <6 0 IRQ_TYPE_EDGE_FALLING>;
> +		interrupt-controller;
> +		#interrupt-cells = <2>;
> +	};
> +};
> +
> +&mmc0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc0_pins_a>;
> +	vmmc-supply = <&reg_vcc3v3>;
> +	bus-width = <4>;
> +	non-removable;
> +	status = "okay";
> +};
> +
> +&ohci0 {
> +	status = "okay";
> +};
> +
> +&otg_sram {
> +	status = "okay";
> +};
> +
> +&pio {
> +	chip_vbus_pin: chip_vbus_pin at 0 {
> +		allwinner,pins = "PB10";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	chip_id_det_pin: chip_id_det_pin at 0 {
> +		allwinner,pins = "PG2";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +};
> +
> +&reg_dcdc2 {
> +	regulator-min-microvolt = <1000000>;
> +	regulator-max-microvolt = <1400000>;
> +	regulator-name = "cpuvdd";
> +	regulator-always-on;
> +};
> +
> +&reg_dcdc3 {
> +	regulator-min-microvolt = <1000000>;
> +	regulator-max-microvolt = <1300000>;
> +	regulator-name = "corevdd";
> +	regulator-always-on;
> +};
> +
> +&reg_ldo1 {
> +	regulator-name = "rtcvdd";
> +};
> +
> +&reg_ldo2 {
> +	regulator-min-microvolt = <2700000>;
> +	regulator-max-microvolt = <3300000>;
> +	regulator-name = "avcc";
> +	regulator-always-on;
> +};
> +
> +&reg_ldo5 {
> +	regulator-min-microvolt = <1800000>;
> +	regulator-max-microvolt = <1800000>;
> +	regulator-name = "vcc-1v8";
> +};
> +
> +&reg_usb0_vbus {
> +	pinctrl-0 = <&chip_vbus_pin>;
> +	vin-supply = <&reg_vcc5v0>;
> +	gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
> +	status = "okay";
> +};
> +
> +&uart1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart1_pins_b>;
> +	status = "okay";
> +};
> +
> +&uart3 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&uart3_pins_a>,
> +		    <&uart3_pins_cts_rts_a>;
> +	status = "okay";
> +};
> +
> +&usb_otg {
> +	dr_mode = "otg";
> +	status = "okay";
> +};
> +
> +&usb_power_supply {
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&chip_id_det_pin>;
> +	status = "okay";
> +
> +	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
> +	usb0_vbus_power-supply = <&usb_power_supply>;
> +	usb0_vbus-supply = <&reg_usb0_vbus>;
> +	usb1_vbus-supply = <&reg_vcc5v0>;
> +};
> diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
> new file mode 100644
> index 000000000000..db5a59fbe9ee
> --- /dev/null
> +++ b/configs/CHIP_defconfig
> @@ -0,0 +1,14 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN5I=y
> +CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
> +# CONFIG_MMC is not set
> +CONFIG_USB0_VBUS_PIN="PB10"
> +CONFIG_DEFAULT_DEVICE_TREE="sun5i-r8-chip"
> +CONFIG_SPL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"

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.

Other then that I've merged the entire series into u-boot-sunxi/next
(will push as soon as my build-all-boards test has completed).

Regards,

Hans