Skip to content

Commit 35b94a9

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm64-dt-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.11: - New Boards: - OSMC Vero 4K - Dreambox One & Two - GXLX/S905L p271 Reference Boards - Amlogic A4 Power Domain - A bunch of DT fixes to allmost solve all remaining check errors - Amlogic S4 PWM - Fixes for: - SM1 SPDIF compatibles - Bump G12 SPDIF driver strength - Add power domain to HDMI TX - Correct HDMI TX clocks * tag 'amlogic-arm64-dt-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: (32 commits) arm64: dts: amlogic: setup hdmi system clock arm64: dts: amlogic: gx: correct hdmi clocks arm64: dts: amlogic: Add Amlogic S4 PWM arm64: dts: amlogic: add power domain to hdmitx arm64: dts: amlogic: g12: bump spdif output drive strength arm64: dts: amlogic: sm1: fix spdif compatibles arm64: dts: amlogic: ad402: fix thermal zone node name arm64: dts: meson: add initial support for Dreambox One/Two dt-bindings: arm: amlogic: add support for Dreambox One/Two dt-bindings: add dream vendor prefix arm64: dts: meson: add support for OSMC Vero 4K dt-bindings: arm: amlogic: add OSMC Vero 4K arm64: dts: amlogic: gxbb-odroidc2: fix invalid reset-gpio property arm64: dts: amlogic: a1: drop the invalid reset-name for usb@fe004400 arm64: dts: amlogic: a1: use correct node name for mmc controller arm64: dts: amlogic: c3: use correct compatible for gpio_intc node arm64: dts: amlogic: axg: fix tdm audio-controller clock order arm64: dts: amlogic: g12a-u200: add missing AVDD-supply to acodec arm64: dts: amlogic: g12a-u200: drop invalid sound-dai-cells arm64: dts: amlogic: sm1: fix tdm controllers compatible ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 04f08ef + 1443b6e commit 35b94a9

25 files changed

+1048
-276
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ properties:
9191
- libretech,aml-s905x-cc
9292
- libretech,aml-s905x-cc-v2
9393
- nexbox,a95x
94+
- osmc,vero4k
9495
- const: amlogic,s905x
9596
- const: amlogic,meson-gxl
9697

@@ -107,6 +108,13 @@ properties:
107108
- const: amlogic,s905d
108109
- const: amlogic,meson-gxl
109110

111+
- description: Boards with the Amlogic Meson GXLX S905L SoC
112+
items:
113+
- enum:
114+
- amlogic,p271
115+
- const: amlogic,s905l
116+
- const: amlogic,meson-gxlx
117+
110118
- description: Boards with the Amlogic Meson GXM S912 SoC
111119
items:
112120
- enum:
@@ -169,6 +177,8 @@ properties:
169177
- azw,gtking
170178
- azw,gtking-pro
171179
- bananapi,bpi-m2s
180+
- dream,dreambox-one
181+
- dream,dreambox-two
172182
- hardkernel,odroid-go-ultra
173183
- hardkernel,odroid-n2
174184
- hardkernel,odroid-n2l

‎Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
enum:
2121
- amlogic,meson-a1-pwrc
2222
- amlogic,meson-s4-pwrc
23+
- amlogic,a4-pwrc
2324
- amlogic,c3-pwrc
2425
- amlogic,t7-pwrc
2526

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ patternProperties:
396396
description: DPTechnics
397397
"^dragino,.*":
398398
description: Dragino Technology Co., Limited
399+
"^dream,.*":
400+
description: Dream Property GmbH
399401
"^ds,.*":
400402
description: DaSheng, Inc.
401403
"^dserve,.*":

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
2121
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3-ts050.dtb
2222
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb
2323
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-mnt-reform2.dtb
24+
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb
25+
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb
2426
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
2527
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
2628
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
@@ -62,6 +64,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
6264
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
6365
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
6466
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
67+
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-vero4k.dtb
68+
dtb-$(CONFIG_ARCH_MESON) += meson-gxlx-s905l-p271.dtb
6569
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-gt1-ultimate.dtb
6670
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
6771
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb

‎arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
#include "amlogic-a4-common.dtsi"
7+
#include <dt-bindings/power/amlogic,a4-pwrc.h>
78
/ {
89
cpus {
910
#address-cells = <2>;
@@ -37,4 +38,13 @@
3738
enable-method = "psci";
3839
};
3940
};
41+
42+
sm: secure-monitor {
43+
compatible = "amlogic,meson-gxbb-sm";
44+
45+
pwrc: power-controller {
46+
compatible = "amlogic,a4-pwrc";
47+
#power-domain-cells = <1>;
48+
};
49+
};
4050
};

‎arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@
111111
};
112112

