* [PATCH 2/4] ARM: dts: sun5i: Convert inet-98v-rev2 dts to use reference-design-tablet.dtsi
2016-08-26 14:42 [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Hans de Goede
@ 2016-08-26 14:42 ` Hans de Goede
2016-08-26 22:32 ` Maxime Ripard
2016-08-26 14:42 ` [PATCH 3/4] ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet Hans de Goede
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Hans de Goede @ 2016-08-26 14:42 UTC (permalink / raw)
To: linux-arm-kernel
This results in a nice cleanup :)
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 164 +-------------------------
1 file changed, 1 insertion(+), 163 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts b/arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
index 1b11ec9..439ae3b 100644
--- a/arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
+++ b/arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
@@ -42,171 +42,9 @@
/dts-v1/;
#include "sun5i-a13.dtsi"
-#include "sunxi-common-regulators.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
+#include "sun5i-reference-design-tablet.dtsi"
/ {
model = "INet-98V Rev 02";
compatible = "primux,inet98v-rev2", "allwinner,sun5i-a13";
-
- aliases {
- serial0 = &uart1;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
-};
-
-&cpu0 {
- cpu-supply = <®_dcdc2>;
-};
-
-&ehci0 {
- status = "okay";
-};
-
-&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- status = "okay";
-
- axp209: pmic at 34 {
- reg = <0x34>;
- interrupts = <0>;
- };
-};
-
-#include "axp209.dtsi"
-
-&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
- status = "okay";
-
- pcf8563: rtc at 51 {
- compatible = "nxp,pcf8563";
- reg = <0x51>;
- };
-};
-
-&lradc {
- vref-supply = <®_ldo2>;
- 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>;
- };
-};
-
-&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_inet98fv2>;
- vmmc-supply = <®_vcc3v3>;
- bus-width = <4>;
- cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
- cd-inverted;
- status = "okay";
-};
-
-&otg_sram {
- status = "okay";
-};
-
-&pio {
- mmc0_cd_pin_inet98fv2: mmc0_cd_pin at 0 {
- allwinner,pins = "PG0";
- allwinner,function = "gpio_in";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
- };
-
- usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
- allwinner,pins = "PG1";
- allwinner,function = "gpio_in";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
- };
-
- usb0_id_detect_pin: usb0_id_detect_pin at 0 {
- allwinner,pins = "PG2";
- allwinner,function = "gpio_in";
- allwinner,drive = <SUN4I_PINCTRL_10_MA>;
- allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
- };
-};
-
-®_dcdc2 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1400000>;
- regulator-name = "vdd-cpu";
-};
-
-®_dcdc3 {
- regulator-always-on;
- regulator-min-microvolt = <1250000>;
- regulator-max-microvolt = <1250000>;
- regulator-name = "vdd-int-pll";
-};
-
-®_ldo1 {
- regulator-name = "vdd-rtc";
-};
-
-®_ldo2 {
- regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "avcc";
-};
-
-®_ldo3 {
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-name = "vcc-wifi";
-};
-
-®_usb0_vbus {
- gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
- status = "okay";
-};
-
-&uart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart1_pins_b>;
- status = "okay";
-};
-
-&usb_otg {
- dr_mode = "otg";
- status = "okay";
-};
-
-&usb0_vbus_pin_a {
- allwinner,pins = "PG12";
-};
-
-&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
- usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
- usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
- usb0_vbus-supply = <®_usb0_vbus>;
- usb1_vbus-supply = <®_ldo3>;
- status = "okay";
};
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet
2016-08-26 14:42 [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Hans de Goede
2016-08-26 14:42 ` [PATCH 2/4] ARM: dts: sun5i: Convert inet-98v-rev2 dts to use reference-design-tablet.dtsi Hans de Goede
@ 2016-08-26 14:42 ` Hans de Goede
2016-08-26 22:33 ` Maxime Ripard
2016-08-26 14:42 ` [PATCH 4/4] ARM: dts: sun8i: Rename reference-design-tablet touchscreen node Hans de Goede
2016-08-26 22:32 ` [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Maxime Ripard
3 siblings, 1 reply; 8+ messages in thread
From: Hans de Goede @ 2016-08-26 14:42 UTC (permalink / raw)
To: linux-arm-kernel
Add a dts file for the Empire Electronix M712 tablet, this is a 7" A13
tablet, with micro-usb (otg), headphone and micro-sd slots on the
outside. It uses a Goodix gt811 touchscreen controller, a RTL8188CTV
wifi chip and a DMART06 (1238a4) accelerometer.
Note currently the dts for this is somewhat empty. This will change
once we add support for the touchscreen and accelerometer.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/Makefile | 1 +
.../boot/dts/sun5i-a13-empire-electronix-m712.dts | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 1ec7fe9..94d5591 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -727,6 +727,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
sun5i-a10s-wobo-i5.dtb \
sun5i-a13-difrnce-dit4350.dtb \
sun5i-a13-empire-electronix-d709.dtb \
+ sun5i-a13-empire-electronix-m712.dtb \
sun5i-a13-hsg-h702.dtb \
sun5i-a13-inet-98v-rev2.dtb \
sun5i-a13-olinuxino.dtb \
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts
new file mode 100644
index 0000000..b1e2afd
--- /dev/null
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 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 "sun5i-a13.dtsi"
+#include "sun5i-reference-design-tablet.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ model = "Empire Electronix M712 tablet";
+ compatible = "empire-electronix,m712", "allwinner,sun5i-a13";
+};
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet
2016-08-26 14:42 ` [PATCH 3/4] ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet Hans de Goede
@ 2016-08-26 22:33 ` Maxime Ripard
0 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2016-08-26 22:33 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 26, 2016 at 04:42:25PM +0200, Hans de Goede wrote:
> Add a dts file for the Empire Electronix M712 tablet, this is a 7" A13
> tablet, with micro-usb (otg), headphone and micro-sd slots on the
> outside. It uses a Goodix gt811 touchscreen controller, a RTL8188CTV
> wifi chip and a DMART06 (1238a4) accelerometer.
>
> Note currently the dts for this is somewhat empty. This will change
> once we add support for the touchscreen and accelerometer.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Thanks very much for that reference design rework, it makes things
much easier to review :)
Applied.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160827/ae6bd0e9/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] ARM: dts: sun8i: Rename reference-design-tablet touchscreen node
2016-08-26 14:42 [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Hans de Goede
2016-08-26 14:42 ` [PATCH 2/4] ARM: dts: sun5i: Convert inet-98v-rev2 dts to use reference-design-tablet.dtsi Hans de Goede
2016-08-26 14:42 ` [PATCH 3/4] ARM: dts: sun5i: Add dts file for the Empire Electronix M712 tablet Hans de Goede
@ 2016-08-26 14:42 ` Hans de Goede
2016-08-26 22:34 ` Maxime Ripard
2016-08-26 22:32 ` [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Maxime Ripard
3 siblings, 1 reply; 8+ messages in thread
From: Hans de Goede @ 2016-08-26 14:42 UTC (permalink / raw)
To: linux-arm-kernel
Rename the reference-design-tablet touchscreen node from gsl1680 to
touchscreen, all? tablets seem to use the same power and interrupt
gpio-s, but not all tablets use a gsl1680 controller making the
gsl1680 name somewhat misleading.
Also move the reg and compatible property to the actual tablet dts
as they may differ per tablet.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index f29897c..08cd001 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -71,15 +71,13 @@
*/
clock-frequency = <400000>;
- gsl1680: touchscreen at 40 {
- compatible = "silead,gsl1680";
- reg = <0x40>;
+ touchscreen: touchscreen at 0 {
interrupt-parent = <&pio>;
interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */
pinctrl-names = "default";
pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
- /* Most tablets use this touchscreen, but not all */
+ /* Tablet dts must provide reg and compatible */
status = "disabled";
};
};
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box
2016-08-26 14:42 [PATCH 1/4] ARM: dts: sun4i: Disable ohci1 on ba10-tv-box Hans de Goede
` (2 preceding siblings ...)
2016-08-26 14:42 ` [PATCH 4/4] ARM: dts: sun8i: Rename reference-design-tablet touchscreen node Hans de Goede
@ 2016-08-26 22:32 ` Maxime Ripard
3 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2016-08-26 22:32 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 26, 2016 at 04:42:23PM +0200, Hans de Goede wrote:
> The ehci1/ohci1 pair on the ba10-tv-box is connected to an USB-2 wifi
> module soldered on the PCB, so there enabling ohci1 is not necessary.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Applied, thanks
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160827/3ea4403c/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread