[U-Boot] [PATCH 1/2] sunxi: axp221: Allow specifying dcdc2 voltage via Kconfig

[U-Boot] [PATCH 1/2] sunxi: axp221: Allow specifying dcdc2 voltage via Kconfig

[Hans de Goede]

Allow specifying the axp221 dcdc2 voltage via Kconfig, this is necessary
because on some boards the 1.2V default does not work reliable.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/board.c   | 2 +-
 drivers/power/Kconfig | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index f85e825..680523a 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -437,7 +437,7 @@ void sunxi_board_init(void)
 #ifdef CONFIG_AXP221_POWER
 	power_failed = axp221_init();
 	power_failed |= axp221_set_dcdc1(CONFIG_AXP221_DCDC1_VOLT);
-	power_failed |= axp221_set_dcdc2(1200); /* A31:VDD-GPU, A23:VDD-SYS */
+	power_failed |= axp221_set_dcdc2(CONFIG_AXP221_DCDC2_VOLT);
 	power_failed |= axp221_set_dcdc3(1200); /* VDD-CPU */
 #ifdef CONFIG_MACH_SUN6I
 	power_failed |= axp221_set_dcdc4(1200); /* A31:VDD-SYS */
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 23cdd71..df5e373 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -22,6 +22,15 @@ config AXP221_DCDC1_VOLT
 	things like GPIO-s, sdcard interfaces, etc. On most boards this is
 	undervolted to 3.0V to safe battery.
 
+config AXP221_DCDC2_VOLT
+	int "axp221 dcdc2 voltage"
+	depends on AXP221_POWER
+	default 1200
+	---help---
+	Set the voltage (mV) to program the axp221 dcdc2 at, set to 0 to
+	disable dcdc2. On A31 boards this is typically used for VDD-GPU,
+	on A23/A33 for VDD-SYS, this should normally be set to 1.2V.
+
 config AXP221_DLDO1_VOLT
 	int "axp221 dldo1 voltage"
 	depends on AXP221_POWER
-- 
2.4.3

[U-Boot] [PATCH 2/2] sunxi: Add support for gt90h-v4 tablets

[Hans de Goede]

The gt90h is a pcb found in generic 9" tablets with an A23 soc, 1G RAM
and 8G nand, rtl8723as usb wifi, 1 micro usb port and 1 micro sd slot.

The pmic setup on this board is somewhat special, dcdc2 MUST be set
to 1.1V instead of the usual 1.2V otherwise the board is very unstable.
aldo1 is used to power the micro sd slot, dldo1 is used for wifi.

This commit adds a defconfig + dts (as submitted to the kernel) for
the gt90h-v4 pcb.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/dts/Makefile               |   1 +
 arch/arm/dts/sun8i-a23-gt90h-v4.dts | 145 ++++++++++++++++++++++++++++++++++++
 configs/gt90h_v4_defconfig          |  26 +++++++
 3 files changed, 172 insertions(+)
 create mode 100644 arch/arm/dts/sun8i-a23-gt90h-v4.dts
 create mode 100644 configs/gt90h_v4_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index d9a2f5f..a9ad4e7 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -133,6 +133,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-yones-toptech-bd1078.dtb
 dtb-$(CONFIG_MACH_SUN8I_A23) += \
 	sun8i-a23-evb.dtb \
+	sun8i-a23-gt90h-v4.dtb \
 	sun8i-a23-ippo-q8h-v5.dtb \
 	sun8i-a23-ippo-q8h-v1.2.dtb
 dtb-$(CONFIG_MACH_SUN8I_A33) += \
