Skip to content

Commit 9896dde

Browse files
committed
Merge tag 'mtk-dts64-for-v6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/dt
Additional MediaTek ARM64 DTS updates for v6.16 This addresses devicetree binding warnings happening on the MDP3 nodes in mt8188 dts, reverts the commit adding the SCP firmware-name as strongly suggested by Arnd, and also adds some more late commits. In particular: - MT6359 PMIC - Renamed PMIC RTC node to fix dtbs_check warning - MT7988(A) - Support for SPI controllers was added to SoC and BPI-R4 - Support for XSPHY, USB and PCIe2 was added as well - Fan and cooling maps were added to BPI-R4 machine - Added BananaPi R4 2G5 machine variant - MT8365 - Added touchscreen support to MT8365 Genio EVK - MT8188 - Addressed dtbs_check warnings for MDP3 nodes - MT8390 (Genio) - Reverted SCP firmware-name addition * tag 'mtk-dts64-for-v6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux: (42 commits) Revert "arm64: dts: mediatek: mt8390-genio-common: Add firmware-name for scp0" arm64: dts: mediatek: mt8188: Address binding warnings for MDP3 nodes arm64: dts: mt6359: Rename RTC node to match binding expectations arm64: dts: mt8365-evk: Add goodix touchscreen support arm64: dts: mediatek: mt8188: Add missing #reset-cells property arm64: dts: airoha: en7581: Add PCIe nodes to EN7581 SoC evaluation board arm64: dts: airoha: en7581: Add gpio-ranges property for gpio controller arm64: dts: mediatek: mt7988a-bpi-r4: configure spi-nodes arm64: dts: mediatek: mt7988a-bpi-r4: Add fan and coolingmaps arm64: dts: mediatek: mt7988: add phy calibration efuse subnodes arm64: dts: mediatek: mt7988: move uart0 and spi1 pins to soc dtsi arm64: dts: mediatek: mt7988: add spi controllers arm64: dts: mediatek: mt7988a-bpi-r4: enable xsphy arm64: dts: mediatek: mt7988: Add xsphy for ssusb0/pcie2 arm64: dts: mediatek: mt7988a-bpi-r4: allow hw variants of bpi-r4 dt-bindings: arm: mediatek: add bpi-r4 2g5 phy variant arm64: dts: mt6359: Add missing 'compatible' property to regulators node arm/arm64: dts: mediatek: Add missing "#sound-dai-cells" to linux,bt-sco arm64: dts: mediatek: mt8390-genio-common: Set ssusb2 default dual role mode to host arm64: dts: mediatek: mt8395-genio-1200-evk: Disable unused backlight ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1e1ce25 + 99af08f commit 9896dde

38 files changed

+4555
-527
lines changed

Documentation/devicetree/bindings/arm/mediatek.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ properties:
104104
- enum:
105105
- bananapi,bpi-r4
106106
- const: mediatek,mt7988a
107+
- items:
108+
- const: bananapi,bpi-r4-2g5
109+
- const: bananapi,bpi-r4
110+
- const: mediatek,mt7988a
107111
- items:
108112
- enum:
109113
- mediatek,mt8127-moose
@@ -285,6 +289,13 @@ properties:
285289
- const: google,steelix-sku393218
286290
- const: google,steelix
287291
- const: mediatek,mt8186
292+
- description: Google Ponyta
293+
items:
294+
- enum:
295+
- google,ponyta-sku0
296+
- google,ponyta-sku1
297+
- const: google,ponyta
298+
- const: mediatek,mt8186
288299
- description: Google Rusty (Lenovo 100e Chromebook Gen 4)
289300
items:
290301
- const: google,steelix-sku196609

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ properties:
2525
- mediatek,mt8173-disp-aal
2626
- mediatek,mt8183-disp-aal
2727
- mediatek,mt8195-mdp3-aal
28+
- items:
29+
- enum:
30+
- mediatek,mt8188-mdp3-aal
31+
- const: mediatek,mt8195-mdp3-aal
2832
- items:
2933
- enum:
3034
- mediatek,mt2712-disp-aal

Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ properties:
2727
- mediatek,mt8167-disp-color
2828
- mediatek,mt8173-disp-color
2929
- mediatek,mt8195-mdp3-color
30+
- items:
31+
- enum:
32+
- mediatek,mt8188-mdp3-color
33+
- const: mediatek,mt8195-mdp3-color
3034
- items:
3135
- enum:
3236
- mediatek,mt7623-disp-color

Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ properties:
2525
- mediatek,mt8173-disp-merge
2626
- mediatek,mt8195-disp-merge
2727
- mediatek,mt8195-mdp3-merge
28+
- items:
29+
- enum:
30+
- mediatek,mt8188-mdp3-merge
31+
- const: mediatek,mt8195-mdp3-merge
2832
- items:
2933
- const: mediatek,mt6795-disp-merge
3034
- const: mediatek,mt8173-disp-merge

