Skip to content

Commit d4b80d9

Browse files
committed
Merge branch 'next/late' with mainline
* next/late: (25 commits) arm64: dts: exynos: Add regulators for Vbus and Vbus-Boost arm64: dts: exynos: Add USB 3.0 controller node for Exynos7 arm64: dts: exynos: Use macros for pinctrl configuration on Exynos7 pinctrl: dt-bindings: samsung: Add Exynos7 specific pinctrl macro definitions arm64: dts: exynos: Add initial configuration for DISP clocks for TM2/TM2e ARM64: dts: meson-gxbb-p200: add ADC laddered keys ARM64: dts: meson: meson-gx: add the SAR ADC ARM64: dts: meson-gxl: add the pwm_ao_b pin ARM64: dts: meson-gx: add the missing pwm_AO_ab node clk: gxbb: fix CLKID_ETH defined twice clk: samsung: exynos5433: Add data for 250MHz and 278MHz PLL rates clk: samsung: exynos5433: Add IDs for PHYCLK_MIPIDPHY0_* clocks ARM64: dts: meson-gxl: rename Nexbox A95x for consistency clk: gxbb: add the SAR ADC clocks and expose them dt-bindings: amlogic: Add WeTek boards ARM64: dts: meson-gxbb: Add support for WeTek Hub and Play dt-bindings: vendor-prefix: Add wetek vendor prefix ARM64: dts: meson-gxm: Rename q200 and q201 DT files for consistency ARM64: dts: meson-gx: Add HDMI HPD/DDC pinctrl nodes ARM64: dts: meson-gxbb-vega-s95: Add LED ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b2e3c43 + 3e01103 commit d4b80d9

26 files changed

+842
-233
lines changed

Documentation/devicetree/bindings/arm/amlogic.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Board compatible values:
4040
- "hardkernel,odroid-c2" (Meson gxbb)
4141
- "amlogic,p200" (Meson gxbb)
4242
- "amlogic,p201" (Meson gxbb)
43+
- "wetek,hub" (Meson gxbb)
44+
- "wetek,play2" (Meson gxbb)
4345
- "amlogic,p212" (Meson gxl s905x)
4446
- "amlogic,p230" (Meson gxl s905d)
4547
- "amlogic,p231" (Meson gxl s905d)

Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ virtio Virtual I/O Device Specification, developed by the OASIS consortium
329329
vivante Vivante Corporation
330330
voipac Voipac Technologies s.r.o.
331331
wd Western Digital Corp.
332+
wetek WeTek Electronics, limited.
332333
wexler Wexler
333334
winbond Winbond Electronics corp.
334335
wlf Wolfson Microelectronics

arch/arm64/boot/dts/amlogic/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb
55
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb
66
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
77
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb
8+
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb
9+
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
810
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
911
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
1012
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
11-
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-nexbox-a95x.dtb
12-
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q200.dtb
13-
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q201.dtb
13+
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
14+
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
15+
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
1416
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
1517

1618
always := $(dtb-y)

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
reg = <0x0 0x0>;
8484
enable-method = "psci";
8585
next-level-cache = <&l2>;
86+
clocks = <&scpi_dvfs 0>;
8687
};
8788

8889
cpu1: cpu@1 {
@@ -91,6 +92,7 @@
9192
reg = <0x0 0x1>;
9293
enable-method = "psci";
9394
next-level-cache = <&l2>;
95+
clocks = <&scpi_dvfs 0>;
9496
};
9597

9698
cpu2: cpu@2 {
@@ -99,6 +101,7 @@
99101
reg = <0x0 0x2>;
100102
enable-method = "psci";
101103
next-level-cache = <&l2>;
104+
clocks = <&scpi_dvfs 0>;
102105
};
103106

104107
cpu3: cpu@3 {
@@ -107,6 +110,7 @@
107110
reg = <0x0 0x3>;
108111
enable-method = "psci";
109112
next-level-cache = <&l2>;
113+
clocks = <&scpi_dvfs 0>;
110114
};
111115

