Skip to content

Commit 82706d6

Browse files
committed
Merge tag 'v5.18-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt
MT8195: - add evaluation and demo board MT8192: - add new nodes: pwrap, PMIC, scp, USB, efuse, IOMMU, smi, DPI, PCIe, SPMI, audio system, MMC and video enconder - add evaluation board MT8183: - fix dtschema issues - update compatible for the display ambient light processor (disp-aal) - fix dtschema warning for the pumpki board MT8173: - add power domains to the video enconder nodes - add GCE support to the display mutex node MT7622: - specify number of DMA requests explicitely - specify level 2 cache topology - add SPI-NAND flash device - fix dtschema warnings for the System Companion Processor (SCP) * tag 'v5.18-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (37 commits) arm64: dts: mt8192: Follow binding order for SCP registers arm64: dts: mediatek: add mtk-snfi for mt7622 arm64: dts: mediatek: mt8195-demo: enable uart1 arm64: dts: mediatek: mt8195-demo: Remove input-name property arm64: dts: mediatek: mt8183-pumpkin: fix bad thermistor node name arm64: dts: mt7622: specify the L2 cache topology arm64: dts: mt7622: specify the number of DMA requests arm64: dts: mediatek: pumpkin: Remove input-name property arm64: dts: mediatek: mt8173: Add gce-client-reg handle to disp-mutex arm64: dts: mediatek: Add device-tree for MT8195 Demo board dt-bindings: arm64: dts: mediatek: Add mt8195-demo board arm64: dts: Add mediatek SoC mt8195 and evaluation board arm64: dts: mt8192: Add mmc device nodes arm64: dts: mt8183: Update disp_aal node compatible arm64: dts: mt8192: Add audio-related nodes arm64: dts: mt8192: Add spmi node dt-bindings: arm: Add compatible for Mediatek MT8192 arm64: dts: mt6359: add PMIC MT6359 related nodes arm64: dts: mediatek: mt8173: Add power domain to encoder nodes arm64: dts: mediatek: Get rid of mediatek, larb for MM nodes ... Link: https://lore.kernel.org/r/[email protected] Like the 32-bit branch, this contains an incompatible binding change by removing the mediatek,larb properties from the dts files, so these no longer work with kernels prior to 5.18. Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 204637e + c751047 commit 82706d6

File tree

19 files changed

+2545
-52
lines changed

19 files changed

+2545
-52
lines changed

Documentation/devicetree/bindings/arm/mediatek.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ properties:
133133
- const: mediatek,mt8183
134134
- items:
135135
- enum:
136+
- mediatek,mt8192-evb
137+
- const: mediatek,mt8192
138+
- items:
139+
- enum:
140+
- mediatek,mt8195-demo
136141
- mediatek,mt8195-evb
137142
- const: mediatek,mt8195
138143
- description: Google Burnet (HP Chromebook x360 11MK G3 EE)

Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- mediatek,mt8135-pericfg
2727
- mediatek,mt8173-pericfg
2828
- mediatek,mt8183-pericfg
29+
- mediatek,mt8195-pericfg
2930
- mediatek,mt8516-pericfg
3031
- const: syscon
3132
- items:

arch/arm64/boot/dts/mediatek/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku0.dtb
3838
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb
3939
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb
4040
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-evb.dtb
41+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-demo.dtb
42+
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-evb.dtb
4143
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb

arch/arm64/boot/dts/mediatek/mt2712e.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#address-cells = <2>;
2020
#size-cells = <2>;
2121

