Skip to content

Commit 34a07a8

Browse files
arndbarndb
committed
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.8 Highlights: - new boards :Beelink GT-King Pro (G12B SoC), Smartlabs SML-5442TW (S905D), Hardkernel ODROID-C4 (SM1) - audio: support for GX-family SoCs - audio: internal DAC support - use the new USB control driver for GXL and GXM * tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (33 commits) arm64: dts: meson-g12b-gtking-pro: add initial device-tree dt-bindings: arm: amlogic: add support for the Beelink GT-King Pro arm64: dts: meson-g12b-gtking: add initial device-tree dt-bindings: arm: amlogic: add support for the Beelink GT-King arm64: dts: meson: convert ugoos-am6 to common w400 dtsi arm64: dts: meson: add ethernet interrupt to wetek dtsi arm64: dts: meson: add support for the Smartlabs SML-5442TW dt-bindings: arm: amlogic: add support for the Smartlabs SML-5442TW dt-bindings: add vendor prefix for Smartlabs LLC arm64: dts: meson: g12: add internal DAC glue arm64: dts: meson: g12: add internal DAC arm64: dts: meson: libretech-pc: add internal DAC support arm64: dts: meson: libretech-ac: add internal DAC support arm64: dts: meson: libretech-cc: add internal DAC support arm64: dts: meson: p230-q200: add internal DAC support arm64: dts: meson: gxl: add acodec support arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4 dt-bindings: arm: amlogic: add odroid-c4 bindings arm64: dts: meson-sm1: add cpu thermal nodes arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0627354 + 0b928e4 commit 34a07a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1751
-464
lines changed

‎Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ properties:
107107
- amlogic,p231
108108
- libretech,aml-s905d-pc
109109
- phicomm,n1
110+
- smartlabs,sml5442tw
110111
- const: amlogic,s905d
111112
- const: amlogic,meson-gxl
112113

@@ -148,6 +149,8 @@ properties:
148149
- description: Boards with the Amlogic Meson G12B S922X SoC
149150
items:
150151
- enum:
152+
- azw,gtking
153+
- azw,gtking-pro
151154
- hardkernel,odroid-n2
152155
- khadas,vim3
153156
- ugoos,am6
@@ -159,6 +162,7 @@ properties:
159162
- enum:
160163
- seirobotics,sei610
161164
- khadas,vim3l
165+
- hardkernel,odroid-c4
162166
- const: amlogic,sm1
163167

164168
- description: Boards with the Amlogic Meson A1 A113L SoC

‎Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,8 @@ patternProperties:
940940
description: Sitronix Technology Corporation
941941
"^skyworks,.*":
942942
description: Skyworks Solutions, Inc.
943+
"^smartlabs,.*":
944+
description: SmartLabs LLC
943945
"^smsc,.*":
944946
description: Standard Microsystems Corporation
945947
"^snps,.*":

‎arch/arm64/boot/dts/amlogic/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb
33
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
44
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
55
dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
6+
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
7+
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
68
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
79
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
810
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
@@ -27,6 +29,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
2729
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
2830
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
2931
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
32+
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb
3033
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb
3134
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
3235
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
@@ -40,4 +43,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb
4043
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
4144
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
4245
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
46+
dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
4347
dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb

‎arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,18 +1735,18 @@
17351735
};
17361736

17371737
sram: sram@fffc0000 {
1738-
compatible = "amlogic,meson-axg-sram", "mmio-sram";
1738+
compatible = "mmio-sram";
17391739
reg = <0x0 0xfffc0000 0x0 0x20000>;
17401740
#address-cells = <1>;
17411741
#size-cells = <1>;
17421742
ranges = <0 0x0 0xfffc0000 0x20000>;
17431743

1744-
cpu_scp_lpri: scp-shmem@13000 {
1744+
cpu_scp_lpri: scp-sram@13000 {
17451745
compatible = "amlogic,meson-axg-scp-shmem";
17461746
reg = <0x13000 0x400>;
17471747
};
17481748

1749-
cpu_scp_hpri: scp-shmem@13400 {
1749+
cpu_scp_hpri: scp-sram@13400 {
17501750
compatible = "amlogic,meson-axg-scp-shmem";
17511751
reg = <0x13400 0x400>;
17521752
};

‎arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,17 @@
250250
};
251251
};
252252

253+
acodec: audio-controller@32000 {
254+
compatible = "amlogic,t9015";
255+
reg = <0x0 0x32000 0x0 0x14>;
256+
#sound-dai-cells = <0>;
257+
sound-name-prefix = "ACODEC";
258+
clocks = <&clkc CLKID_AUDIO_CODEC>;
259+
clock-names = "pclk";
260+
resets = <&reset RESET_AUDIO_CODEC>;
261+
status = "disabled";
262+
};
263+
253264
periphs: bus@34400 {
254265
compatible = "simple-bus";
255266
reg = <0x0 0x34400 0x0 0x400>;

‎arch/arm64/boot/dts/amlogic/meson-g12.dtsi

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,15 @@
344344
status = "disabled";
345345
};
346346

347+
toacodec: audio-controller@740 {
348+
compatible = "amlogic,g12a-toacodec";
349+
reg = <0x0 0x740 0x0 0x4>;
350+
#sound-dai-cells = <1>;
351+
sound-name-prefix = "TOACODEC";
352+
resets = <&clkc_audio AUD_RESET_TOACODEC>;
353+
status = "disabled";
354+
};
355+
347356
tohdmitx: audio-controller@744 {
348357
compatible = "amlogic,g12a-tohdmitx";
349358
reg = <0x0 0x744 0x0 0x4>;
@@ -355,29 +364,6 @@
355364
};
356365
};
357366