112116
l2: l2-cache0 {
@@ -171,6 +175,28 @@
171175
};
172176
};
173177

178+
scpi {
179+
compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";
180+
mboxes = <&mailbox 1 &mailbox 2>;
181+
shmem = <&cpu_scp_lpri &cpu_scp_hpri>;
182+
183+
scpi_clocks: clocks {
184+
compatible = "arm,scpi-clocks";
185+
186+
scpi_dvfs: scpi_clocks@0 {
187+
compatible = "arm,scpi-dvfs-clocks";
188+
#clock-cells = <1>;
189+
clock-indices = <0>;
190+
clock-output-names = "vcpu";
191+
};
192+
};
193+
194+
scpi_sensors: sensors {
195+
compatible = "arm,scpi-sensors";
196+
#thermal-sensor-cells = <1>;
197+
};
198+
};
199+
174200
soc {
175201
compatible = "simple-bus";
176202
#address-cells = <2>;
@@ -229,6 +255,14 @@
229255
status = "disabled";
230256
};
231257

258+
saradc: adc@8680 {
259+
compatible = "amlogic,meson-saradc";
260+
reg = <0x0 0x8680 0x0 0x34>;
261+
#io-channel-cells = <1>;
262+
interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>;
263+
status = "disabled";
264+
};
265+
232266
pwm_ef: pwm@86c0 {
233267
compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
234268
reg = <0x0 0x086c0 0x0 0x10>;
@@ -282,6 +316,25 @@
282316
#address-cells = <0>;
283317
};
284318

319+
sram: sram@c8000000 {
320+
compatible = "amlogic,meson-gxbb-sram", "mmio-sram";
321+
reg = <0x0 0xc8000000 0x0 0x14000>;
322+
323+
#address-cells = <1>;
324+
#size-cells = <1>;
325+
ranges = <0 0x0 0xc8000000 0x14000>;
326+
327+
cpu_scp_lpri: scp-shmem@0 {
328+
compatible = "amlogic,meson-gxbb-scp-shmem";
329+
reg = <0x13000 0x400>;
330+
};
331+
332+
cpu_scp_hpri: scp-shmem@200 {
333+
compatible = "amlogic,meson-gxbb-scp-shmem";
334+
reg = <0x13400 0x400>;
335+
};
336+
};
337+
285338
aobus: aobus@c8100000 {
286339
compatible = "simple-bus";
287340
reg = <0x0 0xc8100000 0x0 0x100000>;
@@ -297,6 +350,21 @@
297350
status = "disabled";
298351
};
299352

