This adds timings for the RGB666 variant of the Innolux AT070TN92 panel, as found on the Ainol AW1 tablet.
Signed-off-by: Paul Kocialkowski contact@paulk.fr --- drivers/gpu/drm/panel/panel-simple.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 5591984a392b..efeb2f2162bc 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1063,6 +1063,29 @@ static const struct panel_desc innolux_at070tn92 = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
+static const struct drm_display_mode innolux_at070tn92_rgb666_mode = { + .clock = 40000, + .hdisplay = 800, + .hsync_start = 800 + 112, + .hsync_end = 800 + 112 + 1, + .htotal = 800 + 112 + 1 + 87, + .vdisplay = 480, + .vsync_start = 480 + 141, + .vsync_end = 480 + 141 + 1, + .vtotal = 480 + 141 + 1 + 38, + .vrefresh = 60, +}; + +static const struct panel_desc innolux_at070tn92_rgb666 = { + .modes = &innolux_at070tn92_rgb666_mode, + .num_modes = 1, + .size = { + .width = 154, + .height = 86, + }, + .bus_format = MEDIA_BUS_FMT_RGB666_1X18, +}; + static const struct display_timing innolux_g101ice_l01_timing = { .pixelclock = { 60400000, 71100000, 74700000 }, .hactive = { 1280, 1280, 1280 }, @@ -2105,6 +2128,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "innolux,at070tn92", .data = &innolux_at070tn92, + }, { + .compatible = "innolux,at070tn92-rgb666", + .data = &innolux_at070tn92_rgb666, }, { .compatible ="innolux,g101ice-l01", .data = &innolux_g101ice_l01
This adds the pins definition for RGB666 LCD panels on the A20. It was imported from the A33 definition, that concernes the same set of pins.
Signed-off-by: Paul Kocialkowski contact@paulk.fr --- arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e529e4ff2174..f46af8675cfa 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -781,6 +781,14 @@ function = "ir1"; };
+ lcd_rgb666_pins: lcd_rgb666@0 { + pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", + "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", + "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", + "PD24", "PD25", "PD26", "PD27"; + function = "lcd0"; + }; + mmc0_pins_a: mmc0@0 { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5";
Hi,
Il 10/04/2018 23:31, Paul Kocialkowski ha scritto:
This adds the pins definition for RGB666 LCD panels on the A20. It was imported from the A33 definition, that concernes the same set of pins.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e529e4ff2174..f46af8675cfa 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -781,6 +781,14 @@ function = "ir1"; };
lcd_rgb666_pins: lcd_rgb666@0 {
I point you to this Thread and back: https://lists.freedesktop.org/archives/dri-devel/2018-March/170688.html
I did the same for rgb888, so good part is discussed.
IMHO I would: - call lcd0_rgb666_pins, since this is for LCD0 interface - same as above, call lcd0-rgb666, take care about using "-" instad of "_" that can cause DTC warnings. - remove @0 since only this set can achieve LCD0 RGB666, and I don't think there will be other combinations.
Kind regards
Hi,
Le jeudi 12 avril 2018 à 00:22 +0200, Giulio Benetti a écrit :
Hi,
Il 10/04/2018 23:31, Paul Kocialkowski ha scritto:
This adds the pins definition for RGB666 LCD panels on the A20. It was imported from the A33 definition, that concernes the same set of pins.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e529e4ff2174..f46af8675cfa 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -781,6 +781,14 @@ function = "ir1"; };
lcd_rgb666_pins: lcd_rgb666@0 {I point you to this Thread and back: https://lists.freedesktop.org/archives/dri-devel/2018-March/170688.htm l
I did the same for rgb888, so good part is discussed.
IMHO I would:
- call lcd0_rgb666_pins, since this is for LCD0 interface
- same as above, call lcd0-rgb666, take care about using "-" instad
of "_" that can cause DTC warnings.
- remove @0 since only this set can achieve LCD0 RGB666, and I don't think there will be other combinations.
I even responded to that discussion but overlooked these aspects when crafting this patch. Thanks for the summary :)
Kind regards
-- Giulio Benetti CTO
MICRONOVA SRL Sede: Via A. Niedda 3 - 35010 Vigonza (PD) Tel. 049/8931563 - Fax 049/8931346 Cod.Fiscale - P.IVA 02663420285 Capitale Sociale € 26.000 i.v. Iscritta al Reg. Imprese di Padova N. 02663420285 Numero R.E.A. 258642
pins = "PD2", "PD3", "PD4", "PD5","PD6", "PD7",
"PD10", "PD11", "PD12","PD13", "PD14", "PD15",
"PD18", "PD19", "PD20","PD21", "PD22", "PD23",
"PD24", "PD25", "PD26","PD27";
function = "lcd0";};mmc0_pins_a: mmc0@0 { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5";
Hi,
Il 12/04/2018 01:09, Paul Kocialkowski ha scritto:
Hi,
Le jeudi 12 avril 2018 à 00:22 +0200, Giulio Benetti a écrit :
Hi,
Il 10/04/2018 23:31, Paul Kocialkowski ha scritto:
This adds the pins definition for RGB666 LCD panels on the A20. It was imported from the A33 definition, that concernes the same set of pins.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index e529e4ff2174..f46af8675cfa 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -781,6 +781,14 @@ function = "ir1"; };
lcd_rgb666_pins: lcd_rgb666@0 {I point you to this Thread and back: https://lists.freedesktop.org/archives/dri-devel/2018-March/170688.htm l
I did the same for rgb888, so good part is discussed.
IMHO I would:
- call lcd0_rgb666_pins, since this is for LCD0 interface
- same as above, call lcd0-rgb666, take care about using "-" instad
of "_" that can cause DTC warnings.
- remove @0 since only this set can achieve LCD0 RGB666, and I don't think there will be other combinations.
I even responded to that discussion but overlooked these aspects when crafting this patch. Thanks for the summary :)
You're welcome, I've forgotten you've been involved discussing that patch so i've pointed you something yours :) Anyway it should help.
Best regards
This adds support for the Ainol AW1, an A20-based 7" tablet from Ainol.
The following board-specific features are supported: * LCD panel * Backlight * USB OTG * Buttons * Touchscreen (doesn't work without non-free firmware) * Accelerometer * Battery
The following are untested: * Audio output * Audio speakers * USB via SPCI connector
The following are not supported: * Wi-Fi * Bluetooth * NAND * Audio via SPCI connector
Signed-off-by: Paul Kocialkowski contact@paulk.fr --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts | 358 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9f7133b6fba0..03bfacebfdbd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -929,6 +929,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \ + sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \ diff --git a/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts new file mode 100644 index 000000000000..697586991aea --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts @@ -0,0 +1,358 @@ +/* + * Copyright 2018 Paul Kocialkowski contact@paulk.fr + * + * 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 "sun7i-a20.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/pwm/pwm.h> + +/ { + model = "Ainol AW1"; + compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + backlight: backlight { + compatible = "pwm-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&backlight_enable_pin>; + pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; + brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; + default-brightness-level = <5>; + enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ + }; + + panel: panel { + compatible = "innolux,at070tn92"; + #address-cells = <1>; + #size-cells = <0>; + power-supply = <&panel_power>; + backlight = <&backlight>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + panel_input: endpoint@0 { + reg = <0>; + remote-endpoint = <&tcon0_out_panel>; + }; + }; + }; + + panel_power: panel_power { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&panel_power_pin>; + regulator-name = "panel-power"; + regulator-min-microvolt = <10400000>; + regulator-max-microvolt = <10400000>; + gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */ + enable-active-high; + regulator-boot-on; + }; +}; + +&codec { + pinctrl-names = "default"; + pinctrl-0 = <&codec_pa_pin>; + allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ + status = "okay"; +}; + +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + +&de { + status = "okay"; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins_a>; + status = "okay"; + + axp209: pmic@34 { + reg = <0x34>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + }; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_a>; + status = "okay"; + + lis3dh: accelerometer@18 { + compatible = "st,lis3dh-accel"; + reg = <0x18>; + vdd-supply = <®_vcc3v3>; + vddio-supply = <®_vcc3v3>; + st,drdy-int-pin = <1>; + }; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins_a>; + status = "okay"; + clock-frequency = <400000>; /* 400 KHz required for GSL1680. */ + + gsl1680: touchscreen@40 { + compatible = "silead,gsl1680"; + reg = <0x40>; + pinctrl-names = "default"; + pinctrl-0 = <&touchscreen_power_pin>; + interrupt-parent = <&pio>; + interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /* EINT21 (PH21) */ + power-gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20 */ + firmware-name = "gsl1680-ainol-aw1.fw"; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + touchscreen-swapped-x-y; + touchscreen-inverted-y; + silead,max-fingers = <5>; + }; +}; + +&lradc { + vref-supply = <®_vcc3v0>; + status = "okay"; + + button@571 { + label = "Volume Up"; + linux,code = <KEY_VOLUMEUP>; + channel = <0>; + voltage = <571428>; + }; + + button@761 { + label = "Volume Down"; + linux,code = <KEY_VOLUMEDOWN>; + channel = <0>; + voltage = <761904>; + }; + + button@952 { + label = "Home"; + linux,code = <KEY_HOME>; + channel = <0>; + voltage = <952380>; + }; +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ + cd-inverted; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&otg_sram { + status = "okay"; +}; + +&pio { + panel_power_pin: panel_power_pin@0 { + pins = "PH8"; + function = "gpio_out"; + }; + + backlight_enable_pin: backlight_enable_pin@0 { + pins = "PH7"; + function = "gpio_out"; + }; + + touchscreen_power_pin: touchscreen_power_pin@0 { + pins = "PH20"; + function = "gpio_out"; + }; + + codec_pa_pin: codec_pa_pin@0 { + pins = "PH15"; + function = "gpio_out"; + }; + + usb0_id_detect_pin: usb0_id_detect_pin@0 { + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; + }; + + usb0_vbus_pin: usb0_vbus_pin@0 { + pins = "PB9"; + function = "gpio_out"; + }; + + usb1_vbus_pin: usb1_vbus_pin@0 { + pins = "PH6"; + function = "gpio_out"; + }; + + usb2_vbus_pin: usb2_vbus_pin@0 { + pins = "PH3"; + function = "gpio_out"; + }; +}; + +&pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_pins_a>; + status = "okay"; +}; + +&tcon0 { + pinctrl-names = "default"; + pinctrl-0 = <&lcd_rgb666_pins>; + status = "okay"; +}; + +&tcon0_out { + tcon0_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_input>; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usbphy { + pinctrl-names = "default"; + pinctrl-0 = <&usb0_id_detect_pin>; + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_vbus_power-supply = <&usb_power_supply>; + usb0_vbus-supply = <®_usb0_vbus>; + usb1_vbus-supply = <®_usb1_vbus>; + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +}; + +#include "axp209.dtsi" + +&battery_power_supply { + status = "okay"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-int-dll"; +}; + +®_ldo1 { + regulator-name = "vdd-rtc"; +}; + +®_ldo2 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + +®_usb0_vbus { + pinctrl-0 = <&usb0_vbus_pin>; + status = "okay"; +}; + +®_usb1_vbus { + pinctrl-0 = <&usb1_vbus_pin>; + status = "okay"; +}; + +®_usb2_vbus { + pinctrl-0 = <&usb2_vbus_pin>; + status = "okay"; +}; + +&usb_power_supply { + status = "okay"; +};
Le mardi 10 avril 2018 à 23:31 +0200, Paul Kocialkowski a écrit :
This adds support for the Ainol AW1, an A20-based 7" tablet from Ainol.
This version didn't use the dedicated binding for the panel and will be fixed in v2 and onwards.
The following board-specific features are supported:
- LCD panel
- Backlight
- USB OTG
- Buttons
- Touchscreen (doesn't work without non-free firmware)
- Accelerometer
- Battery
The following are untested:
- Audio output
- Audio speakers
- USB via SPCI connector
The following are not supported:
- Wi-Fi
- Bluetooth
- NAND
- Audio via SPCI connector
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts | 358 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9f7133b6fba0..03bfacebfdbd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -929,6 +929,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \
- sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts new file mode 100644 index 000000000000..697586991aea --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts @@ -0,0 +1,358 @@ +/*
- Copyright 2018 Paul Kocialkowski contact@paulk.fr
- 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 ofthe
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 theSoftware.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THEWARRANTIES
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 "sun7i-a20.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/pwm/pwm.h>
+/ {
- model = "Ainol AW1";
- compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20";
- aliases {
serial0 = &uart0;- };
- chosen {
stdout-path = "serial0:115200n8";- };
- backlight: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_enable_pin>;pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;brightness-levels = <0 10 20 30 40 50 60 70 80 90100>;
default-brightness-level = <5>;enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */- };
- panel: panel {
compatible = "innolux,at070tn92";#address-cells = <1>;#size-cells = <0>;power-supply = <&panel_power>;backlight = <&backlight>;port@0 {reg = <0>;#address-cells = <1>;#size-cells = <0>;panel_input: endpoint@0 {reg = <0>;remote-endpoint = <&tcon0_out_panel>;};};- };
- panel_power: panel_power {
compatible = "regulator-fixed";pinctrl-names = "default";pinctrl-0 = <&panel_power_pin>;regulator-name = "panel-power";regulator-min-microvolt = <10400000>;regulator-max-microvolt = <10400000>;gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */enable-active-high;regulator-boot-on;- };
+};
+&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
- allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
- status = "okay";
+};
+&cpu0 {
- cpu-supply = <®_dcdc2>;
+};
+&de {
- status = "okay";
+};
+&ehci0 {
- status = "okay";
+};
+&ehci1 {
- status = "okay";
+};
+&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- status = "okay";
- axp209: pmic@34 {
reg = <0x34>;interrupt-parent = <&nmi_intc>;interrupts = <0 IRQ_TYPE_LEVEL_LOW>;- };
+};
+&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
- status = "okay";
- lis3dh: accelerometer@18 {
compatible = "st,lis3dh-accel";reg = <0x18>;vdd-supply = <®_vcc3v3>;vddio-supply = <®_vcc3v3>;st,drdy-int-pin = <1>;- };
+};
+&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
- status = "okay";
- clock-frequency = <400000>; /* 400 KHz required for GSL1680.
*/
- gsl1680: touchscreen@40 {
compatible = "silead,gsl1680";reg = <0x40>;pinctrl-names = "default";pinctrl-0 = <&touchscreen_power_pin>;interrupt-parent = <&pio>;interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /* EINT21(PH21) */
power-gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20*/
firmware-name = "gsl1680-ainol-aw1.fw";touchscreen-size-x = <480>;touchscreen-size-y = <800>;touchscreen-swapped-x-y;touchscreen-inverted-y;silead,max-fingers = <5>;- };
+};
+&lradc {
- vref-supply = <®_vcc3v0>;
- status = "okay";
- button@571 {
label = "Volume Up";linux,code = <KEY_VOLUMEUP>;channel = <0>;voltage = <571428>;- };
- button@761 {
label = "Volume Down";linux,code = <KEY_VOLUMEDOWN>;channel = <0>;voltage = <761904>;- };
- button@952 {
label = "Home";linux,code = <KEY_HOME>;channel = <0>;voltage = <952380>;- };
+};
+&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
- vmmc-supply = <®_vcc3v3>;
- bus-width = <4>;
- cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
- cd-inverted;
- status = "okay";
+};
+&ohci0 {
- status = "okay";
+};
+&ohci1 {
- status = "okay";
+};
+&otg_sram {
- status = "okay";
+};
+&pio {
- panel_power_pin: panel_power_pin@0 {
pins = "PH8";function = "gpio_out";- };
- backlight_enable_pin: backlight_enable_pin@0 {
pins = "PH7";function = "gpio_out";- };
- touchscreen_power_pin: touchscreen_power_pin@0 {
pins = "PH20";function = "gpio_out";- };
- codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";function = "gpio_out";- };
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";function = "gpio_in";bias-pull-up;- };
- usb0_vbus_pin: usb0_vbus_pin@0 {
pins = "PB9";function = "gpio_out";- };
- usb1_vbus_pin: usb1_vbus_pin@0 {
pins = "PH6";function = "gpio_out";- };
- usb2_vbus_pin: usb2_vbus_pin@0 {
pins = "PH3";function = "gpio_out";- };
+};
+&pwm {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
- status = "okay";
+};
+&tcon0 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_rgb666_pins>;
- status = "okay";
+};
+&tcon0_out {
- tcon0_out_panel: endpoint@0 {
reg = <0>;remote-endpoint = <&panel_input>;- };
+};
+&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
- status = "okay";
+};
+&usb_otg {
- dr_mode = "otg";
- status = "okay";
+};
+&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>;
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
- usb0_vbus_power-supply = <&usb_power_supply>;
- usb0_vbus-supply = <®_usb0_vbus>;
- usb1_vbus-supply = <®_usb1_vbus>;
- usb2_vbus-supply = <®_usb2_vbus>;
- status = "okay";
+};
+#include "axp209.dtsi"
+&battery_power_supply {
- status = "okay";
+};
+®_dcdc2 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1450000>;
- regulator-name = "vdd-cpu";
+};
+®_dcdc3 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1400000>;
- regulator-name = "vdd-int-dll";
+};
+®_ldo1 {
- regulator-name = "vdd-rtc";
+};
+®_ldo2 {
- regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "avcc";
+};
+®_usb0_vbus {
- pinctrl-0 = <&usb0_vbus_pin>;
- status = "okay";
+};
+®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin>;
- status = "okay";
+};
+®_usb2_vbus {
- pinctrl-0 = <&usb2_vbus_pin>;
- status = "okay";
+};
+&usb_power_supply {
- status = "okay";
+};
Hi,
Le mardi 10 avril 2018 à 23:35 +0200, Paul Kocialkowski a écrit :
Le mardi 10 avril 2018 à 23:31 +0200, Paul Kocialkowski a écrit :
This adds support for the Ainol AW1, an A20-based 7" tablet from Ainol.
This version didn't use the dedicated binding for the panel and will be fixed in v2 and onwards.
The following board-specific features are supported:
- LCD panel
- Backlight
- USB OTG
- Buttons
- Touchscreen (doesn't work without non-free firmware)
- Accelerometer
- Battery
The following are untested:
- Audio output
- Audio speakers
- USB via SPCI connector
The following are not supported:
- Wi-Fi
- Bluetooth
- NAND
- Audio via SPCI connector
The camera is also not supported at this point.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts | 358 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9f7133b6fba0..03bfacebfdbd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -929,6 +929,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \
- sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts new file mode 100644 index 000000000000..697586991aea --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts @@ -0,0 +1,358 @@ +/*
- Copyright 2018 Paul Kocialkowski contact@paulk.fr
- 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 Licenseas
published by the Free Software Foundation; either version 2of 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 warrantyof
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Seethe
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 associateddocumentation
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 whomthe
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shallbe
included in all copies or substantial portions of theSoftware.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THEWARRANTIES
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 USEOR
OTHER DEALINGS IN THE SOFTWARE.- */
+/dts-v1/; +#include "sun7i-a20.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/pwm/pwm.h>
+/ {
- model = "Ainol AW1";
- compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20";
- aliases {
serial0 = &uart0;- };
- chosen {
stdout-path = "serial0:115200n8";- };
- backlight: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_enable_pin>;pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;brightness-levels = <0 10 20 30 40 50 60 70 80 90100>;
default-brightness-level = <5>;enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7*/
- };
- panel: panel {
compatible = "innolux,at070tn92";#address-cells = <1>;#size-cells = <0>;power-supply = <&panel_power>;backlight = <&backlight>;port@0 {reg = <0>;#address-cells = <1>;#size-cells = <0>;panel_input: endpoint@0 {reg = <0>;remote-endpoint =<&tcon0_out_panel>;
};};- };
- panel_power: panel_power {
compatible = "regulator-fixed";pinctrl-names = "default";pinctrl-0 = <&panel_power_pin>;regulator-name = "panel-power";regulator-min-microvolt = <10400000>;regulator-max-microvolt = <10400000>;gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */enable-active-high;regulator-boot-on;- };
+};
+&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
- allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15
*/
- status = "okay";
+};
+&cpu0 {
- cpu-supply = <®_dcdc2>;
+};
+&de {
- status = "okay";
+};
+&ehci0 {
- status = "okay";
+};
+&ehci1 {
- status = "okay";
+};
+&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- status = "okay";
- axp209: pmic@34 {
reg = <0x34>;interrupt-parent = <&nmi_intc>;interrupts = <0 IRQ_TYPE_LEVEL_LOW>;- };
+};
+&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
- status = "okay";
- lis3dh: accelerometer@18 {
compatible = "st,lis3dh-accel";reg = <0x18>;vdd-supply = <®_vcc3v3>;vddio-supply = <®_vcc3v3>;st,drdy-int-pin = <1>;- };
+};
+&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
- status = "okay";
- clock-frequency = <400000>; /* 400 KHz required for
GSL1680. */
- gsl1680: touchscreen@40 {
compatible = "silead,gsl1680";reg = <0x40>;pinctrl-names = "default";pinctrl-0 = <&touchscreen_power_pin>;interrupt-parent = <&pio>;interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /*EINT21 (PH21) */
power-gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20*/
firmware-name = "gsl1680-ainol-aw1.fw";touchscreen-size-x = <480>;touchscreen-size-y = <800>;touchscreen-swapped-x-y;touchscreen-inverted-y;silead,max-fingers = <5>;- };
+};
+&lradc {
- vref-supply = <®_vcc3v0>;
- status = "okay";
- button@571 {
label = "Volume Up";linux,code = <KEY_VOLUMEUP>;channel = <0>;voltage = <571428>;- };
- button@761 {
label = "Volume Down";linux,code = <KEY_VOLUMEDOWN>;channel = <0>;voltage = <761904>;- };
- button@952 {
label = "Home";linux,code = <KEY_HOME>;channel = <0>;voltage = <952380>;- };
+};
+&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
- vmmc-supply = <®_vcc3v3>;
- bus-width = <4>;
- cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
- cd-inverted;
- status = "okay";
+};
+&ohci0 {
- status = "okay";
+};
+&ohci1 {
- status = "okay";
+};
+&otg_sram {
- status = "okay";
+};
+&pio {
- panel_power_pin: panel_power_pin@0 {
pins = "PH8";function = "gpio_out";- };
- backlight_enable_pin: backlight_enable_pin@0 {
pins = "PH7";function = "gpio_out";- };
- touchscreen_power_pin: touchscreen_power_pin@0 {
pins = "PH20";function = "gpio_out";- };
- codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";function = "gpio_out";- };
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";function = "gpio_in";bias-pull-up;- };
- usb0_vbus_pin: usb0_vbus_pin@0 {
pins = "PB9";function = "gpio_out";- };
- usb1_vbus_pin: usb1_vbus_pin@0 {
pins = "PH6";function = "gpio_out";- };
- usb2_vbus_pin: usb2_vbus_pin@0 {
pins = "PH3";function = "gpio_out";- };
+};
+&pwm {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
- status = "okay";
+};
+&tcon0 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_rgb666_pins>;
- status = "okay";
+};
+&tcon0_out {
- tcon0_out_panel: endpoint@0 {
reg = <0>;remote-endpoint = <&panel_input>;- };
+};
+&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
- status = "okay";
+};
+&usb_otg {
- dr_mode = "otg";
- status = "okay";
+};
+&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>;
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
- usb0_vbus_power-supply = <&usb_power_supply>;
- usb0_vbus-supply = <®_usb0_vbus>;
- usb1_vbus-supply = <®_usb1_vbus>;
- usb2_vbus-supply = <®_usb2_vbus>;
- status = "okay";
+};
+#include "axp209.dtsi"
+&battery_power_supply {
- status = "okay";
+};
+®_dcdc2 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1450000>;
- regulator-name = "vdd-cpu";
+};
+®_dcdc3 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1400000>;
- regulator-name = "vdd-int-dll";
+};
+®_ldo1 {
- regulator-name = "vdd-rtc";
+};
+®_ldo2 {
- regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "avcc";
+};
+®_usb0_vbus {
- pinctrl-0 = <&usb0_vbus_pin>;
- status = "okay";
+};
+®_usb1_vbus {
- pinctrl-0 = <&usb1_vbus_pin>;
- status = "okay";
+};
+®_usb2_vbus {
- pinctrl-0 = <&usb2_vbus_pin>;
- status = "okay";
+};
+&usb_power_supply {
- status = "okay";
+};
-- Paul Kocialkowski,
developer of free digital technology and hardware support.
Website: https://www.paulk.fr/ Coding blog: https://code.paulk.fr/ Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
Hi,
On Tue, Apr 10, 2018 at 11:31:29PM +0200, Paul Kocialkowski wrote:
This adds support for the Ainol AW1, an A20-based 7" tablet from Ainol.
The following board-specific features are supported:
- LCD panel
- Backlight
- USB OTG
- Buttons
- Touchscreen (doesn't work without non-free firmware)
- Accelerometer
- Battery
The following are untested:
- Audio output
- Audio speakers
- USB via SPCI connector
The following are not supported:
- Wi-Fi
- Bluetooth
- NAND
- Audio via SPCI connector
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts | 358 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9f7133b6fba0..03bfacebfdbd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -929,6 +929,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \
- sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts new file mode 100644 index 000000000000..697586991aea --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts @@ -0,0 +1,358 @@ +/*
- Copyright 2018 Paul Kocialkowski contact@paulk.fr
- 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.
Can you use an SPDX header instead of the whole license text?
- */
+/dts-v1/; +#include "sun7i-a20.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/pwm/pwm.h>
+/ {
- model = "Ainol AW1";
- compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20";
- aliases {
serial0 = &uart0;- };
- chosen {
stdout-path = "serial0:115200n8";- };
- backlight: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_enable_pin>;
You don't need any of the pinctrl nodes for the GPIOs
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;default-brightness-level = <5>;enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */- };
- panel: panel {
compatible = "innolux,at070tn92";#address-cells = <1>;#size-cells = <0>;power-supply = <&panel_power>;backlight = <&backlight>;port@0 {reg = <0>;#address-cells = <1>;#size-cells = <0>;panel_input: endpoint@0 {reg = <0>;remote-endpoint = <&tcon0_out_panel>;};};- };
- panel_power: panel_power {
compatible = "regulator-fixed";pinctrl-names = "default";pinctrl-0 = <&panel_power_pin>;regulator-name = "panel-power";regulator-min-microvolt = <10400000>;regulator-max-microvolt = <10400000>;gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */enable-active-high;
Sigh, we should really convert regulator-fixed to use the proper GPIO API here...
regulator-boot-on;- };
+};
+&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
- allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
- status = "okay";
+};
+&cpu0 {
- cpu-supply = <®_dcdc2>;
+};
How was CPUfreq tested?
+&de {
- status = "okay";
+};
+&ehci0 {
- status = "okay";
+};
+&ehci1 {
- status = "okay";
+};
+&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- status = "okay";
- axp209: pmic@34 {
reg = <0x34>;interrupt-parent = <&nmi_intc>;interrupts = <0 IRQ_TYPE_LEVEL_LOW>;- };
+};
+&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
- status = "okay";
- lis3dh: accelerometer@18 {
compatible = "st,lis3dh-accel";reg = <0x18>;vdd-supply = <®_vcc3v3>;vddio-supply = <®_vcc3v3>;st,drdy-int-pin = <1>;- };
+};
+&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
- status = "okay";
- clock-frequency = <400000>; /* 400 KHz required for GSL1680. */
I'm not sure that comment is worth it. The only device there is the touchscreen, so it's kind of obvious that it's the device that needs that frequency.
- gsl1680: touchscreen@40 {
compatible = "silead,gsl1680";reg = <0x40>;pinctrl-names = "default";pinctrl-0 = <&touchscreen_power_pin>;interrupt-parent = <&pio>;interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /* EINT21 (PH21) */power-gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20 */firmware-name = "gsl1680-ainol-aw1.fw";touchscreen-size-x = <480>;touchscreen-size-y = <800>;touchscreen-swapped-x-y;touchscreen-inverted-y;silead,max-fingers = <5>;- };
+};
+&lradc {
- vref-supply = <®_vcc3v0>;
You should use the proper regulator from the PMIC here.
- status = "okay";
- button@571 {
label = "Volume Up";linux,code = <KEY_VOLUMEUP>;channel = <0>;voltage = <571428>;- };
- button@761 {
label = "Volume Down";linux,code = <KEY_VOLUMEDOWN>;channel = <0>;voltage = <761904>;- };
- button@952 {
label = "Home";linux,code = <KEY_HOME>;channel = <0>;voltage = <952380>;- };
+};
+&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
- vmmc-supply = <®_vcc3v3>;
And here too.
- bus-width = <4>;
- cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
- cd-inverted;
- status = "okay";
+};
+&ohci0 {
- status = "okay";
+};
+&ohci1 {
- status = "okay";
+};
+&otg_sram {
- status = "okay";
+};
+&pio {
- panel_power_pin: panel_power_pin@0 {
pins = "PH8";function = "gpio_out";- };
- backlight_enable_pin: backlight_enable_pin@0 {
pins = "PH7";function = "gpio_out";- };
- touchscreen_power_pin: touchscreen_power_pin@0 {
pins = "PH20";function = "gpio_out";- };
- codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";function = "gpio_out";- };
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";function = "gpio_in";bias-pull-up;- };
- usb0_vbus_pin: usb0_vbus_pin@0 {
pins = "PB9";function = "gpio_out";- };
- usb1_vbus_pin: usb1_vbus_pin@0 {
pins = "PH6";function = "gpio_out";- };
- usb2_vbus_pin: usb2_vbus_pin@0 {
pins = "PH3";function = "gpio_out";- };
+};
+&pwm {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
- status = "okay";
+};
+&tcon0 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_rgb666_pins>;
- status = "okay";
+};
+&tcon0_out {
- tcon0_out_panel: endpoint@0 {
reg = <0>;remote-endpoint = <&panel_input>;- };
+};
+&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
- status = "okay";
+};
+&usb_otg {
- dr_mode = "otg";
- status = "okay";
+};
+&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>;
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
- usb0_vbus_power-supply = <&usb_power_supply>;
- usb0_vbus-supply = <®_usb0_vbus>;
- usb1_vbus-supply = <®_usb1_vbus>;
- usb2_vbus-supply = <®_usb2_vbus>;
And here as well.
Maxime
Hi and thanks for the review !
Le mercredi 11 avril 2018 à 09:06 +0200, Maxime Ripard a écrit :
Hi,
On Tue, Apr 10, 2018 at 11:31:29PM +0200, Paul Kocialkowski wrote:
This adds support for the Ainol AW1, an A20-based 7" tablet from Ainol.
The following board-specific features are supported:
- LCD panel
- Backlight
- USB OTG
- Buttons
- Touchscreen (doesn't work without non-free firmware)
- Accelerometer
- Battery
The following are untested:
- Audio output
- Audio speakers
- USB via SPCI connector
The following are not supported:
- Wi-Fi
- Bluetooth
- NAND
- Audio via SPCI connector
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts | 358 ++++++++++++++++++++++++++++++ 2 files changed, 359 insertions(+) create mode 100644 arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9f7133b6fba0..03bfacebfdbd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -929,6 +929,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-sinovoip-bpi-m2.dtb \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \
- sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts new file mode 100644 index 000000000000..697586991aea --- /dev/null +++ b/arch/arm/boot/dts/sun7i-a20-ainol-aw1.dts @@ -0,0 +1,358 @@ +/*
- Copyright 2018 Paul Kocialkowski contact@paulk.fr
- 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 Licenseas
published by the Free Software Foundation; either version 2of 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 warrantyof
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Seethe
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 associateddocumentation
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 whomthe
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shallbe
included in all copies or substantial portions of theSoftware.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANYKIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THEWARRANTIES
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 USEOR
OTHER DEALINGS IN THE SOFTWARE.Can you use an SPDX header instead of the whole license text?
Sure, will do in v2.
- */
+/dts-v1/; +#include "sun7i-a20.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/pwm/pwm.h>
+/ {
- model = "Ainol AW1";
- compatible = "ainol,ainol-aw1", "allwinner,sun7i-a20";
- aliases {
serial0 = &uart0;- };
- chosen {
stdout-path = "serial0:115200n8";- };
- backlight: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_enable_pin>;You don't need any of the pinctrl nodes for the GPIOs
I tried without the pinctrl nodes and got issues on various controllers (e.g. i2c for the touchscreen) because of the missing pinctrl nodes on 4.16. Maybe I'm missing some patches here?
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;brightness-levels = <0 10 20 30 40 50 60 70 80 90100>;
default-brightness-level = <5>;enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7*/
- };
- panel: panel {
compatible = "innolux,at070tn92";#address-cells = <1>;#size-cells = <0>;power-supply = <&panel_power>;backlight = <&backlight>;port@0 {reg = <0>;#address-cells = <1>;#size-cells = <0>;panel_input: endpoint@0 {reg = <0>;remote-endpoint =<&tcon0_out_panel>;
};};- };
- panel_power: panel_power {
compatible = "regulator-fixed";pinctrl-names = "default";pinctrl-0 = <&panel_power_pin>;regulator-name = "panel-power";regulator-min-microvolt = <10400000>;regulator-max-microvolt = <10400000>;gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */enable-active-high;Sigh, we should really convert regulator-fixed to use the proper GPIO API here...
regulator-boot-on;- };
+};
+&codec {
- pinctrl-names = "default";
- pinctrl-0 = <&codec_pa_pin>;
- allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15
*/
- status = "okay";
+};
+&cpu0 {
- cpu-supply = <®_dcdc2>;
+};
How was CPUfreq tested?
In fact, I haven't tried it at all, but I can definitely do that with e.g. ssvb's stress test for various cpufreq functioning points.
+&de {
- status = "okay";
+};
+&ehci0 {
- status = "okay";
+};
+&ehci1 {
- status = "okay";
+};
+&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
- status = "okay";
- axp209: pmic@34 {
reg = <0x34>;interrupt-parent = <&nmi_intc>;interrupts = <0 IRQ_TYPE_LEVEL_LOW>;- };
+};
+&i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins_a>;
- status = "okay";
- lis3dh: accelerometer@18 {
compatible = "st,lis3dh-accel";reg = <0x18>;vdd-supply = <®_vcc3v3>;vddio-supply = <®_vcc3v3>;st,drdy-int-pin = <1>;- };
+};
+&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
- status = "okay";
- clock-frequency = <400000>; /* 400 KHz required for
GSL1680. */
I'm not sure that comment is worth it. The only device there is the touchscreen, so it's kind of obvious that it's the device that needs that frequency.
Well, I found a similar comment in the other dts using the same touchscreen controller. Since the information was rather valuable (it made it clear that I needed the same clock frequency for that specific touchscreen), it might help others in the future (even if only when grepping for gsl1680).
- gsl1680: touchscreen@40 {
compatible = "silead,gsl1680";reg = <0x40>;pinctrl-names = "default";pinctrl-0 = <&touchscreen_power_pin>;interrupt-parent = <&pio>;interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /*EINT21 (PH21) */
power-gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20*/
firmware-name = "gsl1680-ainol-aw1.fw";touchscreen-size-x = <480>;touchscreen-size-y = <800>;touchscreen-swapped-x-y;touchscreen-inverted-y;silead,max-fingers = <5>;- };
+};
+&lradc {
- vref-supply = <®_vcc3v0>;
You should use the proper regulator from the PMIC here.
Fair enough, I'll look into that and try to fix it in v2. I think this was inspired from another dts using lradc for buttons.
- status = "okay";
- button@571 {
label = "Volume Up";linux,code = <KEY_VOLUMEUP>;channel = <0>;voltage = <571428>;- };
- button@761 {
label = "Volume Down";linux,code = <KEY_VOLUMEDOWN>;channel = <0>;voltage = <761904>;- };
- button@952 {
label = "Home";linux,code = <KEY_HOME>;channel = <0>;voltage = <952380>;- };
+};
+&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>;
- vmmc-supply = <®_vcc3v3>;
And here too.
I will also look into it for v2 then.
- bus-width = <4>;
- cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
- cd-inverted;
- status = "okay";
+};
+&ohci0 {
- status = "okay";
+};
+&ohci1 {
- status = "okay";
+};
+&otg_sram {
- status = "okay";
+};
+&pio {
- panel_power_pin: panel_power_pin@0 {
pins = "PH8";function = "gpio_out";- };
- backlight_enable_pin: backlight_enable_pin@0 {
pins = "PH7";function = "gpio_out";- };
- touchscreen_power_pin: touchscreen_power_pin@0 {
pins = "PH20";function = "gpio_out";- };
- codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";function = "gpio_out";- };
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";function = "gpio_in";bias-pull-up;- };
- usb0_vbus_pin: usb0_vbus_pin@0 {
pins = "PB9";function = "gpio_out";- };
- usb1_vbus_pin: usb1_vbus_pin@0 {
pins = "PH6";function = "gpio_out";- };
- usb2_vbus_pin: usb2_vbus_pin@0 {
pins = "PH3";function = "gpio_out";- };
+};
+&pwm {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm0_pins_a>;
- status = "okay";
+};
+&tcon0 {
- pinctrl-names = "default";
- pinctrl-0 = <&lcd_rgb666_pins>;
- status = "okay";
+};
+&tcon0_out {
- tcon0_out_panel: endpoint@0 {
reg = <0>;remote-endpoint = <&panel_input>;- };
+};
+&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
- status = "okay";
+};
+&usb_otg {
- dr_mode = "otg";
- status = "okay";
+};
+&usbphy {
- pinctrl-names = "default";
- pinctrl-0 = <&usb0_id_detect_pin>;
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
- usb0_vbus_power-supply = <&usb_power_supply>;
- usb0_vbus-supply = <®_usb0_vbus>;
- usb1_vbus-supply = <®_usb1_vbus>;
- usb2_vbus-supply = <®_usb2_vbus>;
And here as well.
On Thu, Apr 12, 2018 at 01:08:51AM +0200, Paul Kocialkowski wrote:
- backlight: backlight {
compatible = "pwm-backlight";pinctrl-names = "default";pinctrl-0 = <&backlight_enable_pin>;You don't need any of the pinctrl nodes for the GPIOs
I tried without the pinctrl nodes and got issues on various controllers (e.g. i2c for the touchscreen) because of the missing pinctrl nodes on 4.16. Maybe I'm missing some patches here?
You don't need any patches. What was the error exactly?
+&cpu0 {
- cpu-supply = <®_dcdc2>;
+};
How was CPUfreq tested?
In fact, I haven't tried it at all, but I can definitely do that with e.g. ssvb's stress test for various cpufreq functioning points.
That would be great yes.
+&i2c2 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c2_pins_a>;
- status = "okay";
- clock-frequency = <400000>; /* 400 KHz required for
GSL1680. */
I'm not sure that comment is worth it. The only device there is the touchscreen, so it's kind of obvious that it's the device that needs that frequency.
Well, I found a similar comment in the other dts using the same touchscreen controller. Since the information was rather valuable (it made it clear that I needed the same clock frequency for that specific touchscreen),
You can have the same kind of comment for pretty much all DT lines. you could for example have on the pinctrl property just above the comment that the I2C2 on that boards are tied to those pins. But that's just redundant, and the SNR would be pretty bad if we were to do it everywhere.
it might help others in the future (even if only when grepping for gsl1680).
- gsl1680: touchscreen@40 {
compatible = "silead,gsl1680";
You have the gsl1680 two times here, so grep would find it either way.
Maxime
On Tue, Apr 10, 2018 at 11:31:27PM +0200, Paul Kocialkowski wrote:
This adds timings for the RGB666 variant of the Innolux AT070TN92 panel, as found on the Ainol AW1 tablet.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
drivers/gpu/drm/panel/panel-simple.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 5591984a392b..efeb2f2162bc 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1063,6 +1063,29 @@ static const struct panel_desc innolux_at070tn92 = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
+static const struct drm_display_mode innolux_at070tn92_rgb666_mode = {
- .clock = 40000,
- .hdisplay = 800,
- .hsync_start = 800 + 112,
- .hsync_end = 800 + 112 + 1,
- .htotal = 800 + 112 + 1 + 87,
- .vdisplay = 480,
- .vsync_start = 480 + 141,
- .vsync_end = 480 + 141 + 1,
- .vtotal = 480 + 141 + 1 + 38,
- .vrefresh = 60,
+};
I'm not sure why you'd need different timings if the only difference is the bus width.
+static const struct panel_desc innolux_at070tn92_rgb666 = {
- .modes = &innolux_at070tn92_rgb666_mode,
- .num_modes = 1,
- .size = {
.width = 154,.height = 86,- },
- .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
+};
static const struct display_timing innolux_g101ice_l01_timing = { .pixelclock = { 60400000, 71100000, 74700000 }, .hactive = { 1280, 1280, 1280 }, @@ -2105,6 +2128,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "innolux,at070tn92", .data = &innolux_at070tn92,
- }, {
.compatible = "innolux,at070tn92-rgb666",.data = &innolux_at070tn92_rgb666,
And this isn't a different device, it's just the integration in the board that is different, so you shouldn't have a different compatible here, but rather something like the bus-width property documented in the Documentation/devicetree/bindings/media/video-interfaces.txt file.
Maxime
Hi,
Le mercredi 11 avril 2018 à 08:28 +0200, Maxime Ripard a écrit :
On Tue, Apr 10, 2018 at 11:31:27PM +0200, Paul Kocialkowski wrote:
This adds timings for the RGB666 variant of the Innolux AT070TN92 panel, as found on the Ainol AW1 tablet.
Signed-off-by: Paul Kocialkowski contact@paulk.fr
drivers/gpu/drm/panel/panel-simple.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 5591984a392b..efeb2f2162bc 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1063,6 +1063,29 @@ static const struct panel_desc innolux_at070tn92 = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
+static const struct drm_display_mode innolux_at070tn92_rgb666_mode = {
- .clock = 40000,
- .hdisplay = 800,
- .hsync_start = 800 + 112,
- .hsync_end = 800 + 112 + 1,
- .htotal = 800 + 112 + 1 + 87,
- .vdisplay = 480,
- .vsync_start = 480 + 141,
- .vsync_end = 480 + 141 + 1,
- .vtotal = 480 + 141 + 1 + 38,
- .vrefresh = 60,
+};
I'm not sure why you'd need different timings if the only difference is the bus width.
I'll try with the other timings, although it might be desirable to have a higher clock speed thanks to the reduced number of wires on the bus.
+static const struct panel_desc innolux_at070tn92_rgb666 = {
- .modes = &innolux_at070tn92_rgb666_mode,
- .num_modes = 1,
- .size = {
.width = 154,.height = 86,- },
- .bus_format = MEDIA_BUS_FMT_RGB666_1X18,
+};
static const struct display_timing innolux_g101ice_l01_timing = { .pixelclock = { 60400000, 71100000, 74700000 }, .hactive = { 1280, 1280, 1280 }, @@ -2105,6 +2128,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "innolux,at070tn92", .data = &innolux_at070tn92,
- }, {
.compatible = "innolux,at070tn92-rgb666",.data = &innolux_at070tn92_rgb666,And this isn't a different device, it's just the integration in the board that is different, so you shouldn't have a different compatible here, but rather something like the bus-width property documented in the Documentation/devicetree/bindings/media/video-interfaces.txt file.
I'll take a look at it and try to craft v2 in this direction then.
Thanks for the review!
dri-devel@lists.freedesktop.org
-
Giulio Benetti -
Maxime Ripard -
Paul Kocialkowski