113113
gpio_intc: interrupt-controller@4080 {
114-
compatible = "amlogic,meson-gpio-intc",
115-
"amlogic,c3-gpio-intc";
114+
compatible = "amlogic,c3-gpio-intc", "amlogic,meson-gpio-intc";
116115
reg = <0x0 0x4080 0x0 0x0020>;
117116
interrupt-controller;
118117
#interrupt-cells = <2>;

‎arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/dts-v1/;
88

99
#include "meson-a1.dtsi"
10+
#include <dt-bindings/thermal/thermal.h>
1011

1112
/ {
1213
compatible = "amlogic,ad402", "amlogic,a1";
@@ -83,6 +84,50 @@
8384
vin-supply = <&vddao_3v3>;
8485
regulator-always-on;
8586
};
87+
88+
thermal-zones {
89+
soc_thermal: soc-thermal {
90+
polling-delay = <1000>;
91+
polling-delay-passive = <100>;
92+
sustainable-power = <130>;
93+
94+
thermal-sensors = <&cpu_temp>;
95+
96+
trips {
97+
soc_passive: soc-passive {
98+
temperature = <70000>;
99+
hysteresis = <2000>;
100+
type = "passive";
101+
};
102+
103+
soc_hot: soc-hot {
104+
temperature = <85000>;
105+
hysteresis = <5000>;
106+
type = "hot";
107+
};
108+
109+
soc_critical: soc-critical {
110+
temperature = <110000>;
111+
hysteresis = <1000>;
112+
type = "critical";
113+
};
114+
};
115+
116+
soc_cooling_maps: cooling-maps {
117+
map0 {
118+
trip = <&soc_passive>;
119+
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
120+
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
121+
};
122+
123+
map1 {
124+
trip = <&soc_hot>;
125+
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
126+
<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
127+
};
128+
};
129+
};
130+
};
86131
};
87132

88133
/* Bluetooth HCI H4 */

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
reg = <0x0 0x0>;
2929
enable-method = "psci";
3030
next-level-cache = <&l2>;
31+
#cooling-cells = <2>;
3132
};
3233

3334
cpu1: cpu@1 {
@@ -36,6 +37,7 @@
3637
reg = <0x0 0x1>;
3738
enable-method = "psci";
3839
next-level-cache = <&l2>;
40+
#cooling-cells = <2>;
3941
};
4042

4143
l2: l2-cache0 {
@@ -398,6 +400,17 @@
398400
power-domains = <&pwrc PWRC_USB_ID>;
399401
};
400402

403+
cpu_temp: temperature-sensor@4c00 {
404+
compatible = "amlogic,a1-cpu-thermal";
405+
reg = <0x0 0x4c00 0x0 0x50>;
406+
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
407+
clocks = <&clkc_periphs CLKID_TS>;
408+
assigned-clocks = <&clkc_periphs CLKID_TS>;
409+
assigned-clock-rates = <500000>;
410+
#thermal-sensor-cells = <0>;
411+
amlogic,ao-secure = <&sec_AO>;
412+
};
413+
401414
hwrng: rng@5118 {
402415
compatible = "amlogic,meson-rng";
403416
reg = <0x0 0x5118 0x0 0x4>;
@@ -419,7 +432,7 @@
419432
clock-names = "fixpll_in", "hifipll_in";
420433
};
421434

422-
sd_emmc: sd@10000 {
435+
sd_emmc: mmc@10000 {
423436
compatible = "amlogic,meson-axg-mmc";
424437
reg = <0x0 0x10000 0x0 0x800>;
425438
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
@@ -453,7 +466,6 @@
453466
assigned-clocks = <&clkc_periphs CLKID_USB_BUS>;
454467
assigned-clock-rates = <64000000>;
455468
resets = <&reset RESET_USBCTRL>;
456-
reset-name = "usb_ctrl";
457469

458470
dr_mode = "otg";
459471

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
compatible = "amlogic,axg-tdm-iface";
2626
#sound-dai-cells = <0>;
2727
sound-name-prefix = "TDM_A";
28-
clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,
29-
<&clkc_audio AUD_CLKID_MST_A_SCLK>,
30-
<&clkc_audio AUD_CLKID_MST_A_LRCLK>;
31-
clock-names = "mclk", "sclk", "lrclk";
28+
clocks = <&clkc_audio AUD_CLKID_MST_A_SCLK>,
29+
<&clkc_audio AUD_CLKID_MST_A_LRCLK>,
30+
<&clkc_audio AUD_CLKID_MST_A_MCLK>;
31+
clock-names = "sclk", "lrclk", "mclk";
3232
status = "disabled";
3333
};
3434

3535
tdmif_b: audio-controller-1 {
3636
compatible = "amlogic,axg-tdm-iface";
3737
#sound-dai-cells = <0>;
3838
sound-name-prefix = "TDM_B";
39-
clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,
40-
<&clkc_audio AUD_CLKID_MST_B_SCLK>,
41-
<&clkc_audio AUD_CLKID_MST_B_LRCLK>;
42-
clock-names = "mclk", "sclk", "lrclk";
39+
clocks = <&clkc_audio AUD_CLKID_MST_B_SCLK>,
40+
<&clkc_audio AUD_CLKID_MST_B_LRCLK>,
41+
<&clkc_audio AUD_CLKID_MST_B_MCLK>;
42+
clock-names = "sclk", "lrclk", "mclk";
4343
status = "disabled";
4444
};
4545

4646
tdmif_c: audio-controller-2 {
4747
compatible = "amlogic,axg-tdm-iface";
4848
#sound-dai-cells = <0>;
4949
sound-name-prefix = "TDM_C";
50-
clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,
51-
<&clkc_audio AUD_CLKID_MST_C_SCLK>,
52-
<&clkc_audio AUD_CLKID_MST_C_LRCLK>;
53-
clock-names = "mclk", "sclk", "lrclk";
50+
clocks = <&clkc_audio AUD_CLKID_MST_C_SCLK>,
51+
<&clkc_audio AUD_CLKID_MST_C_LRCLK>,
52+
<&clkc_audio AUD_CLKID_MST_C_MCLK>;
53+
clock-names = "sclk", "lrclk", "mclk";
5454
status = "disabled";
5555
};
5656

0 commit comments

Comments
 (0)