353+
uart_AO_B: serial@4e0 {
354+
compatible = "amlogic,meson-uart";
355+
reg = <0x0 0x004e0 0x0 0x14>;
356+
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
357+
clocks = <&xtal>;
358+
status = "disabled";
359+
};
360+
361+
pwm_AO_ab: pwm@550 {
362+
compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
363+
reg = <0x0 0x00550 0x0 0x10>;
364+
#pwm-cells = <3>;
365+
status = "disabled";
366+
};
367+
300368
ir: ir@580 {
301369
compatible = "amlogic,meson-gxbb-ir";
302370
reg = <0x0 0x00580 0x0 0x40>;

arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,64 @@
4545
/dts-v1/;
4646

4747
#include "meson-gxbb-p20x.dtsi"
48+
#include <dt-bindings/input/input.h>
4849

4950
/ {
5051
compatible = "amlogic,p200", "amlogic,meson-gxbb";
5152
model = "Amlogic Meson GXBB P200 Development Board";
53+
54+
avdd18_usb_adc: regulator-avdd18_usb_adc {
55+
compatible = "regulator-fixed";
56+
regulator-name = "AVDD18_USB_ADC";
57+
regulator-min-microvolt = <1800000>;
58+
regulator-max-microvolt = <1800000>;
59+
};
60+
61+
adc_keys {
62+
compatible = "adc-keys";
63+
io-channels = <&saradc 0>;
64+
io-channel-names = "buttons";
65+
keyup-threshold-microvolt = <1800000>;
66+
67+
button-home {
68+
label = "Home";
69+
linux,code = <KEY_HOME>;
70+
press-threshold-microvolt = <900000>; /* 50% */
71+
};
72+
73+
button-esc {
74+
label = "Esc";
75+
linux,code = <KEY_ESC>;
76+
press-threshold-microvolt = <684000>; /* 38% */
77+
};
78+
79+
button-up {
80+
label = "Volume Up";
81+
linux,code = <KEY_VOLUMEUP>;
82+
press-threshold-microvolt = <468000>; /* 26% */
83+
};
84+
85+
button-down {
86+
label = "Volume Down";
87+
linux,code = <KEY_VOLUMEDOWN>;
88+
press-threshold-microvolt = <252000>; /* 14% */
89+
};
90+
91+
button-menu {
92+
label = "Menu";
93+
linux,code = <KEY_MENU>;
94+
press-threshold-microvolt = <0>; /* 0% */
95+
};
96+
};
5297
};
5398

5499
&i2c_B {
55100
status = "okay";
56101
pinctrl-0 = <&i2c_b_pins>;
57102
pinctrl-names = "default";
58103
};
104+
105+
&saradc {
106+
status = "okay";
107+
vref-supply = <&avdd18_usb_adc>;
108+
};

arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@
5353
stdout-path = "serial0:115200n8";
5454
};
5555

56+
leds {
57+
compatible = "gpio-leds";
58+
59+
blue {
60+
label = "vega-s95:blue:on";
61+
gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
62+
default-state = "on";
63+
panic-indicator;
64+
};
65+
};
66+
5667
usb_vbus: regulator-usb0-vbus {
5768
compatible = "regulator-fixed";
5869

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright (c) 2016 BayLibre, Inc.
3+
* Author: Neil Armstrong <narmstrong@baylibre.com>
4+
*
5+
* This file is dual-licensed: you can use it either under the terms
6+
* of the GPL or the X11 license, at your option. Note that this dual
7+
* licensing only applies to this file, and not this project as a
8+
* whole.
9+
*
10+
* a) This library is free software; you can redistribute it and/or
11+
* modify it under the terms of the GNU General Public License as
12+
* published by the Free Software Foundation; either version 2 of the
13+
* License, or (at your option) any later version.
14+
*
15+
* This library is distributed in the hope that it will be useful,
16+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
* GNU General Public License for more details.
19+
*
20+
* Or, alternatively,
21+
*
22+
* b) Permission is hereby granted, free of charge, to any person
23+
* obtaining a copy of this software and associated documentation
24+
* files (the "Software"), to deal in the Software without
25+
* restriction, including without limitation the rights to use,
26+
* copy, modify, merge, publish, distribute, sublicense, and/or
27+
* sell copies of the Software, and to permit persons to whom the
28+
* Software is furnished to do so, subject to the following
29+
* conditions:
30+
*
31+
* The above copyright notice and this permission notice shall be
32+
* included in all copies or substantial portions of the Software.
33+
*
34+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
35+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
36+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
37+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
38+
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
39+
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
40+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
41+
* OTHER DEALINGS IN THE SOFTWARE.
42+
*/
43+
44+
/dts-v1/;
45+
46+
#include "meson-gxbb-p20x.dtsi"
47+
48+
/ {
49+
compatible = "wetek,hub", "amlogic,meson-gxbb";
50+
model = "WeTek Hub";
51+
52+
leds {
53+
compatible = "gpio-leds";
54+
55+
system {
56+
label = "wetek-play:system-status";
57+
gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
58+
default-state = "on";
59+
panic-indicator;
60+
};
61+
};
62+
63+
cvbs-connector {
64+
status = "disabled";
65+
};
66+
};

0 commit comments

Comments
 (0)