sunxi: Add a proper dts file for the ga10h a33 based tablet

Add and use a proper dts for the ga10h a33 based tablet, as submitted upstream. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>

sunxi: Add a proper dts file for the ga10h a33 based tablet
Add and use a proper dts for the ga10h a33 based tablet, as submitted upstream. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Hans de Goede
1 parent 373a6cb381
Showing 3 changed files with 127 additions and 1 deletions Side-by-side Diff
arch/arm/dts/Makefile
arch/arm/dts/sun8i-a33-ga10h-v1.1.dts
configs/ga10h_v1_1_defconfig
@@ -127,6 +127,7 @@
 	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 \
+/*
+ * 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-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";
+	};
+};
+
+&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@200 {
+		label = "Volume Up";
+		linux,code = <KEY_VOLUMEUP>;
+		channel = <0>;
+		voltage = <200000>;
+	};
+
+	button@400 {
+		label = "Volume Down";
+		linux,code = <KEY_VOLUMEDOWN>;
+		channel = <0>;
+		voltage = <400000>;
+	};
+
+	button@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";
+};
+
+&pio {
+	mmc0_cd_pin_q8h: mmc0_cd_pin@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";
+};
@@ -14,7 +14,7 @@
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_USB_MUSB_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_CMD_SETEXPR=y
...	...	@@ -127,6 +127,7 @@
127	127	sun8i-a23-ippo-q8h-v1.2.dtb
128	128	dtb-$(CONFIG_MACH_SUN8I_A33) += \
129	129	sun8i-a33-et-q8-v1.6.dtb \
	130	+ sun8i-a33-ga10h-v1.1.dtb \
130	131	sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dtb
131	132	dtb-$(CONFIG_MACH_SUN9I) += \
132	133	sun9i-a80-optimus.dtb \
	1	+/*
	2	+ * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
	3	+ *
	4	+ * This file is dual-licensed: you can use it either under the terms
	5	+ * of the GPL or the X11 license, at your option. Note that this dual
	6	+ * licensing only applies to this file, and not this project as a
	7	+ * whole.
	8	+ *
	9	+ * a) This file is free software; you can redistribute it and/or
	10	+ * modify it under the terms of the GNU General Public License as
	11	+ * published by the Free Software Foundation; either version 2 of the
	12	+ * License, or (at your option) any later version.
	13	+ *
	14	+ * This file is distributed in the hope that it will be useful,
	15	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	16	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	17	+ * GNU General Public License for more details.
	18	+ *
	19	+ * Or, alternatively,
	20	+ *
	21	+ * b) Permission is hereby granted, free of charge, to any person
	22	+ * obtaining a copy of this software and associated documentation
	23	+ * files (the "Software"), to deal in the Software without
	24	+ * restriction, including without limitation the rights to use,
	25	+ * copy, modify, merge, publish, distribute, sublicense, and/or
	26	+ * sell copies of the Software, and to permit persons to whom the
	27	+ * Software is furnished to do so, subject to the following
	28	+ * conditions:
	29	+ *
	30	+ * The above copyright notice and this permission notice shall be
	31	+ * included in all copies or substantial portions of the Software.
	32	+ *
	33	+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	34	+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	35	+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	36	+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	37	+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	38	+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	39	+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	40	+ * OTHER DEALINGS IN THE SOFTWARE.
	41	+ */
	42	+
	43	+/dts-v1/;
	44	+#include "sun8i-a33.dtsi"
	45	+#include "sunxi-common-regulators.dtsi"
	46	+
	47	+#include <dt-bindings/gpio/gpio.h>
	48	+#include <dt-bindings/input/input.h>
	49	+#include <dt-bindings/pinctrl/sun4i-a10.h>
	50	+
	51	+/ {
	52	+ model = "Allwinner GA10H Quad Core Tablet (v1.1)";
	53	+ compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33";
	54	+
	55	+ aliases {
	56	+ serial0 = &r_uart;
	57	+ };
	58	+
	59	+ chosen {
	60	+ stdout-path = "serial0:115200n8";
	61	+ };
	62	+};
	63	+
	64	+&i2c0 {
	65	+ pinctrl-names = "default";
	66	+ pinctrl-0 = <&i2c0_pins_a>;
	67	+ status = "okay";
	68	+};
	69	+
	70	+&i2c1 {
	71	+ pinctrl-names = "default";
	72	+ pinctrl-0 = <&i2c1_pins_a>;
	73	+ status = "okay";
	74	+};
	75	+
	76	+&lradc {
	77	+ vref-supply = <&reg_vcc3v0>;
	78	+ status = "okay";
	79	+
	80	+ button@200 {
	81	+ label = "Volume Up";
	82	+ linux,code = <KEY_VOLUMEUP>;
	83	+ channel = <0>;
	84	+ voltage = <200000>;
	85	+ };
	86	+
	87	+ button@400 {
	88	+ label = "Volume Down";
	89	+ linux,code = <KEY_VOLUMEDOWN>;
	90	+ channel = <0>;
	91	+ voltage = <400000>;
	92	+ };
	93	+
	94	+ button@600 {
	95	+ label = "Back";
	96	+ linux,code = <KEY_BACK>;
	97	+ channel = <0>;
	98	+ voltage = <600000>;
	99	+ };
	100	+};
	101	+
	102	+&mmc0 {
	103	+ pinctrl-names = "default";
	104	+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>;
	105	+ vmmc-supply = <&reg_vcc3v0>;
	106	+ bus-width = <4>;
	107	+ cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
	108	+ cd-inverted;
	109	+ status = "okay";
	110	+};
	111	+
	112	+&pio {
	113	+ mmc0_cd_pin_q8h: mmc0_cd_pin@0 {
	114	+ allwinner,pins = "PB4";
	115	+ allwinner,function = "gpio_in";
	116	+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
	117	+ allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
	118	+ };
	119	+};
	120	+
	121	+&r_uart {
	122	+ pinctrl-names = "default";
	123	+ pinctrl-0 = <&r_uart_pins_a>;
	124	+ status = "okay";
	125	+};
...	...	@@ -14,7 +14,7 @@
14	14	CONFIG_VIDEO_LCD_BL_PWM="PH0"
15	15	CONFIG_VIDEO_LCD_PANEL_LVDS=y
16	16	CONFIG_USB_MUSB_SUNXI=y
17		-CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
	17	+CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
18	18	CONFIG_SPL=y
19	19	CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
20	20	CONFIG_CMD_SETEXPR=y