diff --git a/arch/arm/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
new file mode 100644
index 0000000..1aeb06c
--- /dev/null
+++ b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2015 Hans de Goede <hdegoede@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-a23.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 GT90H Quad Core Tablet (v4)";
+	compatible = "allwinner,gt90h-v4", "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_gt90h>;
+	/* FIXME this really is aldo1, correct once we've pmic support */
+	vmmc-supply = <&reg_vcc3v0>;
+	bus-width = <4>;
+	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
+	cd-inverted;
+	status = "okay";
+};
+
+&pio {
+	mmc0_cd_pin_gt90h: 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";
+};
+
+/*
+ * FIXME for now we only support host mode and rely on u-boot to have
+ * turned on Vbus which is controlled by the axp223 pmic on the board.
+ *
+ * Once we have axp223 support we should switch to fully supporting otg.
+ */
+&usb_otg {
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usbphy {
+	status = "okay";
+};
diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
new file mode 100644
index 0000000..3b72dc2
--- /dev/null
+++ b/configs/gt90h_v4_defconfig
@@ -0,0 +1,26 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_A23=y
+CONFIG_DRAM_CLK=480
+CONFIG_DRAM_ZQ=32767
+CONFIG_MMC0_CD_PIN="PB4"
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
+CONFIG_USB0_ID_DET="PH8"
+CONFIG_AXP_GPIO=y
+CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:55000,le:159,ri:160,up:22,lo:12,hs:1,vs:1,sync:3,vmode:0"
+CONFIG_VIDEO_LCD_DCLK_PHASE=0
+CONFIG_VIDEO_LCD_POWER="PH7"
+CONFIG_VIDEO_LCD_BL_EN="PH6"
+CONFIG_VIDEO_LCD_BL_PWM="PH0"
+CONFIG_USB_MUSB_HOST=y
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-gt90h-v4"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_AXP221_DCDC2_VOLT=1100
+CONFIG_AXP221_DLDO1_VOLT=3300
+CONFIG_AXP221_ALDO1_VOLT=3000
-- 
2.4.3

[U-Boot] [PATCH 2/2] sunxi: Add support for gt90h-v4 tablets

[Hans de Goede]

Hi,

On 14-08-15 16:52, Hans de Goede wrote:
> The gt90h is a pcb found in generic 9" tablets with an A23 soc, 1G RAM
> and 8G nand, rtl8723as usb wifi, 1 micro usb port and 1 micro sd slot.
>
> The pmic setup on this board is somewhat special, dcdc2 MUST be set
> to 1.1V instead of the usual 1.2V otherwise the board is very unstable.
> aldo1 is used to power the micro sd slot, dldo1 is used for wifi.
>
> This commit adds a defconfig + dts (as submitted to the kernel) for
> the gt90h-v4 pcb.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>   arch/arm/dts/Makefile               |   1 +
>   arch/arm/dts/sun8i-a23-gt90h-v4.dts | 145 ++++++++++++++++++++++++++++++++++++
>   configs/gt90h_v4_defconfig          |  26 +++++++
>   3 files changed, 172 insertions(+)
>   create mode 100644 arch/arm/dts/sun8i-a23-gt90h-v4.dts
>   create mode 100644 configs/gt90h_v4_defconfig

Gah, and I've forgotten about updating MAINTAINERS again, fixed in
my personal tree.

Regards,

Hans


>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index d9a2f5f..a9ad4e7 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -133,6 +133,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>   	sun7i-a20-yones-toptech-bd1078.dtb
>   dtb-$(CONFIG_MACH_SUN8I_A23) += \
>   	sun8i-a23-evb.dtb \
> +	sun8i-a23-gt90h-v4.dtb \
>   	sun8i-a23-ippo-q8h-v5.dtb \
>   	sun8i-a23-ippo-q8h-v1.2.dtb
>   dtb-$(CONFIG_MACH_SUN8I_A33) += \
> diff --git a/arch/arm/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
> new file mode 100644
> index 0000000..1aeb06c
> --- /dev/null
> +++ b/arch/arm/dts/sun8i-a23-gt90h-v4.dts
> @@ -0,0 +1,145 @@
> +/*
> + * Copyright 2015 Hans de Goede <hdegoede@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-a23.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 GT90H Quad Core Tablet (v4)";
> +	compatible = "allwinner,gt90h-v4", "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_gt90h>;
> +	/* FIXME this really is aldo1, correct once we've pmic support */
> +	vmmc-supply = <&reg_vcc3v0>;
> +	bus-width = <4>;
> +	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
> +	cd-inverted;
> +	status = "okay";
> +};
> +
> +&pio {
> +	mmc0_cd_pin_gt90h: 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";
> +};
> +
> +/*
> + * FIXME for now we only support host mode and rely on u-boot to have
> + * turned on Vbus which is controlled by the axp223 pmic on the board.
> + *
> + * Once we have axp223 support we should switch to fully supporting otg.
> + */
> +&usb_otg {
> +	dr_mode = "host";
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	status = "okay";
> +};
> diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
> new file mode 100644
> index 0000000..3b72dc2
> --- /dev/null
> +++ b/configs/gt90h_v4_defconfig
> @@ -0,0 +1,26 @@
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN8I_A23=y
> +CONFIG_DRAM_CLK=480
> +CONFIG_DRAM_ZQ=32767
> +CONFIG_MMC0_CD_PIN="PB4"
> +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
> +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
> +CONFIG_USB0_ID_DET="PH8"
> +CONFIG_AXP_GPIO=y
> +CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:55000,le:159,ri:160,up:22,lo:12,hs:1,vs:1,sync:3,vmode:0"
> +CONFIG_VIDEO_LCD_DCLK_PHASE=0
> +CONFIG_VIDEO_LCD_POWER="PH7"
> +CONFIG_VIDEO_LCD_BL_EN="PH6"
> +CONFIG_VIDEO_LCD_BL_PWM="PH0"
> +CONFIG_USB_MUSB_HOST=y
> +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-gt90h-v4"
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_SPL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
> +# CONFIG_CMD_IMLS is not set
> +# CONFIG_CMD_FLASH is not set
> +# CONFIG_CMD_FPGA is not set
> +CONFIG_AXP221_DCDC2_VOLT=1100
> +CONFIG_AXP221_DLDO1_VOLT=3300
> +CONFIG_AXP221_ALDO1_VOLT=3000
>

