Skip to content

Commit 5c9e59a

Browse files
arndbarndb
committed
Merge tag 'mtk-dts64-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/dt
MediaTek ARM64 DeviceTree updates for v6.14 This adds a few cleanups, enhances support for upstreamed SoCs and machines, other than adding new ones. In particular, fixes and improvements: - MT8516 gets a few fixes for GICv2, Watchdog and I2C, and support for the Keypad controller; - MT8390 Genio 700 board gets basic audio support; - MT8365 gets an alias for its integrated ethernet controller; - MT8195 gets an important fix for system suspend: all of the machines based on this SoC and its IoT variant can now properly perform PM Suspend to RAM; - MT8188 gets support for its Mali GPU with DVFS and a fix for the OVL Hardware found in the Display Controller using the right compatible strings; - MT8186 Chromebooks can now suspend properly thanks to a fix moving the USB wakeups from XHCI to MTU3 (USB) controller; - MT8183 Chromebooks get a fix for their DMIC microphone and proper support for their second-source touchscreen; - MT7988 SoC and the BananaPi R4 board gets support for Pinctrl, eMMC/SD, Thermal, CPU DVFS, PCI-Express, and peripherals like the RT5190A PMIC, PCA9545 I2C mux, and others; - MT7986 BananaPi R3 board gets support for SATA power socket; And cleanups: - Dropped regulator-compatible property from MediaTek DTs; - Aligned thermal node names with bindings on MT8183 Kukui; - MT6397 PMIC get proper sub-node names, fixing dt validation; - The property enabling Wake-On-Lan feature changed in all of the boards and driver to match the actual meaning of it (mediatek,mac-wol now enables wol on mac instead of phy); - Compatibles for MediaTek PMIC Keypad are added to bindings and can now pass dts validation; ...and the newly added machines are: - MT8188 (Ciri) Lenovo Chromebook Duet - MT8186 (Starmie) ASUS Chromebook Enterprise CM30 - MT8186 (Chinchou) ASUS Chromebook CZ12 and CZ12 Flip * tag 'mtk-dts64-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux: (71 commits) arm64: dts: mediatek: mt8516: add keypad node arm64: dts: mediatek: add per-SoC compatibles for keypad nodes dt-bindings: mediatek,mt6779-keypad: add more compatibles arm64: dts: mediatek: mt8365-evk: Set ethernet alias dts: arm64: mediatek: mt8195: Remove MT8183 compatible for OVL dts: arm64: mediatek: mt8188: Update OVL compatible from MT8183 to MT8195 dt-bindings: display: mediatek: ovl: Modify rules for MT8195/MT8188 dt-bindings: display: mediatek: ovl: Add compatible strings for MT8188 MDP3 dt-bindings: arm: mediatek: Drop MT8192 Chromebook variants that never shipped arm64: dts: mediatek: mt8192: Drop Chromebook variants that never shipped arm64: dts: mediatek: mt7988a-bpi-r4: Add proc-supply for cpus arm64: dts: mediatek: mt7988a-bpi-r4: Add MediaTek MT6682A/RT5190A PMIC arm64: dts: mediatek: mt7988a-bpi-r4: Enable pcie arm64: dts: mediatek: mt7988a-bpi-r4: Enable pwm arm64: dts: mediatek: mt7988a-bpi-r4: Enable ssusb1 on bpi-r4 arm64: dts: mediatek: mt7988a-bpi-r4: Enable t-phy for ssusb1 arm64: dts: mediatek: mt7988a-bpi-r4: Add PCA9545 I2C Mux arm64: dts: mediatek: mt7988a-bpi-r4: Enable I2C controllers arm64: dts: mediatek: mt7988a-bpi-r4: Add default UART stdout arm64: dts: mediatek: mt7988a-bpi-r4: Enable serial0 debug uart ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 865f5be + 0fb0d36 commit 5c9e59a

Some content is hidden

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

54 files changed

