ARM: dts: sun6i: Add dts file for MSI Primo81 tablet

The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND, 1024x768 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. More details are available at

    http://linux-sunxi.org/MSI_Primo81

This initial dts file only provides support for mmc, wifi and uart (there is no external connector for uart though). Graphics can be used via simplefb. However, without usb otg, there are no reasonable means to handle user input yet.

Signed-off-by Siarhei Siamashka <[email protected]>

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

arch/arm/boot/dts/Makefile +2 -1

index c486545..f363938 100644
@@ -464,7 +464,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-colombus.dtb \
 	sun6i-a31-hummingbird.dtb \
 	sun6i-a31-m9.dtb \
-	sun6i-a31s-cs908.dtb
+	sun6i-a31s-cs908.dtb \
+	sun6i-a31s-primo81.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-bananapi.dtb \
 	sun7i-a20-bootsetup.dtb \

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +95 -0

new file mode 100644
index 0000000..a5e8562
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2014 Siarhei Siamashka <[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 library 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 library 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.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * 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"
 
+
+/ {
+	model = "MSI Primo81 tablet";
+	compatible = "msi,primo81", "allwinner,sun6i-a31s";
+
+	chosen {
+		bootargs = "earlyprintk console=ttyS0,115200";
+	};
+
+	soc at 01c00000 {
+		mmc0: mmc at 01c0f000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+			vmmc-supply = <&reg_vcc3v0>;
+			bus-width = <4>;
+			cd-gpios = <&pio 0 8 0>; /* PA8 */
+			cd-inverted;
+			status = "okay";
+		};
+
+		usbphy: phy at 01c19400 {
+			status = "okay";
+		};
+
+		ehci0: usb at 01c1a000 {
+			/* rtl8188etv wifi is connected here */
+			status = "okay";
+		};
+
+		pio: pinctrl at 01c20800 {
+			mmc0_cd_pin_primo81: mmc0_cd_pin at 0 {
+				allwinner,pins = "PA8";
+				allwinner,function = "gpio_in";
+				allwinner,drive = <0>;
+				allwinner,pull = <1>;
+			};
+		};
+
+		uart0: serial at 01c28000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&uart0_pins_a>;
+			status = "okay";
+		};
+	};
+};

Signature · 1 line

2.0.4

Quoted 13 lines · Siarhei Siamashka

The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND, 1024x768 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. More details are available at

    http://linux-sunxi.org/MSI_Primo81

This initial dts file only provides support for mmc, wifi and uart (there is no external connector for uart though). Graphics can be used via simplefb. However, without usb otg, there are no reasonable means to handle user input yet.

These two patches look very good overall.

There's two things about the two of them though:
- We just switched to using the DT includes, please use them for your GPIO flags and pinctrl drive strength and pull configurations.
- We will switch soon to using the kind of syntax used for example by TI in their DTSes (you can look at the beaglebone black for an good example.), it would be great if you could use that in your two DTSes, in order to avoid changing everything again in a near future.

The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND, 1024x768 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. More details are available at

    http://linux-sunxi.org/MSI_Primo81

This initial dts file only provides support for mmc, wifi and uart (there is no external connector for uart though). Graphics can be used via simplefb. However, without usb otg, there are no reasonable means to handle user input yet.

Signed-off-by Siarhei Siamashka <[email protected]>

Signed-off-by Karsten Merker <[email protected]>

---

Changes since V1:

- Use symbolic instead of numeric pinctrl values as requested by Maxime Ripard.
- Change the include syntax from /include/ to #include to make the dts build with current kernels.

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

arch/arm/boot/dts/Makefile +2 -1

index 867e6e3..31686c7 100644
@@ -552,7 +552,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-i7.dtb \
 	sun6i-a31-m9.dtb \
 	sun6i-a31-mele-a1000g-quad.dtb \
-	sun6i-a31s-cs908.dtb
+	sun6i-a31s-cs908.dtb \
+	sun6i-a31s-primo81.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-bananapi.dtb \
 	sun7i-a20-bananapro.dtb \

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +48 -0

