Skip to contentSkip to conversation

ARM: dts: sun8i: Add sun8i-a23-q8-tablet.dts file

PATCH New Hans de Goede 2 participants 6 messages Oct 13, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: sun8i: Add sun8i-a23-q8-tablet.dts file

This is a generic dts file for A23 based q8 formfactor tablets, this is intended to replace both sun8i-a23-ippo-q8h-v5.dts and sun8i-a23-ippo-q8h-v1.2.dts (these can be fully dropped after a transition period).

---
 arch/arm/boot/dts/Makefile                |  1 +
 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 65 +++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
arch/arm/boot/dts/Makefile +1 -0
index e76fe3a..71f9655 100644
@@ -636,6 +636,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-a23-gt90h-v4.dtb \
 	sun8i-a23-ippo-q8h-v5.dtb \
 	sun8i-a23-ippo-q8h-v1.2.dtb \
+	sun8i-a23-q8-tablet.dtb \
 	sun8i-a33-et-q8-v1.6.dtb \
 	sun8i-a33-ga10h-v1.1.dtb \
 	sun8i-a33-ippo-q8h-v1.2.dtb \
arch/arm/boot/dts/sun8i-a23-q8-tablet.dts new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.5.0
#1 lore raw

PATCH 2/3 ARM: dts: sun8i: Make ippo-q8h-v*.dts a symlink to q8-tablet.dts

A23 Q8 tablets with the ippo-q8h-v* pcb will work fine with the generic q8-tablet.dts and given the many variants of PCBs found in Q8 tablets using such a specific dts name was a mistake in hindsight.

We cannot just drop the ippo-q8h-v*.dtb as existing u-boot configs may very well point to it.

---
The plan is to remove the matching u-boot config after v2015.10 (which will ship with a generic q8_a23_tablet_defconfig file), and then once the next u-boot has shipped for a bit we can consider removing the symlink and Makefile entry for these.

---
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 55 +-------------------
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts   | 75 +--------------------------
 2 files changed, 2 insertions(+), 128 deletions(-)
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts deleted +0 -54
deleted file mode 100644
index 382d64c..0000000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015 Hans de Goede <[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 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.
- */
-
-/*
- * The Ippo Q8H v1.2 is almost identical to the v5, still it needs a separate
- * dtb file since some gpio-s surrounding the wlan/bluetooth are different,
- * and it uses different camera sensors.
- */
-
-#include "sun8i-a23-ippo-q8h-v5.dts"
-
-/ {
-	model = "Ippo Q8H Dual Core Tablet (v1.2)";
-	compatible = "ippo,q8h-v1.2", "allwinner,sun8i-a23";
-};
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts new file +1 -0
new file mode 120000
index 0000000..c2f22fc
@@ -0,0 +1 @@
+sun8i-a23-q8-tablet.dts
\ No newline at end of file
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts deleted +0 -74

74 lines not on this page · raw message

arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts new file +1 -0
new file mode 120000
index 0000000..c2f22fc
@@ -0,0 +1 @@
+sun8i-a23-q8-tablet.dts
\ No newline at end of file
Signature · 1 line
2.5.0
#2 lore raw

PATCH 2/3 ARM: dts: sun8i: Make ippo-q8h-v*.dts a symlink to q8-tablet.dts

Quoted 8 lines · Hans de Goede

A23 Q8 tablets with the ippo-q8h-v* pcb will work fine with the generic q8-tablet.dts and given the many variants of PCBs found in Q8 tablets using such a specific dts name was a mistake in hindsight.

We cannot just drop the ippo-q8h-v*.dtb as existing u-boot configs may very well point to it.

Applied, thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151013/008ea823/attachment.sig>
#3 lore raw

PATCH 3/3 ARM: dts: sun8i: Make et-q8-v1.6.dts a symlink to q8-tablet.dts

In reply to Hans de Goede

A33 Q8 tablets with the et-q8-v1.6 pcb will work fine with the generic q8-tablet.dts and given the many variants of PCBs found in Q8 tablets using such a specific dts name was a mistake in hindsight.

We cannot just drop the et-q8-v1.6.dtb as existing u-boot configs may very well point to it.

---
 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts | 89 +-----------------------------
 1 file changed, 1 insertion(+), 88 deletions(-)
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts
arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts deleted +0 -88
deleted file mode 100644
index 19db844..0000000
@@ -1,88 +0,0 @@
-/*
- * Copyright 2015 Vishnu Patekar
- * Vishnu Patekar <[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 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 = "ET Q8 Quad Core Tablet (v1.6)";
-	compatible = "et,q8-v1.6", "allwinner,sun8i-a33";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&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>;
-	};
-};
-
-&uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pins_a>;
-	status = "okay";
-};
arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts new file +1 -0
new file mode 120000
index 0000000..4519fd7
@@ -0,0 +1 @@
+sun8i-a33-q8-tablet.dts
\ No newline at end of file
Signature · 1 line
2.5.0
#4 lore raw

PATCH 3/3 ARM: dts: sun8i: Make et-q8-v1.6.dts a symlink to q8-tablet.dts

Quoted 8 lines · Hans de Goede

A33 Q8 tablets with the et-q8-v1.6 pcb will work fine with the generic q8-tablet.dts and given the many variants of PCBs found in Q8 tablets using such a specific dts name was a mistake in hindsight.

We cannot just drop the et-q8-v1.6.dtb as existing u-boot configs may very well point to it.

Applied, thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151013/44f751a8/attachment.sig>
#5 lore raw

PATCH 1/3 ARM: dts: sun8i: Add sun8i-a23-q8-tablet.dts file

In reply to Hans de Goede
Quoted 6 lines · Hans de Goede

This is a generic dts file for A23 based q8 formfactor tablets, this is intended to replace both sun8i-a23-ippo-q8h-v5.dts and sun8i-a23-ippo-q8h-v1.2.dts (these can be fully dropped after a transition period).

Applied, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151013/89285257/attachment.sig>