22-
cluster0_opp: opp_table0 {
22+
cluster0_opp: opp-table-0 {
2323
compatible = "operating-points-v2";
2424
opp-shared;
2525
opp00 {
@@ -36,7 +36,7 @@
3636
};
3737
};
3838

39-
cluster1_opp: opp_table1 {
39+
cluster1_opp: opp-table-1 {
4040
compatible = "operating-points-v2";
4141
opp-shared;
4242
opp00 {
@@ -329,8 +329,8 @@
329329
interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_LOW>;
330330
clocks = <&infracfg CLK_INFRA_M4U>;
331331
clock-names = "bclk";
332-
mediatek,larbs = <&larb0 &larb1 &larb2
333-
&larb3 &larb6>;
332+
mediatek,larbs = <&larb0>, <&larb1>, <&larb2>,
333+
<&larb3>, <&larb6>;
334334
#iommu-cells = <1>;
335335
};
336336

@@ -346,7 +346,7 @@
346346
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_LOW>;
347347
clocks = <&infracfg CLK_INFRA_M4U>;
348348
clock-names = "bclk";
349-
mediatek,larbs = <&larb4 &larb5 &larb7>;
349+
mediatek,larbs = <&larb4>, <&larb5>, <&larb7>;
350350
#iommu-cells = <1>;
351351
};
352352

Lines changed: 298 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,298 @@
1+
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2+
/*
3+
* Copyright (C) 2022 MediaTek Inc.
4+
*/
5+
6+
&pwrap {
7+
pmic: pmic {
8+
compatible = "mediatek,mt6359";
9+
interrupt-controller;
10+
#interrupt-cells = <2>;
11+
12+
mt6359codec: mt6359codec {
13+
};
14+
15+
regulators {
16+
mt6359_vs1_buck_reg: buck_vs1 {
17+
regulator-name = "vs1";
18+
regulator-min-microvolt = <800000>;
19+
regulator-max-microvolt = <2200000>;
20+
regulator-enable-ramp-delay = <0>;
21+
regulator-always-on;
22+
};
23+
mt6359_vgpu11_buck_reg: buck_vgpu11 {
24+
regulator-name = "vgpu11";
25+
regulator-min-microvolt = <400000>;
26+
regulator-max-microvolt = <1193750>;
27+
regulator-ramp-delay = <5000>;
28+
regulator-enable-ramp-delay = <200>;
29+
regulator-allowed-modes = <0 1 2>;
30+
};
31+
mt6359_vmodem_buck_reg: buck_vmodem {
32+
regulator-name = "vmodem";
33+
regulator-min-microvolt = <400000>;
34+
regulator-max-microvolt = <1100000>;
35+
regulator-ramp-delay = <10760>;
36+
regulator-enable-ramp-delay = <200>;
37+
};
38+
mt6359_vpu_buck_reg: buck_vpu {
39+
regulator-name = "vpu";
40+
regulator-min-microvolt = <400000>;
41+
regulator-max-microvolt = <1193750>;
42+
regulator-ramp-delay = <5000>;
43+
regulator-enable-ramp-delay = <200>;
44+
regulator-allowed-modes = <0 1 2>;
45+
};
46+
mt6359_vcore_buck_reg: buck_vcore {
47+
regulator-name = "vcore";
48+
regulator-min-microvolt = <400000>;
49+
regulator-max-microvolt = <1300000>;
50+
regulator-ramp-delay = <5000>;
51+
regulator-enable-ramp-delay = <200>;
52+
regulator-allowed-modes = <0 1 2>;
53+
};
54+
mt6359_vs2_buck_reg: buck_vs2 {
55+
regulator-name = "vs2";
56+
regulator-min-microvolt = <800000>;
57+
regulator-max-microvolt = <1600000>;
58+
regulator-enable-ramp-delay = <0>;
59+
regulator-always-on;
60+
};
61+
mt6359_vpa_buck_reg: buck_vpa {
62+
regulator-name = "vpa";
63+
regulator-min-microvolt = <500000>;
64+
regulator-max-microvolt = <3650000>;
65+
regulator-enable-ramp-delay = <300>;
66+
};
67+
mt6359_vproc2_buck_reg: buck_vproc2 {
68+
regulator-name = "vproc2";
69+
regulator-min-microvolt = <400000>;
70+
regulator-max-microvolt = <1193750>;
71+
regulator-ramp-delay = <7500>;
72+
regulator-enable-ramp-delay = <200>;
73+
regulator-allowed-modes = <0 1 2>;
74+
};
75+
mt6359_vproc1_buck_reg: buck_vproc1 {
76+
regulator-name = "vproc1";
77+
regulator-min-microvolt = <400000>;
78+
regulator-max-microvolt = <1193750>;
79+
regulator-ramp-delay = <7500>;
80+
regulator-enable-ramp-delay = <200>;
81+
regulator-allowed-modes = <0 1 2>;
82+
};
83+
mt6359_vcore_sshub_buck_reg: buck_vcore_sshub {
84+
regulator-name = "vcore_sshub";
85+
regulator-min-microvolt = <400000>;
86+
regulator-max-microvolt = <1193750>;
87+
};
88+
mt6359_vgpu11_sshub_buck_reg: buck_vgpu11_sshub {
89+
regulator-name = "vgpu11_sshub";
90+
regulator-min-microvolt = <400000>;
91+
regulator-max-microvolt = <1193750>;
92+
};
93+
mt6359_vaud18_ldo_reg: ldo_vaud18 {
94+
regulator-name = "vaud18";
95+
regulator-min-microvolt = <1800000>;
96+
regulator-max-microvolt = <1800000>;
97+
regulator-enable-ramp-delay = <240>;
98+
};
99+
mt6359_vsim1_ldo_reg: ldo_vsim1 {
100+
regulator-name = "vsim1";
101+
regulator-min-microvolt = <1700000>;
102+
regulator-max-microvolt = <3100000>;
103+
};
104+
mt6359_vibr_ldo_reg: ldo_vibr {
105+
regulator-name = "vibr";
106+
regulator-min-microvolt = <1200000>;
107+
regulator-max-microvolt = <3300000>;
108+
};
109+
mt6359_vrf12_ldo_reg: ldo_vrf12 {
110+
regulator-name = "vrf12";
111+
regulator-min-microvolt = <1100000>;
112+
regulator-max-microvolt = <1300000>;
113+
};
114+
mt6359_vusb_ldo_reg: ldo_vusb {
115+
regulator-name = "vusb";
116+
regulator-min-microvolt = <3000000>;
117+
regulator-max-microvolt = <3000000>;
118+
regulator-enable-ramp-delay = <960>;
119+
regulator-always-on;
120+
};
121+
mt6359_vsram_proc2_ldo_reg: ldo_vsram_proc2 {
122+
regulator-name = "vsram_proc2";
123+
regulator-min-microvolt = <500000>;
124+
regulator-max-microvolt = <1293750>;
125+
regulator-ramp-delay = <7500>;
126+
regulator-enable-ramp-delay = <240>;
127+
regulator-always-on;
128+
};
129+
mt6359_vio18_ldo_reg: ldo_vio18 {
130+
regulator-name = "vio18";
131+
regulator-min-microvolt = <1700000>;
132+
regulator-max-microvolt = <1900000>;
133+
regulator-enable-ramp-delay = <960>;
134+
regulator-always-on;
135+
};
136+
mt6359_vcamio_ldo_reg: ldo_vcamio {
137+
regulator-name = "vcamio";
138+
regulator-min-microvolt = <1700000>;
139+
regulator-max-microvolt = <1900000>;
140+
};
141+
mt6359_vcn18_ldo_reg: ldo_vcn18 {
142+
regulator-name = "vcn18";
143+
regulator-min-microvolt = <1800000>;
144+
regulator-max-microvolt = <1800000>;
145+
regulator-enable-ramp-delay = <240>;
146+
};
147+
mt6359_vfe28_ldo_reg: ldo_vfe28 {
148+
regulator-name = "vfe28";
149+
regulator-min-microvolt = <2800000>;
150+
regulator-max-microvolt = <2800000>;
151+
regulator-enable-ramp-delay = <120>;
152+
};
153+
mt6359_vcn13_ldo_reg: ldo_vcn13 {
154+
regulator-name = "vcn13";
155+
regulator-min-microvolt = <900000>;
156+
regulator-max-microvolt = <1300000>;
157+
};
158+
mt6359_vcn33_1_bt_ldo_reg: ldo_vcn33_1_bt {
159+
regulator-name = "vcn33_1_bt";
160+
regulator-min-microvolt = <2800000>;
161+
regulator-max-microvolt = <3500000>;
162+
};
163+
mt6359_vcn33_1_wifi_ldo_reg: ldo_vcn33_1_wifi {
164+
regulator-name = "vcn33_1_wifi";
165+
regulator-min-microvolt = <2800000>;
166+
regulator-max-microvolt = <3500000>;
167+
};
168+
mt6359_vaux18_ldo_reg: ldo_vaux18 {
169+
regulator-name = "vaux18";
170+
regulator-min-microvolt = <1800000>;
171+
regulator-max-microvolt = <1800000>;
172+
regulator-enable-ramp-delay = <240>;
173+
regulator-always-on;
174+
};
175+
mt6359_vsram_others_ldo_reg: ldo_vsram_others {
176+
regulator-name = "vsram_others";
177+
regulator-min-microvolt = <500000>;
178+
regulator-max-microvolt = <1293750>;
179+
regulator-ramp-delay = <5000>;
180+
regulator-enable-ramp-delay = <240>;
181+
};
182+
mt6359_vefuse_ldo_reg: ldo_vefuse {
183+
regulator-name = "vefuse";
184+
regulator-min-microvolt = <1700000>;
185+
regulator-max-microvolt = <2000000>;
186+
};
187+
mt6359_vxo22_ldo_reg: ldo_vxo22 {
188+
regulator-name = "vxo22";
189+
regulator-min-microvolt = <1800000>;
190+
regulator-max-microvolt = <2200000>;
191+
regulator-always-on;
192+
};
193+
mt6359_vrfck_ldo_reg: ldo_vrfck {
194+
regulator-name = "vrfck";
195+
regulator-min-microvolt = <1500000>;
196+
regulator-max-microvolt = <1700000>;
197+
};
198+
mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {
199+
regulator-name = "vrfck";
200+
regulator-min-microvolt = <1240000>;
201+
regulator-max-microvolt = <1600000>;
202+
};
203+
mt6359_vbif28_ldo_reg: ldo_vbif28 {
204+
regulator-name = "vbif28";
205+
regulator-min-microvolt = <2800000>;
206+
regulator-max-microvolt = <2800000>;
207+
regulator-enable-ramp-delay = <240>;
208+
};
209+
mt6359_vio28_ldo_reg: ldo_vio28 {
210+
regulator-name = "vio28";
211+
regulator-min-microvolt = <2800000>;
212+
regulator-max-microvolt = <3300000>;
213+
regulator-always-on;
214+
};
215+
mt6359_vemc_ldo_reg: ldo_vemc {
216+
regulator-name = "vemc";
217+
regulator-min-microvolt = <2900000>;
218+
regulator-max-microvolt = <3300000>;
219+
};
220+
mt6359_vemc_1_ldo_reg: ldo_vemc_1 {
221+
regulator-name = "vemc";
222+
regulator-min-microvolt = <2500000>;
223+
regulator-max-microvolt = <3300000>;
224+
};
225+
mt6359_vcn33_2_bt_ldo_reg: ldo_vcn33_2_bt {
226+
regulator-name = "vcn33_2_bt";
227+
regulator-min-microvolt = <2800000>;
228+
regulator-max-microvolt = <3500000>;
229+
};
230+
mt6359_vcn33_2_wifi_ldo_reg: ldo_vcn33_2_wifi {
231+
regulator-name = "vcn33_2_wifi";
232+
regulator-min-microvolt = <2800000>;
233+
regulator-max-microvolt = <3500000>;
234+
};
235+
mt6359_va12_ldo_reg: ldo_va12 {
236+
regulator-name = "va12";
237+
regulator-min-microvolt = <1200000>;
238+
regulator-max-microvolt = <1300000>;
239+
regulator-always-on;
240+
};
241+
mt6359_va09_ldo_reg: ldo_va09 {
242+
regulator-name = "va09";
243+
regulator-min-microvolt = <800000>;
244+
regulator-max-microvolt = <1200000>;
245+
};
246+
mt6359_vrf18_ldo_reg: ldo_vrf18 {
247+
regulator-name = "vrf18";
248+
regulator-min-microvolt = <1700000>;
249+
regulator-max-microvolt = <1810000>;
250+
};
251+
mt6359_vsram_md_ldo_reg: ldo_vsram_md {
252+
regulator-name = "vsram_md";
253+
regulator-min-microvolt = <500000>;
254+
regulator-max-microvolt = <1293750>;
255+
regulator-ramp-delay = <10760>;
256+
regulator-enable-ramp-delay = <240>;
257+
};
258+
mt6359_vufs_ldo_reg: ldo_vufs {
259+
regulator-name = "vufs";
260+
regulator-min-microvolt = <1700000>;
261+
regulator-max-microvolt = <1900000>;
262+
};
263+
mt6359_vm18_ldo_reg: ldo_vm18 {
264+
regulator-name = "vm18";
265+
regulator-min-microvolt = <1700000>;
266+
regulator-max-microvolt = <1900000>;
267+
regulator-always-on;
268+
};
269+
mt6359_vbbck_ldo_reg: ldo_vbbck {
270+
regulator-name = "vbbck";
271+
regulator-min-microvolt = <1100000>;
272+
regulator-max-microvolt = <1200000>;
273+
};
274+
mt6359_vsram_proc1_ldo_reg: ldo_vsram_proc1 {
275+
regulator-name = "vsram_proc1";
276+
regulator-min-microvolt = <500000>;
277+
regulator-max-microvolt = <1293750>;
278+
regulator-ramp-delay = <7500>;
279+
regulator-enable-ramp-delay = <240>;
280+
regulator-always-on;
281+
};
282+
mt6359_vsim2_ldo_reg: ldo_vsim2 {
283+
regulator-name = "vsim2";
284+
regulator-min-microvolt = <1700000>;
285+
regulator-max-microvolt = <3100000>;
286+
};
287+
mt6359_vsram_others_sshub_ldo: ldo_vsram_others_sshub {
288+
regulator-name = "vsram_others_sshub";
289+
regulator-min-microvolt = <500000>;
290+
regulator-max-microvolt = <1293750>;
291+
};
292+
};
293+
294+
mt6359rtc: mt6359rtc {
295+
compatible = "mediatek,mt6358-rtc";
296+
};
297+
};
298+
};

0 commit comments

Comments
 (0)