new file mode 100644
index 0000000..8ac0bdd
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2014 Siarhei Siamashka <[email protected]>
+ * Copyright 2015 Karsten Merker <[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 library 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 library 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.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * 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.
+ */
+

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +28 -0

+	};
+
+	soc at 01c00000 {
+		mmc0: mmc at 01c0f000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+			vmmc-supply = <&reg_vcc3v0>;
+			bus-width = <4>;
+			cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
+			cd-inverted;
+			status = "okay";
+		};
+
+		usbphy: phy at 01c19400 {
+			status = "okay";
+		};
+
+		ehci0: usb at 01c1a000 {
+			/* rtl8188etv wifi is connected here */
+			status = "okay";
+		};
+
+		pio: pinctrl at 01c20800 {
+			mmc0_cd_pin_primo81: mmc0_cd_pin at 0 {
+				allwinner,pins = "PA8";
+				allwinner,function = "gpio_in";
+				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

What I meant in my previous review was to use the syntax

&uart0 {
       some-property;
};

Instead of duplicating the tree structure like you're doing here. We've converted all the DT to that, so you can look around and see how it's done in other boards (note that the nodes should be sorted by alphabetical order).

Quoted 10 lines · Maxime Ripard

What I meant in my previous review was to use the syntax

&uart0 {
       some-property;
};

Instead of duplicating the tree structure like you're doing here. We've converted all the DT to that, so you can look around and see how it's done in other boards (note that the nodes should be sorted by alphabetical order).

Ah, sorry, I had misunderstood your original email in this regard. Following is a reworked version of the patch.

Changelog:

Version 1
=========
- Original patch by Siarhei Siamashka

Version 2
=========
- Use symbolic instead of numeric pinctrl values.

- Change the include syntax from /include/ to #include to make the dts build with current kernels.

Version 3
=========
- Use labels for nodes with modifications in relation to the dtsi instead of replicating the tree structure.

- Remove the FSF address from the license header as done in
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/340437.html
for the other dts files to remove a checkpatch warning.

- Add msi to the vendor prefix list.

- Remove earlyprintk from the default kernel commandline.

- Replace the console kernel commandline parameter by a /chosen/stdout-path node and add an alias serial0 -> uart0.

I have tagged this patch RFC as I am unsure what to do with the /chosen/stdout-path node. For now, I have set Siarhei's original choice (first serial port), but I am unsure whether this is the right thing to do as the Primo81 does by default not have a

user-accessible serial port. The only way to get a serial console is to either break the case open and find some test points that carry the RX/TX lines (which with the Primo81 case poses a high risk of breaking the display glass), or to use an SD card breakout board and change the pinmuxing for the SD card pins to the "serial" function. The latter would not work without modifying the dts, so the SD-breakout case doesn't really count for setting the default stdout-path in the general use case.

The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND, 1024x768 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. More details are available at

    http://linux-sunxi.org/MSI_Primo81

This initial dts file only provides support for mmc, wifi and uart (there is no external connector for uart though). Graphics can be used via simplefb. However, without usb otg, there are no reasonable means to handle user input yet.

Signed-off-by Siarhei Siamashka <[email protected]>

Signed-off-by Karsten Merker <[email protected]>

---
Changelog:

Version 1
=========
- Original patch by Siarhei Siamashka

Version 2
=========
- Use symbolic instead of numeric pinctrl values.

- Change the include syntax from /include/ to #include to make the dts build with current kernels.

Version 3
=========
- Use labels for nodes with modifications in relation to the dtsi instead of replicating the tree structure.

- Remove the FSF address from the license header as done in
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/340437.html
for the other dts files to remove a checkpatch warning.

- Add msi to the vendor prefix list.

- Remove earlyprintk from the default kernel commandline.

- Replace the console kernel commandline parameter by a /chosen/stdout-path node and add an alias serial0 -> uart0.

Version 4
=========
- Split out the vendor prefix documentation into a separate patch.

- Add a comment regarding the uart0 accessibility to the corresponding entry in the dts.

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

arch/arm/boot/dts/Makefile +2 -1

index 867e6e3..31686c7 100644
@@ -552,7 +552,8 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-i7.dtb \
 	sun6i-a31-m9.dtb \
 	sun6i-a31-mele-a1000g-quad.dtb \
-	sun6i-a31s-cs908.dtb
+	sun6i-a31s-cs908.dtb \
+	sun6i-a31s-primo81.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-bananapi.dtb \
 	sun7i-a20-bananapro.dtb \

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +53 -0

new file mode 100644
index 0000000..bd15ee1
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2014 Siarhei Siamashka <[email protected]>
+ * Copyright 2015 Karsten Merker <[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 library 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 library 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"
+
+/ {
+	model = "MSI Primo81 tablet";
+	compatible = "msi,primo81", "allwinner,sun6i-a31s";
+
+	aliases {
+		serial0 = &uart0;

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +22 -0

+	status = "okay";
+};
+
+&mmc0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+	vmmc-supply = <&reg_vcc3v0>;
+	bus-width = <4>;
+	cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
+	cd-inverted;
+	status = "okay";
+};
+
+&pio {
+	mmc0_cd_pin_primo81: mmc0_cd_pin at 0 {
+		allwinner,pins = "PA8";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+};
+

Quoted 4 lines

arch/arm/boot/dts/sun6i-a31s-primo81.dts line 63

Quoted 2 lines

+&ehci0 {

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +1 -0

+	/* rtl8188etv wifi is connected here */

No need to mention it, it's what discoverable buses are made for.

Hello Maxime,

using the same reasoning that caused you to ask for a description of the uart0 config (no external connector available, so why is there a uart0 enabled and how is it usable), I think it makes sense to leave this comment in the dts. The Primo 81 doesn't have any external USB host connectors and the fact that the internal Realtek USB WLAN chip is connected there is the only reason that the EHCI controller gets enabled in the dts at all. If you really prefer, I'll remove the comment in a V5; in that case please let me know.

Quoted 14 lines

arch/arm/boot/dts/sun6i-a31s-primo81.dts line 95

Quoted 10 lines

+&uart0 {

arch/arm/boot/dts/sun6i-a31s-primo81.dts new file +9 -0

+	/* The default uart0 pins (PH20: TX, PH21: RX) are not accessible
+	 * on an external connector. Possible ways to get physical access
+	 * to uart0 include:
+	 * - disabling mmc0, changing the pinmuxing for the SD card pins
+	 *   to the uart0 function (PF2: TX, PF4: RX) and using an SD card
+	 *   breakout board
+	 * - opening the case and finding appropriate test points connected
+	 *   to PH20 and PH21
+	 */

You already made a choice here, so just document the choice you made. I'm guessing from what you said that it's the latter, in which case please document which test points you're talking about.

Quoted 14 lines · Upwards in this thread you

[Karsten Merker wrote]

Quoted 12 lines

I have tagged this patch RFC as I am unsure what to do with the /chosen/stdout-path node. For now, I have set Siarhei's original choice (first serial port), but I am unsure whether this is the right thing to do as the Primo81 does by default not have a user-accessible serial port. The only way to get a serial console is to either break the case open and find some test points that carry the RX/TX lines (which with the Primo81 case poses a high risk of breaking the display glass), or to use an SD card breakout board and change the pinmuxing for the SD card pins to the "serial" function. The latter would not work without modifying the dts, so the SD-breakout case doesn't really count for setting the default stdout-path in the general use case.

Quoted 3 lines

Having that as a comment on top of whatever uart you've been using would be great, so that people know where to look at on their device to find it.

Maybe I have misunderstood you, but to my understanding the comment I added represents exactly what you asked me to do above?

I cannot tell which test points carry the TX/RX lines from PH20 and PH21 as I have not opened the case (and to my knowledge nobody else @linunx-sunxi has done that), due to the fact that the Primo 81 doesn't have one of typical cheap two-part plastic cases which can be easily opened without destroying anything, but a one-part aluminum case which fits tightly with the display glass. To pry open the aluminium case one would have to apply pressure to the glass and I don't want to void my warranty and risk breaking the display while doing that.

The u-boot and the android kernel that come preinstalled on the tablet use PH20 and PH21 for uart0, so there is an extremely high probability that there are test points on the board that carry these lines, but I cannot tell which ones.

So the same question as above: if you really want me to do that, I'll remove the SD card breakout info in a V5 (just tell me so), but I think it makes sense to leave it in the dts.

Document the the "msi" (Micro-Star International Co. Ltd.) vendor prefix which is used in sun6i-a31s-primo81.dts.

Signed-off-by Karsten Merker <[email protected]>