diff mbox

[v4,4/4] ARM: dts: sun6i: Add dts file for MSI Primo81 tablet

Message ID 1445572241-13259-5-git-send-email-wens@csie.org (mailing list archive)
State New, archived
Headers show

Commit Message

Chen-Yu Tsai Oct. 23, 2015, 3:50 a.m. UTC
From: Karsten Merker <merker@debian.org>

The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
(both volume buttons are also connected to the UBOOT_SEL pin). The
external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
OTG and 3.5mm headphone jack.

USB OTG is enabled in host only mode. AXP221 USB power supply and
GPIO support are required for full USB OTG support.

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Signed-off-by: Karsten Merker <merker@debian.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---

Changes since last submission (was part of Sinlinx SinA31s series)

  - Update axp22x.dtsi file name
  - Sort regulators
  - Drop URL in commit message
  - Drop comment for capacitive touch panel
  - Add simplefb regulators
  - Drop regulator-always-on for regulators that aren't critical
  - Fix CPU and GPU regulator supply mix-up

---
 arch/arm/boot/dts/Makefile               |   1 +
 arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 +++++++++++++++++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts

Comments

Karsten Merker Oct. 23, 2015, 2:53 p.m. UTC | #1
On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:

> From: Karsten Merker <merker@debian.org>
> 
> The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
> 768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
> rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
> and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
> (both volume buttons are also connected to the UBOOT_SEL pin). The

Hello Chen-Yu,

the volume button function is something that I wanted to confirm
again but forgot to ask previously: Siarhei had pointed out that
only the volume+ button triggers UBOOT_SEL, but for me actually
both volume buttons work as described above.  Could you
cross-check that on your Primo81?

