[U-Boot] [PATCH 4/4] sunxi: Add a proper dts file for the ga10h a33 based tablet

[Hans de Goede]

Hi,

On 02-06-15 22:10, Hans de Goede wrote:
> Add and use a proper dts for the ga10h a33 based tablet, as
> submitted upstream.

Note this just got accepted upstream.

Regards,

Hans


>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>   arch/arm/dts/Makefile                 |   1 +
>   arch/arm/dts/sun8i-a33-ga10h-v1.1.dts | 142 ++++++++++++++++++++++++++++++++++
>   configs/ga10h_v1_1_defconfig          |   2 +-
>   3 files changed, 144 insertions(+), 1 deletion(-)
>   create mode 100644 arch/arm/dts/sun8i-a33-ga10h-v1.1.dts
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 501fe77..7c9043f 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -127,6 +127,7 @@ dtb-$(CONFIG_MACH_SUN8I_A23) += \
>   	sun8i-a23-ippo-q8h-v1.2.dtb
>   dtb-$(CONFIG_MACH_SUN8I_A33) += \
>   	sun8i-a33-et-q8-v1.6.dtb \
> +	sun8i-a33-ga10h-v1.1.dtb \
>   	sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dtb
>   dtb-$(CONFIG_MACH_SUN9I) += \
>   	sun9i-a80-optimus.dtb \
> diff --git a/arch/arm/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/dts/sun8i-a33-ga10h-v1.1.dts
> new file mode 100644
> index 0000000..1aefc67
> --- /dev/null
> +++ b/arch/arm/dts/sun8i-a33-ga10h-v1.1.dts
> @@ -0,0 +1,142 @@
> +/*
> + * Copyright 2015 Hans de Goede <hdegoede at redhat.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 "sun8i-a33.dtsi"
> +#include "sunxi-common-regulators.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/pinctrl/sun4i-a10.h>
> +
> +/ {
> +	model = "Allwinner GA10H Quad Core Tablet (v1.1)";
> +	compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33";
> +
> +	aliases {
> +		serial0 = &r_uart;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial0:115200n8";
> +	};
> +};
> +
> +&ehci0 {
> +	status = "okay";
> +};
> +
> +&i2c0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c0_pins_a>;
> +	status = "okay";
> +};
> +
> +&i2c1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c1_pins_a>;
> +	status = "okay";
> +};
> +
> +&lradc {
> +	vref-supply = <&reg_vcc3v0>;
> +	status = "okay";
> +
> +	button at 200 {
> +		label = "Volume Up";
> +		linux,code = <KEY_VOLUMEUP>;
> +		channel = <0>;
> +		voltage = <200000>;
> +	};
> +
> +	button at 400 {
> +		label = "Volume Down";
> +		linux,code = <KEY_VOLUMEDOWN>;
> +		channel = <0>;
> +		voltage = <400000>;
> +	};
> +
> +	button at 600 {
> +		label = "Back";
> +		linux,code = <KEY_BACK>;
> +		channel = <0>;
> +		voltage = <600000>;
> +	};
> +};
> +
> +&mmc0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>;
> +	vmmc-supply = <&reg_vcc3v0>;
> +	bus-width = <4>;
> +	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
> +	cd-inverted;
> +	status = "okay";
> +};
> +
> +&ohci0 {
> +	status = "okay";
> +};
> +
> +&pio {
> +	mmc0_cd_pin_q8h: mmc0_cd_pin at 0 {
> +		allwinner,pins = "PB4";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +	};
> +};
> +
> +&r_uart {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&r_uart_pins_a>;
> +	status = "okay";
> +};
> +
> +&usb_otg {
> +	dr_mode = "host";
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	status = "okay";
> +};
> diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
> index 73aa5ae..13f3fb4 100644
> --- a/configs/ga10h_v1_1_defconfig
> +++ b/configs/ga10h_v1_1_defconfig
> @@ -4,7 +4,7 @@
>   # This defconfig is for the v1.1 pcb with an a33 soc.
>   CONFIG_SPL=y
>   CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
> -CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
> +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
>   CONFIG_USB_MUSB_SUNXI=y
>   CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
>   CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
>