[U-Boot] [PATCH 1/2] sunxi: axp221: Allow specifying dcdc2 voltage via Kconfig

[Ian Campbell]

On Fri, 2015-08-14 at 16:52 +0200, Hans de Goede wrote:
> Allow specifying the axp221 dcdc2 voltage via Kconfig, this is 
> necessary
> because on some boards the 1.2V default does not work reliable.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

I wonder if we ought to just do them all and get it over with?

[U-Boot] [PATCH 2/2] sunxi: Add support for gt90h-v4 tablets

[Ian Campbell]

On Fri, 2015-08-14 at 16:55 +0200, Hans de Goede wrote:
> Hi,
> 
> On 14-08-15 16:52, Hans de Goede wrote:
> > The gt90h is a pcb found in generic 9" tablets with an A23 soc, 1G 
> RAM
> > and 8G nand, rtl8723as usb wifi, 1 micro usb port and 1 micro sd 
> slot.
> >
> > The pmic setup on this board is somewhat special, dcdc2 MUST be set
> > to 1.1V instead of the usual 1.2V otherwise the board is very 
> unstable.
> > aldo1 is used to power the micro sd slot, dldo1 is used for wifi.
> >
> > This commit adds a defconfig + dts (as submitted to the kernel) for
> > the gt90h-v4 pcb.
> >
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> > ---
> >   arch/arm/dts/Makefile               |   1 +
> >   arch/arm/dts/sun8i-a23-gt90h-v4.dts | 145 
> ++++++++++++++++++++++++++++++++++++
> >   configs/gt90h_v4_defconfig          |  26 +++++++
> >   3 files changed, 172 insertions(+)
> >   create mode 100644 arch/arm/dts/sun8i-a23-gt90h-v4.dts
> >   create mode 100644 configs/gt90h_v4_defconfig
> 
> Gah, and I've forgotten about updating MAINTAINERS again, fixed in
> my personal tree.

With that:
    Acked-by: Ian Campbell <ijc@hellion.org.uk>