> external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
> OTG and 3.5mm headphone jack.
> 
> USB OTG is enabled in host only mode. AXP221 USB power supply and
> GPIO support are required for full USB OTG support.
> 
> Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
> Signed-off-by: Karsten Merker <merker@debian.org>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
> 
> Changes since last submission (was part of Sinlinx SinA31s series)
> 
>   - Update axp22x.dtsi file name
>   - Sort regulators
>   - Drop URL in commit message
>   - Drop comment for capacitive touch panel
>   - Add simplefb regulators
>   - Drop regulator-always-on for regulators that aren't critical
>   - Fix CPU and GPU regulator supply mix-up
> 
> ---
>  arch/arm/boot/dts/Makefile               |   1 +
>  arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 +++++++++++++++++++++++++++++++
>  2 files changed, 256 insertions(+)
>  create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index c00b72e750ab..78ade1a5e886 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -612,6 +612,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>  	sun6i-a31-m9.dtb \
>  	sun6i-a31-mele-a1000g-quad.dtb \
>  	sun6i-a31s-cs908.dtb \
> +	sun6i-a31s-primo81.dtb \
>  	sun6i-a31s-sina31s.dtb \
>  	sun6i-a31s-sinovoip-bpi-m2.dtb \
>  	sun6i-a31s-yones-toptech-bs1078-v2.dtb
> diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
> new file mode 100644
> index 000000000000..2d4250b1faf8
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
> @@ -0,0 +1,255 @@
> +/*
> + * Copyright 2014 Siarhei Siamashka <siarhei.siamashka@gmail.com>
> + * Copyright 2015 Karsten Merker <merker@debian.org>
> + * Copyright 2015 Chen-Yu Tsai <wens@csie.org>
> + *
> + * 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 "sun6i-a31s.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 = "MSI Primo81 tablet";
> +	compatible = "msi,primo81", "allwinner,sun6i-a31s";
> +};
> +
> +&cpu0 {
> +	cpu-supply = <&reg_dcdc3>;
> +};
> +
> +&ehci0 {
> +	/* rtl8188etv wifi is connected here */
> +	status = "okay";
> +};
> +
> +&i2c0 {
> +	/* pull-ups and device VDDIO use AXP221 DLDO3 */
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c0_pins_a>;
> +	status = "failed";
> +};
> +
> +&i2c1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c1_pins_a>;
> +	status = "okay";
> +
> +	ctp@5d {
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&gt911_int_primo81>;
> +		compatible = "goodix,gt911";
> +		reg = <0x5d>;
> +		interrupt-parent = <&pio>;
> +		interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */

I'd like to add a

		touchscreen-swapped-x-y = "true";

as described in
Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
here, as the display is in portrait mode while the touchscreen is
in landscape mode and needs to have the x and y axes swapped to
work in the same coordinate system as the display.

Regarding the driver side: the goodix driver in kernel 4.3
doesn't yet support this property, but patches to add support for
it are on the linux-input list and should hopefully make it into
kernel 4.4.

> +	};
> +};
> +
> +&i2c2 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&i2c2_pins_a>;
> +	status = "okay";
> +
> +	accelerometer@1c {
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&mma8452_int_primo81>;
> +		compatible = "fsl,mma8452";
> +		reg = <0x1c>;
> +		interrupt-parent = <&pio>;
> +		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; /* PA9 */
> +		#io-channel-cells = <1>;
> +	};
> +};
> +
> +&lradc {
> +	vref-supply = <&reg_aldo3>;
> +	status = "okay";
> +
> +	button@158 {
> +		label = "Volume Up";
> +		linux,code = <KEY_VOLUMEUP>;
> +		channel = <0>;
> +		voltage = <158730>;
> +	};
> +
> +	button@349 {
> +		label = "Volume Down";
> +		linux,code = <KEY_VOLUMEDOWN>;
> +		channel = <0>;
> +		voltage = <349206>;
> +	};
> +};
> +
> +&mmc0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
> +	vmmc-supply = <&reg_dcdc1>;
> +	bus-width = <4>;
> +	cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
> +	cd-inverted;
> +	status = "okay";
> +};
> +
> +&pio {
> +	gt911_int_primo81: gt911_int_pin@0 {
> +		allwinner,pins = "PA3";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
> +	mma8452_int_primo81: mma8452_int_pin@0 {
> +		allwinner,pins = "PA9";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +	};
> +
> +	mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
> +		allwinner,pins = "PA8";
> +		allwinner,function = "gpio_in";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
> +	};
> +};
> +
> +&p2wi {
> +	status = "okay";
> +
> +	axp22x: pmic@68 {
> +		compatible = "x-powers,axp221";
> +		reg = <0x68>;
> +		interrupt-parent = <&nmi_intc>;
> +		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +	};
> +};
> +
> +#include "axp22x.dtsi"
> +
> +&reg_aldo3 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <2700000>;
> +	regulator-max-microvolt = <3300000>;
> +	regulator-name = "avcc";
> +};
> +
> +&reg_dc1sw {
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "vcc-lcd";
> +};
> +
> +&reg_dc5ldo {
> +	regulator-min-microvolt = <700000>;
> +	regulator-max-microvolt = <1320000>;
> +	regulator-name = "vdd-cpus"; /* This is an educated guess */
> +};
> +
> +&reg_dcdc1 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "vcc-3v0";
> +};
> +
> +&reg_dcdc2 {
> +	regulator-min-microvolt = <700000>;
> +	regulator-max-microvolt = <1320000>;
> +	regulator-name = "vdd-gpu";
> +};
> +
> +&reg_dcdc3 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <700000>;
> +	regulator-max-microvolt = <1320000>;
> +	regulator-name = "vdd-cpu";
> +};
> +
> +&reg_dcdc4 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <700000>;
> +	regulator-max-microvolt = <1320000>;
> +	regulator-name = "vdd-sys-dll";
> +};
> +
> +&reg_dcdc5 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <1500000>;
> +	regulator-max-microvolt = <1500000>;
> +	regulator-name = "vcc-dram";
> +};
> +
> +&reg_dldo1 {
> +	regulator-min-microvolt = <3300000>;
> +	regulator-max-microvolt = <3300000>;
> +	regulator-name = "vcc-wifi";
> +};
> +
> +&reg_dldo3 {
> +	regulator-min-microvolt = <2800000>;
> +	regulator-max-microvolt = <2800000>;
> +	regulator-name = "vddio-csi";
> +};
> +
> +&reg_eldo3 {
> +	regulator-min-microvolt = <1080000>;
> +	regulator-max-microvolt = <1320000>;
> +	regulator-name = "vdd-mipi-bridge";
> +};
> +
> +&simplefb_lcd {
> +	vcc-lcd-supply = <&reg_dc1sw>;
> +	vdd-mipi-bridge-supply = <&reg_eldo3>;
> +};
> +
> +&usb_otg {
> +	/* otg support requires support for AXP221 usb-power-supply and GPIO */
> +	dr_mode = "host";
> +	status = "okay";
> +};
> +
> +&usbphy {
> +	usb1_vbus-supply = <&reg_dldo1>;
> +	status = "okay";
> +};
> -- 
> 2.6.1

