Skip to content

Commit a1a0db3

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late DT updates from Arnd Bergmann: "These updates have been kept in a separate branch mostly because they rely on updates to the respective clk drivers to keep the shared header files in sync. This includes two branches for arm64 dt updates, both following up on earlier changes for the same platforms that are already merged: Samsung: - add USB3 support in Exynos7 - minor PM related updates Amlogic: - new machines: WeTek Set-top-boxes - various devices added to DT There are also a couple of bugfixes that trickled in since the start of the merge window: - The moxart_defconfig was not building the intended platform - CPU-hotplug was broken on ux500 - Coresight was broken on Juno (never worked)" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits) ARM: deconfig: fix the moxart defconfig ARM: ux500: resume the second core properly arm64: dts: juno: update definition for programmable replicator 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 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 ...
2 parents 0a040b2 + ca2dea4 commit a1a0db3

31 files changed

+852
-302
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
@@ -332,6 +332,7 @@ virtio Virtual I/O Device Specification, developed by the OASIS consortium
332332
vivante Vivante Corporation
333333
voipac Voipac Technologies s.r.o.
334334
wd Western Digital Corp.
335+
wetek WeTek Electronics, limited.
335336
wexler Wexler
336337
winbond Winbond Electronics corp.
337338
wlf Wolfson Microelectronics

‎arch/arm/configs/moxart_defconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ CONFIG_EMBEDDED=y
1818
# CONFIG_LBDAF is not set
1919
# CONFIG_BLK_DEV_BSG is not set
2020
# CONFIG_IOSCHED_DEADLINE is not set
21-
CONFIG_ARCH_MULTI_V4T=y
21+
CONFIG_ARCH_MULTI_V4=y
2222
# CONFIG_ARCH_MULTI_V7 is not set
23-
CONFIG_KEYBOARD_GPIO_POLLED=y
2423
CONFIG_ARCH_MOXART=y
2524
CONFIG_MACH_UC7112LX=y
2625
CONFIG_PREEMPT=y
@@ -94,23 +93,24 @@ CONFIG_SERIAL_8250_EXTENDED=y
9493
CONFIG_SERIAL_8250_SHARE_IRQ=y
9594
CONFIG_SERIAL_OF_PLATFORM=y
9695
# CONFIG_HW_RANDOM is not set
97-
CONFIG_DEBUG_GPIO=y
98-
CONFIG_GPIO_SYSFS=y
9996
CONFIG_GPIO_MOXART=y
100-
CONFIG_POWER_SUPPLY=y
10197
CONFIG_POWER_RESET=y
10298
CONFIG_POWER_RESET_GPIO=y
99+
CONFIG_POWER_SUPPLY=y
103100
# CONFIG_HWMON is not set
104101
CONFIG_WATCHDOG=y
105102
CONFIG_WATCHDOG_CORE=y
106103
CONFIG_WATCHDOG_NOWAYOUT=y
107104
CONFIG_MOXART_WDT=y
108105
# CONFIG_USB_SUPPORT is not set
109106
CONFIG_MMC=y
110-
CONFIG_MMC_SDHCI_MOXART=y
107+
CONFIG_MMC_SDHCI=y
108+
CONFIG_MMC_SDHCI_PLTFM=y
109+
CONFIG_MMC_MOXART=y
111110
CONFIG_NEW_LEDS=y
112111
CONFIG_LEDS_CLASS=y
113112
CONFIG_LEDS_GPIO=y
113+
CONFIG_LEDS_TRIGGERS=y
114114
CONFIG_LEDS_TRIGGER_TIMER=y
115115
CONFIG_LEDS_TRIGGER_ONESHOT=y
116116
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

‎arch/arm/mach-ux500/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@
55
obj-y := pm.o
66
obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o
77
obj-$(CONFIG_SMP) += platsmp.o
8-
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
98
obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
10-
11-
CFLAGS_hotplug.o += -march=armv7-a

‎arch/arm/mach-ux500/cpu-db8500.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include <asm/mach/map.h>
3232
#include <asm/mach/arch.h>
3333

34-
#include "setup.h"
35-
3634
#include "db8500-regs.h"
3735

3836
static int __init ux500_l2x0_unlock(void)

‎arch/arm/mach-ux500/hotplug.c

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎arch/arm/mach-ux500/platsmp.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <asm/smp_plat.h>
2424
#include <asm/smp_scu.h>
2525

26-
#include "setup.h"
27-
2826
#include "db8500-regs.h"
2927

3028
/* Magic triggers in backup RAM */
@@ -90,6 +88,13 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
9088
return 0;
9189
}
9290

91+
#ifdef CONFIG_HOTPLUG_CPU
92+
void ux500_cpu_die(unsigned int cpu)
93+
{
94+
wfi();
95+
}
96+
#endif
97+
9398
static const struct smp_operations ux500_smp_ops __initconst = {
9499
.smp_prepare_cpus = ux500_smp_prepare_cpus,
95100
.smp_boot_secondary = ux500_boot_secondary,

‎arch/arm/mach-ux500/setup.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎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

0 commit comments

Comments
 (0)