Documentation/devicetree/bindings/display/mediatek/mediatek,padding.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ description:
2020

2121
properties:
2222
compatible:
23-
enum:
24-
- mediatek,mt8188-disp-padding
25-
- mediatek,mt8195-mdp3-padding
23+
oneOf:
24+
- enum:
25+
- mediatek,mt8188-disp-padding
26+
- mediatek,mt8195-mdp3-padding
27+
- items:
28+
- const: mediatek,mt8188-mdp3-padding
29+
- const: mediatek,mt8195-mdp3-padding
2630

2731
reg:
2832
maxItems: 1

Documentation/devicetree/bindings/media/mediatek,mdp3-fg.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ description:
1616

1717
properties:
1818
compatible:
19-
enum:
20-
- mediatek,mt8195-mdp3-fg
19+
oneOf:
20+
- enum:
21+
- mediatek,mt8195-mdp3-fg
22+
- items:
23+
- const: mediatek,mt8188-mdp3-fg
24+
- const: mediatek,mt8195-mdp3-fg
2125

2226
reg:
2327
maxItems: 1

Documentation/devicetree/bindings/media/mediatek,mdp3-hdr.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ description:
1616

1717
properties:
1818
compatible:
19-
enum:
20-
- mediatek,mt8195-mdp3-hdr
19+
oneOf:
20+
- enum:
21+
- mediatek,mt8195-mdp3-hdr
22+
- items:
23+
- const: mediatek,mt8188-mdp3-hdr
24+
- const: mediatek,mt8195-mdp3-hdr
2125

2226
reg:
2327
maxItems: 1

Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
- mediatek,mt8183-mdp3-rsz
2121
- items:
2222
- enum:
23+
- mediatek,mt8188-mdp3-rsz
2324
- mediatek,mt8195-mdp3-rsz
2425
- const: mediatek,mt8183-mdp3-rsz
2526

Documentation/devicetree/bindings/media/mediatek,mdp3-stitch.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ description:
1616

1717
properties:
1818
compatible:
19-
enum:
20-
- mediatek,mt8195-mdp3-stitch
19+
oneOf:
20+
- enum:
21+
- mediatek,mt8195-mdp3-stitch
22+
- items:
23+
- const: mediatek,mt8188-mdp3-stitch
24+
- const: mediatek,mt8195-mdp3-stitch
2125

2226
reg:
2327
maxItems: 1

Documentation/devicetree/bindings/media/mediatek,mdp3-tcc.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ description:
1717

1818
properties:
1919
compatible:
20-
enum:
21-
- mediatek,mt8195-mdp3-tcc
20+
oneOf:
21+
- enum:
22+
- mediatek,mt8195-mdp3-tcc
23+
- items:
24+
- const: mediatek,mt8188-mdp3-tcc
25+
- const: mediatek,mt8195-mdp3-tcc
2226

2327
reg:
2428
maxItems: 1

0 commit comments

Comments
 (0)