+3899
-271
lines changed

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

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,34 @@ properties:
239239
- enum:
240240
- mediatek,mt8183-pumpkin
241241
- const: mediatek,mt8183
242+
- description: Google Chinchou (Asus Chromebook CZ1104CM2A/CZ1204CM2A)
243+
items:
244+
- const: google,chinchou-sku0
245+
- const: google,chinchou-sku2
246+
- const: google,chinchou-sku4
247+
- const: google,chinchou-sku5
248+
- const: google,chinchou
249+
- const: mediatek,mt8186
250+
- description: Google Chinchou (Asus Chromebook CZ1104FM2A/CZ1204FM2A/CZ1104CM2A/CZ1204CM2A)
251+
items:
252+
- const: google,chinchou-sku1
253+
- const: google,chinchou-sku3
254+
- const: google,chinchou-sku6
255+
- const: google,chinchou-sku7
256+
- const: google,chinchou-sku17
257+
- const: google,chinchou-sku20
258+
- const: google,chinchou-sku22
259+
- const: google,chinchou-sku23
260+
- const: google,chinchou
261+
- const: mediatek,mt8186
262+
- description: Google Chinchou360 (Asus Chromebook CZ1104FM2A/CZ1204FM2A Flip)
263+
items:
264+
- const: google,chinchou-sku16
265+
- const: google,chinchou-sku18
266+
- const: google,chinchou-sku19
267+
- const: google,chinchou-sku21
268+
- const: google,chinchou
269+
- const: mediatek,mt8186
242270
- description: Google Magneton (Lenovo IdeaPad Slim 3 Chromebook (14M868))
243271
items:
244272
- const: google,steelix-sku393219
@@ -263,6 +291,19 @@ properties:
263291
- const: google,steelix-sku196608
264292
- const: google,steelix
265293
- const: mediatek,mt8186
294+
- description: Google Starmie (ASUS Chromebook Enterprise CM30 (CM3001))
295+
items:
296+
- const: google,starmie-sku0
297+
- const: google,starmie-sku2
298+
- const: google,starmie-sku3
299+
- const: google,starmie
300+
- const: mediatek,mt8186
301+
- description: Google Starmie (ASUS Chromebook Enterprise CM30 (CM3001))
302+
items:
303+
- const: google,starmie-sku1
304+
- const: google,starmie-sku4
305+
- const: google,starmie
306+
- const: mediatek,mt8186
266307
- description: Google Steelix (Lenovo 300e Yoga Chromebook Gen 4)
267308
items:
268309
- enum:
@@ -307,6 +348,19 @@ properties:
307348
- enum:
308349
- mediatek,mt8186-evb
309350
- const: mediatek,mt8186
351+
- description: Google Ciri (Lenovo Chromebook Duet (11", 9))
352+
items:
353+
- enum:
354+
- google,ciri-sku0
355+
- google,ciri-sku1
356+
- google,ciri-sku2
357+
- google,ciri-sku3
358+
- google,ciri-sku4
359+
- google,ciri-sku5
360+
- google,ciri-sku6
361+
- google,ciri-sku7
362+
- const: google,ciri
363+
- const: mediatek,mt8188
310364
- items:
311365
- enum:
312366
- mediatek,mt8188-evb
@@ -316,12 +370,6 @@ properties:
316370
- const: google,hayato-rev1
317371
- const: google,hayato
318372
- const: mediatek,mt8192
319-
- description: Google Hayato rev5
320-
items:
321-
- const: google,hayato-rev5-sku2
322-
- const: google,hayato-sku2
323-
- const: google,hayato
324-
- const: mediatek,mt8192
325373
- description: Google Spherion (Acer Chromebook 514)
326374
items:
327375
- const: google,spherion-rev3
@@ -330,11 +378,6 @@ properties:
330378
- const: google,spherion-rev0
331379
- const: google,spherion
332380
- const: mediatek,mt8192
333-
- description: Google Spherion rev4 (Acer Chromebook 514)
334-
items:
335-
- const: google,spherion-rev4
336-
- const: google,spherion
337-
- const: mediatek,mt8192
338381
- items:
339382
- enum:
340383
- mediatek,mt8192-evb

‎Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- mediatek,mt8173-disp-ovl
2727
- mediatek,mt8183-disp-ovl
2828
- mediatek,mt8192-disp-ovl
29+
- mediatek,mt8195-disp-ovl
2930
- mediatek,mt8195-mdp3-ovl
3031
- items:
3132
- enum:
@@ -36,16 +37,17 @@ properties:
3637
- enum:
3738
- mediatek,mt6795-disp-ovl
3839
- const: mediatek,mt8173-disp-ovl
39-
- items:
40-
- enum:
41-
- mediatek,mt8188-disp-ovl
42-
- mediatek,mt8195-disp-ovl
43-
- const: mediatek,mt8183-disp-ovl
4440
- items:
4541
- enum:
4642
- mediatek,mt8186-disp-ovl
4743
- mediatek,mt8365-disp-ovl
4844
- const: mediatek,mt8192-disp-ovl
45+
- items:
46+
- const: mediatek,mt8188-disp-ovl
47+
- const: mediatek,mt8195-disp-ovl
48+
- items:
49+
- const: mediatek,mt8188-mdp3-ovl
50+
- const: mediatek,mt8195-mdp3-ovl
4951

5052
reg:
5153
maxItems: 1

‎Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ properties:
2626
- items:
2727
- enum:
2828
- mediatek,mt6873-keypad
29+
- mediatek,mt8183-keypad
30+
- mediatek,mt8365-keypad
31+
- mediatek,mt8516-keypad
2932
- const: mediatek,mt6779-keypad
3033

3134
reg:

‎arch/arm64/boot/dts/mediatek/Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-mini.dtb
1717
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtbo
1818
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
1919
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo
20+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sata.dtbo
2021
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtbo
2122
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
2223
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
2324
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4.dtb
25+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtbo
26+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-sd.dtbo
2427
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
2528
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
2629
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
@@ -55,10 +58,15 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku32.dtb
5558
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku0.dtb
5659
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb
5760
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb
61+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-chinchou-sku0.dtb
62+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-chinchou-sku1.dtb
63+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-chinchou-sku16.dtb
5864
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393216.dtb
5965
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393217.dtb
6066
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393218.dtb
6167
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-rusty-sku196608.dtb
68+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-starmie-sku0.dtb
69+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-starmie-sku1.dtb
6270
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131072.dtb
6371
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131073.dtb
6472
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327681.dtb
@@ -69,10 +77,16 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589824.dtb
6977
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589825.dtb
7078
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-evb.dtb
7179
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-evb.dtb
80+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku0.dtb
81+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku1.dtb
82+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku2.dtb
83+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku3.dtb
84+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku4.dtb
85+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku5.dtb
86+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku6.dtb
87+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku7.dtb
7288
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r1.dtb
73-
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r5-sku2.dtb
7489
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r0.dtb
75-
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r4.dtb
7690
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb
7791
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-dojo-r1.dtb
7892
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r1.dtb
@@ -90,3 +104,4 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb
90104
# Device tree overlays support
91105
DTC_FLAGS_mt7986a-bananapi-bpi-r3 := -@
92106
DTC_FLAGS_mt7986a-bananapi-bpi-r3-mini := -@
107+
DTC_FLAGS_mt7988a-bananapi-bpi-r4 := -@

‎arch/arm64/boot/dts/mediatek/mt2712-evb.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
pinctrl-names = "default", "sleep";
116116
pinctrl-0 = <&eth_default>;
117117
pinctrl-1 = <&eth_sleep>;
118+
mediatek,mac-wol;
118119
status = "okay";
119120

120121
mdio {

‎arch/arm64/boot/dts/mediatek/mt6359.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
compatible = "mediatek,mt6359";
99
interrupt-controller;
1010
#interrupt-cells = <2>;
11+
#sound-dai-cells = <1>;
1112

1213
pmic_adc: adc {
1314
compatible = "mediatek,mt6359-auxadc";

‎arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
/*
3+
* Copyright (C) 2021 MediaTek Inc.
4+
* Author: Frank Wunderlich <[email protected]>
5+
*/
6+
7+
/dts-v1/;
8+
/plugin/;
9+
10+
#include <dt-bindings/gpio/gpio.h>
11+
12+
&{/} {
13+
compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
14+
15+
reg_sata12v: regulator-sata12v {
16+
compatible = "regulator-fixed";
17+
regulator-name = "sata12v";
18+
regulator-min-microvolt = <12000000>;
19+
regulator-max-microvolt = <12000000>;
20+
gpio = <&pio 8 GPIO_ACTIVE_HIGH>;
21+
enable-active-high;
22+
regulator-always-on;
23+
};
24+
25+
reg_sata5v: regulator-sata5v {
26+
compatible = "regulator-fixed";
27+
regulator-name = "sata5v";
28+
regulator-min-microvolt = <5000000>;
29+
regulator-max-microvolt = <5000000>;
30+
regulator-always-on;
31+
vin-supply = <&reg_sata12v>;
32+
};
33+
34+
};

‎arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
/*
3+
* Copyright (C) 2021 MediaTek Inc.
4+
* Author: Frank Wunderlich <[email protected]>
5+
*/
6+
7+
/dts-v1/;
8+
/plugin/;
9+
10+
/ {
11+
compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
12+
};
13+
14+
&{/soc/mmc@11230000} {
15+
pinctrl-names = "default", "state_uhs";
16+
pinctrl-0 = <&mmc0_pins_emmc_51>;
17+
pinctrl-1 = <&mmc0_pins_emmc_51>;
18+
bus-width = <8>;
19+
max-frequency = <200000000>;
20+
cap-mmc-highspeed;
21+
mmc-hs200-1_8v;
22+
mmc-hs400-1_8v;
23+
hs400-ds-delay = <0x12814>;
24+
vqmmc-supply = <&reg_1p8v>;
25+
vmmc-supply = <&reg_3p3v>;
26+
non-removable;
27+
no-sd;
28+
no-sdio;
29+
#address-cells = <1>;
30+
#size-cells = <0>;
31+
status = "okay";
32+
};
33+

‎arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
/*
3+
* Copyright (C) 2023 MediaTek Inc.
4+
* Author: Frank Wunderlich <[email protected]>
5+
*/
6+
7+
/dts-v1/;
8+
/plugin/;
9+
10+
#include <dt-bindings/gpio/gpio.h>
11+
12+
/ {
13+
compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
14+
};
15+
16+
&{/soc/mmc@11230000} {
17+
pinctrl-names = "default", "state_uhs";
18+
pinctrl-0 = <&mmc0_pins_sdcard>;
19+
pinctrl-1 = <&mmc0_pins_sdcard>;
20+
cd-gpios = <&pio 12 GPIO_ACTIVE_LOW>;
21+
bus-width = <4>;
22+
max-frequency = <52000000>;
23+
cap-sd-highspeed;
24+
vmmc-supply = <&reg_3p3v>;
25+
vqmmc-supply = <&reg_3p3v>;
26+
no-mmc;
27+
#address-cells = <1>;
28+
#size-cells = <0>;
29+
status = "okay";
30+
};
31+

0 commit comments

Comments
 (0)