358-
&cpu_thermal {
359-
cooling-maps {
360-
map0 {
361-
trip = <&cpu_passive>;
362-
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
363-
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
364-
<&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
365-
<&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
366-
<&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
367-
<&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
368-
};
369-
map1 {
370-
trip = <&cpu_hot>;
371-
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
372-
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
373-
<&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
374-
<&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
375-
<&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
376-
<&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
377-
};
378-
};
379-
};
380-
381367
&ethmac {
382368
power-domains = <&pwrc PWRC_G12A_ETH_ID>;
383369
};

‎arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2019 BayLibre, SAS
4+
* Author: Neil Armstrong <[email protected]>
5+
* Copyright (c) 2019 Christian Hewitt <[email protected]>
6+
*/
7+
8+
/dts-v1/;
9+
10+
#include "meson-g12b-w400.dtsi"
11+
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
12+
13+
/ {
14+
compatible = "azw,gtking", "amlogic,g12b";
15+
model = "Beelink GT-King Pro";
16+
17+
gpio-keys-polled {
18+
compatible = "gpio-keys-polled";
19+
#address-cells = <1>;
20+
#size-cells = <0>;
21+
poll-interval = <100>;
22+
23+
power-button {
24+
label = "power";
25+
linux,code = <KEY_POWER>;
26+
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
27+
};
28+
};
29+
30+
leds {
31+
compatible = "gpio-leds";
32+
33+
white {
34+
label = "power:white";
35+
gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
36+
default-state = "on";
37+
};
38+
};
39+
40+
sound {
41+
compatible = "amlogic,axg-sound-card";
42+
model = "G12B-GTKING-PRO";
43+
audio-aux-devs = <&tdmout_b>;
44+
audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
45+
"TDMOUT_B IN 1", "FRDDR_B OUT 1",
46+
"TDMOUT_B IN 2", "FRDDR_C OUT 1",
47+
"TDM_B Playback", "TDMOUT_B OUT";
48+
49+
assigned-clocks = <&clkc CLKID_MPLL2>,
50+
<&clkc CLKID_MPLL0>,
51+
<&clkc CLKID_MPLL1>;
52+
assigned-clock-parents = <0>, <0>, <0>;
53+
assigned-clock-rates = <294912000>,
54+
<270950400>,
55+
<393216000>;
56+
status = "okay";
57+
58+
dai-link-0 {
59+
sound-dai = <&frddr_a>;
60+
};
61+
62+
dai-link-1 {
63+
sound-dai = <&frddr_b>;
64+
};
65+
66+
dai-link-2 {
67+
sound-dai = <&frddr_c>;
68+
};
69+
70+
/* 8ch hdmi interface */
71+
dai-link-3 {
72+
sound-dai = <&tdmif_b>;
73+
dai-format = "i2s";
74+
dai-tdm-slot-tx-mask-0 = <1 1>;
75+
dai-tdm-slot-tx-mask-1 = <1 1>;
76+
dai-tdm-slot-tx-mask-2 = <1 1>;
77+
dai-tdm-slot-tx-mask-3 = <1 1>;
78+
mclk-fs = <256>;
79+
80+
codec {
81+
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
82+
};
83+
};
84+
85+
dai-link-4 {
86+
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
87+
88+
codec {
89+
sound-dai = <&hdmi_tx>;
90+
};
91+
};
92+
};
93+
};
94+
95+
&arb {
96+
status = "okay";
97+
};
98+
99+
&clkc_audio {
100+
status = "okay";
101+
};
102+
103+
&frddr_a {
104+
status = "okay";
105+
};
106+
107+
&frddr_b {
108+
status = "okay";
109+
};
110+
111+
&frddr_c {
112+
status = "okay";
113+
};
114+
115+
&tdmif_b {
116+
status = "okay";
117+
};
118+
119+
&tdmout_b {
120+
status = "okay";
121+
};
122+
123+
&tohdmitx {
124+
status = "okay";
125+
};

0 commit comments

Comments
 (0)