Regards,
Karsten
Chen-Yu Tsai Oct. 23, 2015, 3:46 p.m. UTC | #2
On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
> On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
>
>> From: Karsten Merker <merker@debian.org>
>>
>> The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
>> 768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
>> rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
>> and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
>> (both volume buttons are also connected to the UBOOT_SEL pin). The
>
> Hello Chen-Yu,
>
> the volume button function is something that I wanted to confirm
> again but forgot to ask previously: Siarhei had pointed out that
> only the volume+ button triggers UBOOT_SEL, but for me actually
> both volume buttons work as described above.  Could you
> cross-check that on your Primo81?

IIRC both work. I can test next week.

>
>> external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
>> OTG and 3.5mm headphone jack.
>>
>> USB OTG is enabled in host only mode. AXP221 USB power supply and
>> GPIO support are required for full USB OTG support.
>>
>> Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
>> Signed-off-by: Karsten Merker <merker@debian.org>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>
>> Changes since last submission (was part of Sinlinx SinA31s series)
>>
>>   - Update axp22x.dtsi file name
>>   - Sort regulators
>>   - Drop URL in commit message
>>   - Drop comment for capacitive touch panel
>>   - Add simplefb regulators
>>   - Drop regulator-always-on for regulators that aren't critical
>>   - Fix CPU and GPU regulator supply mix-up
>>
>> ---
>>  arch/arm/boot/dts/Makefile               |   1 +
>>  arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 +++++++++++++++++++++++++++++++
>>  2 files changed, 256 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index c00b72e750ab..78ade1a5e886 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -612,6 +612,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>>       sun6i-a31-m9.dtb \
>>       sun6i-a31-mele-a1000g-quad.dtb \
>>       sun6i-a31s-cs908.dtb \
>> +     sun6i-a31s-primo81.dtb \
>>       sun6i-a31s-sina31s.dtb \
>>       sun6i-a31s-sinovoip-bpi-m2.dtb \
>>       sun6i-a31s-yones-toptech-bs1078-v2.dtb
>> diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
>> new file mode 100644
>> index 000000000000..2d4250b1faf8
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
>> @@ -0,0 +1,255 @@
>> +/*
>> + * Copyright 2014 Siarhei Siamashka <siarhei.siamashka@gmail.com>
>> + * Copyright 2015 Karsten Merker <merker@debian.org>
>> + * Copyright 2015 Chen-Yu Tsai <wens@csie.org>
>> + *
>> + * 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 "sun6i-a31s.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 = "MSI Primo81 tablet";
>> +     compatible = "msi,primo81", "allwinner,sun6i-a31s";
>> +};
>> +
>> +&cpu0 {
>> +     cpu-supply = <&reg_dcdc3>;
>> +};
>> +
>> +&ehci0 {
>> +     /* rtl8188etv wifi is connected here */
>> +     status = "okay";
>> +};
>> +
>> +&i2c0 {
>> +     /* pull-ups and device VDDIO use AXP221 DLDO3 */
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&i2c0_pins_a>;
>> +     status = "failed";
>> +};
>> +
>> +&i2c1 {
>> +     pinctrl-names = "default";
>> +     pinctrl-0 = <&i2c1_pins_a>;
>> +     status = "okay";
>> +
>> +     ctp@5d {
>> +             pinctrl-names = "default";
>> +             pinctrl-0 = <&gt911_int_primo81>;
>> +             compatible = "goodix,gt911";
>> +             reg = <0x5d>;
>> +             interrupt-parent = <&pio>;
>> +             interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
>
> I'd like to add a
>
>                 touchscreen-swapped-x-y = "true";
>
> as described in
> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
> here, as the display is in portrait mode while the touchscreen is
> in landscape mode and needs to have the x and y axes swapped to
> work in the same coordinate system as the display.
>
> Regarding the driver side: the goodix driver in kernel 4.3
> doesn't yet support this property, but patches to add support for
> it are on the linux-input list and should hopefully make it into
> kernel 4.4.

The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
send a follow-up patch adding them. I was waiting for those patches
to be merged.

Regards
ChenYu
Chen-Yu Tsai Oct. 23, 2015, 3:56 p.m. UTC | #3
On Fri, Oct 23, 2015 at 11:46 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
>> On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
>>
>>> From: Karsten Merker <merker@debian.org>
>>>
>>> The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
>>> 768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
>>> rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
>>> and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
>>> (both volume buttons are also connected to the UBOOT_SEL pin). The
>>
>> Hello Chen-Yu,
>>
>> the volume button function is something that I wanted to confirm
>> again but forgot to ask previously: Siarhei had pointed out that
>> only the volume+ button triggers UBOOT_SEL, but for me actually
>> both volume buttons work as described above.  Could you
>> cross-check that on your Primo81?
>
> IIRC both work. I can test next week.
>
>>
>>> external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
>>> OTG and 3.5mm headphone jack.
>>>
>>> USB OTG is enabled in host only mode. AXP221 USB power supply and
>>> GPIO support are required for full USB OTG support.
>>>
>>> Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
>>> Signed-off-by: Karsten Merker <merker@debian.org>
>>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>>> ---
>>>
>>> Changes since last submission (was part of Sinlinx SinA31s series)
>>>
>>>   - Update axp22x.dtsi file name
>>>   - Sort regulators
>>>   - Drop URL in commit message
>>>   - Drop comment for capacitive touch panel
>>>   - Add simplefb regulators
>>>   - Drop regulator-always-on for regulators that aren't critical
>>>   - Fix CPU and GPU regulator supply mix-up
>>>
>>> ---
>>>  arch/arm/boot/dts/Makefile               |   1 +
>>>  arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 +++++++++++++++++++++++++++++++
>>>  2 files changed, 256 insertions(+)
>>>  create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index c00b72e750ab..78ade1a5e886 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -612,6 +612,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
>>>       sun6i-a31-m9.dtb \
>>>       sun6i-a31-mele-a1000g-quad.dtb \
>>>       sun6i-a31s-cs908.dtb \
>>> +     sun6i-a31s-primo81.dtb \
>>>       sun6i-a31s-sina31s.dtb \
>>>       sun6i-a31s-sinovoip-bpi-m2.dtb \
>>>       sun6i-a31s-yones-toptech-bs1078-v2.dtb
>>> diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
>>> new file mode 100644
>>> index 000000000000..2d4250b1faf8
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
>>> @@ -0,0 +1,255 @@
>>> +/*
>>> + * Copyright 2014 Siarhei Siamashka <siarhei.siamashka@gmail.com>
>>> + * Copyright 2015 Karsten Merker <merker@debian.org>
>>> + * Copyright 2015 Chen-Yu Tsai <wens@csie.org>
>>> + *
>>> + * 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 "sun6i-a31s.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 = "MSI Primo81 tablet";
>>> +     compatible = "msi,primo81", "allwinner,sun6i-a31s";
>>> +};
>>> +
>>> +&cpu0 {
>>> +     cpu-supply = <&reg_dcdc3>;
>>> +};
>>> +
>>> +&ehci0 {
>>> +     /* rtl8188etv wifi is connected here */
>>> +     status = "okay";
>>> +};
>>> +
>>> +&i2c0 {
>>> +     /* pull-ups and device VDDIO use AXP221 DLDO3 */
>>> +     pinctrl-names = "default";
>>> +     pinctrl-0 = <&i2c0_pins_a>;
>>> +     status = "failed";
>>> +};
>>> +
>>> +&i2c1 {
>>> +     pinctrl-names = "default";
>>> +     pinctrl-0 = <&i2c1_pins_a>;
>>> +     status = "okay";
>>> +
>>> +     ctp@5d {
>>> +             pinctrl-names = "default";
>>> +             pinctrl-0 = <&gt911_int_primo81>;
>>> +             compatible = "goodix,gt911";
>>> +             reg = <0x5d>;
>>> +             interrupt-parent = <&pio>;
>>> +             interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
>>
>> I'd like to add a
>>
>>                 touchscreen-swapped-x-y = "true";

You don't need the '="true"' part. Boolean properties mean true
if they exist, and false if they aren't.

>>
>> as described in
>> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
>> here, as the display is in portrait mode while the touchscreen is
>> in landscape mode and needs to have the x and y axes swapped to
>> work in the same coordinate system as the display.
>>
>> Regarding the driver side: the goodix driver in kernel 4.3
>> doesn't yet support this property, but patches to add support for
>> it are on the linux-input list and should hopefully make it into
>> kernel 4.4.
>
> The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
> send a follow-up patch adding them. I was waiting for those patches
> to be merged.

Sorry, spoke too soon. Maxime hasn't pushed it out yet. Could you send
a patch adding touchscreen-swapped-x-y for Maxime to squash in?

My tablet is at my office. I won't be able to test it over the weekend.

Thanks
ChenYu
Karsten Merker Oct. 23, 2015, 4:56 p.m. UTC | #4
On Fri, Oct 23, 2015 at 11:56:35PM +0800, Chen-Yu Tsai wrote:
> On Fri, Oct 23, 2015 at 11:46 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> > On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
> >> On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
[...]
> >>> +/ {
> >>> +     model = "MSI Primo81 tablet";
> >>> +     compatible = "msi,primo81", "allwinner,sun6i-a31s";
> >>> +};
[...]
> >>> +&i2c1 {
> >>> +     pinctrl-names = "default";
> >>> +     pinctrl-0 = <&i2c1_pins_a>;
> >>> +     status = "okay";
> >>> +
> >>> +     ctp@5d {
> >>> +             pinctrl-names = "default";
> >>> +             pinctrl-0 = <&gt911_int_primo81>;
> >>> +             compatible = "goodix,gt911";
> >>> +             reg = <0x5d>;
> >>> +             interrupt-parent = <&pio>;
> >>> +             interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
> >>
> >> I'd like to add a
> >>
> >>                 touchscreen-swapped-x-y = "true";
> >>
> >> as described in
> >> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
> >> here, as the display is in portrait mode while the touchscreen is
> >> in landscape mode and needs to have the x and y axes swapped to
> >> work in the same coordinate system as the display.
> >>
> >> Regarding the driver side: the goodix driver in kernel 4.3
> >> doesn't yet support this property, but patches to add support for
> >> it are on the linux-input list and should hopefully make it into
> >> kernel 4.4.
> >
> > The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
> > send a follow-up patch adding them. I was waiting for those patches
> > to be merged.
> 
> Sorry, spoke too soon. Maxime hasn't pushed it out yet. Could you send
> a patch adding touchscreen-swapped-x-y for Maxime to squash in?

I'm happy to do so, but I have just stumbled over a problem with
actually building the dtb for testing - it fails with

  arch/arm/boot/dts/sun6i-a31s-primo81.dts:242.1-14 Label or path simplefb_lcd not found

The dts references simplefb_lcd:

+&simplefb_lcd {
+       vcc-lcd-supply = <&reg_dc1sw>;
+       vdd-mipi-bridge-supply = <&reg_eldo3>;
+};

but I don't see where it would be defined. This is on the current
sunxi/for-next branch of
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git
with the Primo81 dts patch on top. Am I perhaps missing some
required additional patch here?

Regards,
Karsten
Chen-Yu Tsai Oct. 24, 2015, 3:15 a.m. UTC | #5
On Sat, Oct 24, 2015 at 12:56 AM, Karsten Merker <merker@debian.org> wrote:
> On Fri, Oct 23, 2015 at 11:56:35PM +0800, Chen-Yu Tsai wrote:
>> On Fri, Oct 23, 2015 at 11:46 PM, Chen-Yu Tsai <wens@csie.org> wrote:
>> > On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
>> >> On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
> [...]
>> >>> +/ {
>> >>> +     model = "MSI Primo81 tablet";
>> >>> +     compatible = "msi,primo81", "allwinner,sun6i-a31s";
>> >>> +};
> [...]
>> >>> +&i2c1 {
>> >>> +     pinctrl-names = "default";
>> >>> +     pinctrl-0 = <&i2c1_pins_a>;
>> >>> +     status = "okay";
>> >>> +
>> >>> +     ctp@5d {
>> >>> +             pinctrl-names = "default";
>> >>> +             pinctrl-0 = <&gt911_int_primo81>;
>> >>> +             compatible = "goodix,gt911";
>> >>> +             reg = <0x5d>;
>> >>> +             interrupt-parent = <&pio>;
>> >>> +             interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
>> >>
>> >> I'd like to add a
>> >>
>> >>                 touchscreen-swapped-x-y = "true";
>> >>
>> >> as described in
>> >> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
>> >> here, as the display is in portrait mode while the touchscreen is
>> >> in landscape mode and needs to have the x and y axes swapped to
>> >> work in the same coordinate system as the display.
>> >>
>> >> Regarding the driver side: the goodix driver in kernel 4.3
>> >> doesn't yet support this property, but patches to add support for
>> >> it are on the linux-input list and should hopefully make it into
>> >> kernel 4.4.
>> >
>> > The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
>> > send a follow-up patch adding them. I was waiting for those patches
>> > to be merged.
>>
>> Sorry, spoke too soon. Maxime hasn't pushed it out yet. Could you send
>> a patch adding touchscreen-swapped-x-y for Maxime to squash in?
>
> I'm happy to do so, but I have just stumbled over a problem with
> actually building the dtb for testing - it fails with
>
>   arch/arm/boot/dts/sun6i-a31s-primo81.dts:242.1-14 Label or path simplefb_lcd not found
>
> The dts references simplefb_lcd:
>
> +&simplefb_lcd {
> +       vcc-lcd-supply = <&reg_dc1sw>;
> +       vdd-mipi-bridge-supply = <&reg_eldo3>;
> +};
>
> but I don't see where it would be defined. This is on the current
> sunxi/for-next branch of
> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git
> with the Primo81 dts patch on top. Am I perhaps missing some
> required additional patch here?

Yes. The previous patch that adds labels to the simplefb nodes.
Both patches are now in sunxi/for-next in Maxime's tree now.

ChenYu
Maxime Ripard Oct. 24, 2015, 7:09 a.m. UTC | #6
Hi,

On Fri, Oct 23, 2015 at 11:56:35PM +0800, Chen-Yu Tsai wrote:
> >> as described in
> >> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
> >> here, as the display is in portrait mode while the touchscreen is
> >> in landscape mode and needs to have the x and y axes swapped to
> >> work in the same coordinate system as the display.
> >>
> >> Regarding the driver side: the goodix driver in kernel 4.3
> >> doesn't yet support this property, but patches to add support for
> >> it are on the linux-input list and should hopefully make it into
> >> kernel 4.4.
> >
> > The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
> > send a follow-up patch adding them. I was waiting for those patches
> > to be merged.
> 
> Sorry, spoke too soon. Maxime hasn't pushed it out yet. Could you send
> a patch adding touchscreen-swapped-x-y for Maxime to squash in?

I did the last DT pull request for 4.4 yesterday, so I won't squash
any patches.

Maxime
Siarhei Siamashka Oct. 24, 2015, 9:33 a.m. UTC | #7
Hello,

On Fri, 23 Oct 2015 23:46:59 +0800
Chen-Yu Tsai <wens@csie.org> wrote:

> On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
> > On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
> >
> >> From: Karsten Merker <merker@debian.org>
> >>
> >> The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
> >> 768x1024 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
> >> rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
> >> and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
> >> (both volume buttons are also connected to the UBOOT_SEL pin). The
> >
> > Hello Chen-Yu,
> >
> > the volume button function is something that I wanted to confirm
> > again but forgot to ask previously: Siarhei had pointed out that
> > only the volume+ button triggers UBOOT_SEL, but for me actually
> > both volume buttons work as described above.  Could you
> > cross-check that on your Primo81?
> 
> IIRC both work. I can test next week.

Both buttons work this way because the Allwinner's firmware
additionally checks the buttons state via LRADC and switches
into the FEL mode in a software way. But if somebody flashes a
broken bootloader to NAND (something that is recognized by the
BROM, but dies instead of booting) then we may potentially have
a bricked device because booting from NAND has the highest
priority on A31s.

The UBOOT_SEL pin on the SoC can be used to change the default
boot order and allow to boot from the SD card or USB first
regardless of what is in NAND. So if at least one of the hardware
buttons is connected to the UBOOT_SEL pin, then we have an
unbrickable device.

Checking whether the hardware button is really connected to the
UBOOT_SEL pin can be done by reading the SRAM_VER_REG hardware
register and looking at the BOOT_SEL_PAD_STA bits:
    http://linux-sunxi.org/SRAM_Controller_Register_Guide#SRAM_VER_REG

And this can be done, for example, via using the devmem2 tool:
    "devmem2 0x01c00024"

Alternatively, it is also possible to use a modified variant of the
dialog tool, which is additionally polling the state of the FEL
button and interpreting long FEL button press as KEY_ENTER and
short press as KEY_DOWN:
    https://github.com/ssvb/dialog-sunxi

This patched dialog tool is a part of the board type selection stub,
used for creating universal board-independent SD card based installers
for Allwinner devices, which has been available for Linux distribution
maintainers since a while ago:
    http://lists.denx.de/pipermail/u-boot/2015-January/202306.html

Regarding the UBOOT_SEL pin in the MSI Primo81 tablet. After
buying this tablet, I was happy to confirm that at least the
"volume+" button is connected to the UBOOT_SEL pin, making the
tablet unbrickable. However appears that it was not just some sane
decision made by MSI engineers, but in fact connecting both LRADC
and UBOOT_SEL to tablet buttons is a part of the standard Allwinner's
reference schematics. One can search for "a20_pad_std_v1_1.pdf",
"a13-sch.pdf", "A31_PAD_STD_V1_90_130225.pdf" documents on the
Internet to find this information. Basically, we should expect
the majority of Allwinner A31(s) tablets to have a hardware FEL
button and be perfectly unbrickable :-)
Karsten Merker Oct. 24, 2015, 8:57 p.m. UTC | #8
On Sat, Oct 24, 2015 at 11:15:51AM +0800, Chen-Yu Tsai wrote:
> On Sat, Oct 24, 2015 at 12:56 AM, Karsten Merker <merker@debian.org> wrote:
> > On Fri, Oct 23, 2015 at 11:56:35PM +0800, Chen-Yu Tsai wrote:
> >> On Fri, Oct 23, 2015 at 11:46 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> >> > On Fri, Oct 23, 2015 at 10:53 PM, Karsten Merker <merker@debian.org> wrote:
> >> >> On Fri, Oct 23, 2015 at 11:50:41AM +0800, Chen-Yu Tsai wrote:
> > [...]
> >> >>> +/ {
> >> >>> +     model = "MSI Primo81 tablet";
> >> >>> +     compatible = "msi,primo81", "allwinner,sun6i-a31s";
> >> >>> +};
> > [...]
> >> >>> +&i2c1 {
> >> >>> +     pinctrl-names = "default";
> >> >>> +     pinctrl-0 = <&i2c1_pins_a>;
> >> >>> +     status = "okay";
> >> >>> +
> >> >>> +     ctp@5d {
> >> >>> +             pinctrl-names = "default";
> >> >>> +             pinctrl-0 = <&gt911_int_primo81>;
> >> >>> +             compatible = "goodix,gt911";
> >> >>> +             reg = <0x5d>;
> >> >>> +             interrupt-parent = <&pio>;
> >> >>> +             interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
> >> >>
> >> >> I'd like to add a
> >> >>
> >> >>                 touchscreen-swapped-x-y = "true";
> >> >>
> >> >> as described in
> >> >> Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
> >> >> here, as the display is in portrait mode while the touchscreen is
> >> >> in landscape mode and needs to have the x and y axes swapped to
> >> >> work in the same coordinate system as the display.
> >> >>
> >> >> Regarding the driver side: the goodix driver in kernel 4.3
> >> >> doesn't yet support this property, but patches to add support for
> >> >> it are on the linux-input list and should hopefully make it into
> >> >> kernel 4.4.
> >> >
> >> > The DTS is already in Maxime's tree, and in sunxi-next. Feel free to
> >> > send a follow-up patch adding them. I was waiting for those patches
> >> > to be merged.
> >>
> >> Sorry, spoke too soon. Maxime hasn't pushed it out yet. Could you send
> >> a patch adding touchscreen-swapped-x-y for Maxime to squash in?
> >
> > I'm happy to do so, but I have just stumbled over a problem with
> > actually building the dtb for testing - it fails with
> >
> >   arch/arm/boot/dts/sun6i-a31s-primo81.dts:242.1-14 Label or path simplefb_lcd not found
> >
> > The dts references simplefb_lcd:
> >
> > +&simplefb_lcd {
> > +       vcc-lcd-supply = <&reg_dc1sw>;
> > +       vdd-mipi-bridge-supply = <&reg_eldo3>;
> > +};
> >
> > but I don't see where it would be defined. This is on the current
> > sunxi/for-next branch of
> > https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git
> > with the Primo81 dts patch on top. Am I perhaps missing some
> > required additional patch here?
> 
> Yes. The previous patch that adds labels to the simplefb nodes.

Thanks for the info, that one doesn't seem to have landed in
my inbox.

> Both patches are now in sunxi/for-next in Maxime's tree now.

I've pulled them in the meantime and will post a follow-up patch
immediately.

Regards,
Karsten
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c00b72e750ab..78ade1a5e886 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -612,6 +612,7 @@  dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-m9.dtb \
 	sun6i-a31-mele-a1000g-quad.dtb \
 	sun6i-a31s-cs908.dtb \
+	sun6i-a31s-primo81.dtb \
 	sun6i-a31s-sina31s.dtb \
 	sun6i-a31s-sinovoip-bpi-m2.dtb \
 	sun6i-a31s-yones-toptech-bs1078-v2.dtb
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
new file mode 100644
index 000000000000..2d4250b1faf8
--- /dev/null
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -0,0 +1,255 @@ 
+/*
+ * Copyright 2014 Siarhei Siamashka <siarhei.siamashka@gmail.com>
+ * Copyright 2015 Karsten Merker <merker@debian.org>
+ * Copyright 2015 Chen-Yu Tsai <wens@csie.org>
+ *
+ * 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 "sun6i-a31s.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 = "MSI Primo81 tablet";
+	compatible = "msi,primo81", "allwinner,sun6i-a31s";
+};
+
+&cpu0 {
+	cpu-supply = <&reg_dcdc3>;
+};
+
+&ehci0 {
+	/* rtl8188etv wifi is connected here */
+	status = "okay";
+};
+
+&i2c0 {
+	/* pull-ups and device VDDIO use AXP221 DLDO3 */
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "failed";
+};
+
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
+
+	ctp@5d {
+		pinctrl-names = "default";
+		pinctrl-0 = <&gt911_int_primo81>;
+		compatible = "goodix,gt911";
+		reg = <0x5d>;
+		interrupt-parent = <&pio>;
+		interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */
+	};
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_pins_a>;
+	status = "okay";
+
+	accelerometer@1c {
+		pinctrl-names = "default";
+		pinctrl-0 = <&mma8452_int_primo81>;
+		compatible = "fsl,mma8452";
+		reg = <0x1c>;
+		interrupt-parent = <&pio>;
+		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; /* PA9 */
+		#io-channel-cells = <1>;
+	};
+};
+
+&lradc {
+	vref-supply = <&reg_aldo3>;
+	status = "okay";
+
+	button@158 {
+		label = "Volume Up";
+		linux,code = <KEY_VOLUMEUP>;
+		channel = <0>;
+		voltage = <158730>;
+	};
+
+	button@349 {
+		label = "Volume Down";
+		linux,code = <KEY_VOLUMEDOWN>;
+		channel = <0>;
+		voltage = <349206>;
+	};
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+	vmmc-supply = <&reg_dcdc1>;
+	bus-width = <4>;
+	cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
+	cd-inverted;
+	status = "okay";
+};
+
+&pio {
+	gt911_int_primo81: gt911_int_pin@0 {
+		allwinner,pins = "PA3";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
+	mma8452_int_primo81: mma8452_int_pin@0 {
+		allwinner,pins = "PA9";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
+	mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
+		allwinner,pins = "PA8";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+};
+
+&p2wi {
+	status = "okay";
+
+	axp22x: pmic@68 {
+		compatible = "x-powers,axp221";
+		reg = <0x68>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "avcc";
+};
+
+&reg_dc1sw {
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-lcd";
+};
+
+&reg_dc5ldo {
+	regulator-min-microvolt = <700000>;
+	regulator-max-microvolt = <1320000>;
+	regulator-name = "vdd-cpus"; /* This is an educated guess */
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-min-microvolt = <700000>;
+	regulator-max-microvolt = <1320000>;
+	regulator-name = "vdd-gpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <700000>;
+	regulator-max-microvolt = <1320000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc4 {
+	regulator-always-on;
+	regulator-min-microvolt = <700000>;
+	regulator-max-microvolt = <1320000>;
+	regulator-name = "vdd-sys-dll";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_dldo1 {
+	regulator-min-microvolt = <3300000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-wifi";
+};
+
+&reg_dldo3 {
+	regulator-min-microvolt = <2800000>;
+	regulator-max-microvolt = <2800000>;
+	regulator-name = "vddio-csi";
+};
+
+&reg_eldo3 {
+	regulator-min-microvolt = <1080000>;
+	regulator-max-microvolt = <1320000>;
+	regulator-name = "vdd-mipi-bridge";
+};
+
+&simplefb_lcd {
+	vcc-lcd-supply = <&reg_dc1sw>;
+	vdd-mipi-bridge-supply = <&reg_eldo3>;
+};
+
+&usb_otg {
+	/* otg support requires support for AXP221 usb-power-supply and GPIO */
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usbphy {
+	usb1_vbus-supply = <&reg_dldo1>;
+	status = "okay";
+};