Skip to content

Commit d053652

Browse files
arndbarndb
committed
Merge tag 'v6.11-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/dt
mt63xx: - add ADC node to the different PMICs mt7981: - Add SPI controller nodes. mt8183: - use referenced label for DSI endpoint. - disable soc_data efuse node, which does not has any cell definde (kukui). - fix the regulator tree (kukui). - fix potential deadlock by removing not needed clock in the MFG async power domain. - add DPI node. mt8186: - fix opp-supported-hw mask for GPU. - add lvts thermal sensor node. - add thermal zones. - fix reserved memory region of ADSP firmware (corsola). - add power domain to DPI node. - add SVS node. - fix internal display by disabling the external display temporarily (corsola). mt8188: - add thermal sensor for the AP. - add thermal zones. mt8195: - fix pull resistance for hdmi pins (cherry). - remove keyboard backlight node (cherry), this is detected through ChromeOS EC communication. - fix warning in mdp3 driver by providing a phandel to the SCP. - fix probe error of the USB controller by disabeling USB3 on the controller (cherry). - assign per default both phys to the USB controller (cherry). - fix binding validation by re-ordering the dp_intf clocks. mt8365: - add AFE audio controller. - add AFE and audio codec support (evk). mt8395: - fix probe error of the USB controller by disabeling USB3 on the controller (radax-nio-12l). - assign per default both phys to the USB controller (genio, kontron, radax). * tag 'v6.11-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux: (25 commits) arm64: dts: mediatek: add audio support for mt8365-evk arm64: dts: mediatek: add afe support for mt8365 SoC arm64: dts: mediatek: mt8186-corsola: Disable DPI display interface arm64: dts: mediatek: mt8186: Add svs node arm64: dts: mediatek: mt8186: Add power domain for DPI arm64: dts: mediatek: mt8195: Correct clock order for dp_intf* arm64: dts: mt8183: add dpi node to mt8183 arm64: dts: mediatek: mt8186-corsola: Update ADSP reserved memory region arm64: dts: mediatek: mt8183: Remove clock from mfg_async power domain arm64: dts: mt8183-kukui: clean up regulator tree arm64: dts: mediatek: mt7981: add SPI controllers arm64: dts: mediatek: mt8183-kukui: Disable unused efuse at 8000000 arm64: dts: mediatek: mt8188: add default thermal zones arm64: dts: mediatek: mt8188: add lvts definitions arm64: dts: mediatek: mt8186: add default thermal zones arm64: dts: mediatek: mt8186: add lvts definitions arm64: dts: mediatek: mt8195: Assign USB 3.0 PHY to xhci1 by default arm64: dts: mediatek: mt8395-nio-12l: Mark USB 3.0 on xhci1 as disabled arm64: dts: mediatek: mt8195-cherry: Mark USB 3.0 on xhci1 as disabled arm64: dts: mediatek: mt8195: Add SCP phandle to MDP3 DMA controller ... Link: https://lore.kernel.org/r/059656ad-5365-4097-86a1-f4ba43edf5da@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 72e6889 + a9efc40 commit d053652

20 files changed

Lines changed: 1066 additions & 63 deletions

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
mt6357_pmic: pmic {
1111
compatible = "mediatek,mt6357";
1212

13+
pmic_adc: adc {
14+
compatible = "mediatek,mt6357-auxadc";
15+
#io-channel-cells = <1>;
16+
};
17+
1318
regulators {
1419
mt6357_vproc_reg: buck-vproc {
1520
regulator-name = "vproc";

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
interrupt-controller;
1111
#interrupt-cells = <2>;
1212

13+
pmic_adc: adc {
14+
compatible = "mediatek,mt6358-auxadc";
15+
#io-channel-cells = <1>;
16+
};
17+
1318
mt6358codec: mt6358codec {
1419
compatible = "mediatek,mt6358-sound";
1520
mediatek,dmic-mode = <0>; /* two-wires */

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
interrupt-controller;
1010
#interrupt-cells = <2>;
1111

12+
pmic_adc: adc {
13+
compatible = "mediatek,mt6359-auxadc";
14+
#io-channel-cells = <1>;
15+
};
16+
1217
mt6359codec: mt6359codec {
1318
};
1419

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,48 @@
109109
status = "disabled";
110110
};
111111

112+
spi@11009000 {
113+
compatible = "mediatek,mt7981-spi-ipm", "mediatek,spi-ipm";
114+
reg = <0 0x11009000 0 0x1000>;
115+
interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
116+
clocks = <&topckgen CLK_TOP_CB_M_D2>,
117+
<&topckgen CLK_TOP_SPI_SEL>,
118+
<&infracfg CLK_INFRA_SPI2_CK>,
119+
<&infracfg CLK_INFRA_SPI2_HCK_CK>;
120+
clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
121+
#address-cells = <1>;
122+
#size-cells = <0>;
123+
status = "disabled";
124+
};
125+
126+
spi@1100a000 {
127+
compatible = "mediatek,mt7981-spi-ipm", "mediatek,spi-ipm";
128+
reg = <0 0x1100a000 0 0x1000>;
129+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
130+
clocks = <&topckgen CLK_TOP_CB_M_D2>,
131+
<&topckgen CLK_TOP_SPI_SEL>,
132+
<&infracfg CLK_INFRA_SPI0_CK>,
133+
<&infracfg CLK_INFRA_SPI0_HCK_CK>;
134+
clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
135+
#address-cells = <1>;
136+
#size-cells = <0>;
137+
status = "disabled";
138+
};
139+
140+
spi@1100b000 {
141+
compatible = "mediatek,mt7981-spi-ipm", "mediatek,spi-ipm";
142+
reg = <0 0x1100b000 0 0x1000>;
143+
interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
144+
clocks = <&topckgen CLK_TOP_CB_M_D2>,
145+
<&topckgen CLK_TOP_SPI_SEL>,
146+
<&infracfg CLK_INFRA_SPI1_CK>,
147+
<&infracfg CLK_INFRA_SPI1_HCK_CK>;
148+
clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
149+
#address-cells = <1>;
150+
#size-cells = <0>;
151+
status = "disabled";
152+
};
153+
112154
pio: pinctrl@11d00000 {
113155
compatible = "mediatek,mt7981-pinctrl";
114156
reg = <0 0x11d00000 0 0x1000>,

‎arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,11 @@
9191

9292
&dsi0 {
9393
status = "okay";
94-
/delete-property/#size-cells;
95-
/delete-property/#address-cells;
9694
/delete-node/panel@0;
97-
ports {
98-
port {
99-
dsi_out: endpoint {
100-
remote-endpoint = <&anx7625_in>;
101-
};
102-
};
103-
};
95+
};
96+
97+
&dsi_out {
98+
remote-endpoint = <&anx7625_in>;
10499
};
105100

106101
&i2c0 {

‎arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
backlight_lcd0: backlight_lcd0 {
2525
compatible = "pwm-backlight";
2626
pwms = <&pwm0 0 500000>;
27-
power-supply = <&bl_pp5000>;
27+
power-supply = <&reg_vsys>;
2828
enable-gpios = <&pio 176 0>;
2929
brightness-levels = <0 1023>;
3030
num-interpolated-steps = <1023>;
@@ -47,10 +47,9 @@
4747
it6505_pp18_reg: regulator0 {
4848
compatible = "regulator-fixed";
4949
regulator-name = "it6505_pp18";
50-
regulator-min-microvolt = <1800000>;
51-
regulator-max-microvolt = <1800000>;
5250
gpio = <&pio 178 0>;
5351
enable-active-high;
52+
vin-supply = <&pp1800_alw>;
5453
};
5554

5655
lcd_pp3300: regulator1 {
@@ -62,27 +61,16 @@
6261
regulator-boot-on;
6362
};
6463

65-
bl_pp5000: regulator2 {
66-
compatible = "regulator-fixed";
67-
regulator-name = "bl_pp5000";
68-
regulator-min-microvolt = <5000000>;
69-
regulator-max-microvolt = <5000000>;
70-
regulator-always-on;
71-
regulator-boot-on;
72-
};
73-
7464
mmc1_fixed_power: regulator3 {
7565
compatible = "regulator-fixed";
7666
regulator-name = "mmc1_power";
77-
regulator-min-microvolt = <3300000>;
78-
regulator-max-microvolt = <3300000>;
67+
vin-supply = <&pp3300_alw>;
7968
};
8069

8170
mmc1_fixed_io: regulator4 {
8271
compatible = "regulator-fixed";
8372
regulator-name = "mmc1_io";
84-
regulator-min-microvolt = <1800000>;
85-
regulator-max-microvolt = <1800000>;
73+
vin-supply = <&pp1800_alw>;
8674
};
8775

8876
pp1800_alw: regulator5 {
@@ -92,6 +80,7 @@
9280
regulator-boot-on;
9381
regulator-min-microvolt = <1800000>;
9482
regulator-max-microvolt = <1800000>;
83+
vin-supply = <&reg_vsys>;
9584
};
9685

9786
pp3300_alw: regulator6 {
@@ -101,6 +90,7 @@
10190
regulator-boot-on;
10291
regulator-min-microvolt = <3300000>;
10392
regulator-max-microvolt = <3300000>;
93+
vin-supply = <&reg_vsys>;
10494
};
10595

10696
/* system wide semi-regulated power rail from charger */
@@ -868,10 +858,6 @@
868858
domain-supply = <&mt6358_vgpu_reg>;
869859
};
870860

871-
&soc_data {
872-
status = "okay";
873-
};
874-
875861
&spi0 {
876862
pinctrl-names = "default";
877863
pinctrl-0 = <&spi0_pins>;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,8 +872,6 @@
872872

873873
mfg_async: power-domain@MT8183_POWER_DOMAIN_MFG_ASYNC {
874874
reg = <MT8183_POWER_DOMAIN_MFG_ASYNC>;
875-
clocks = <&topckgen CLK_TOP_MUX_MFG>;
876-
clock-names = "mfg";
877875
#address-cells = <1>;
878876
#size-cells = <0>;
879877
#power-domain-cells = <1>;
@@ -1838,6 +1836,17 @@
18381836
phy-names = "dphy";
18391837
};
18401838

1839+
dpi0: dpi@14015000 {
1840+
compatible = "mediatek,mt8183-dpi";
1841+
reg = <0 0x14015000 0 0x1000>;
1842+
interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>;
1843+
power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
1844+
clocks = <&mmsys CLK_MM_DPI_IF>,
1845+
<&mmsys CLK_MM_DPI_MM>,
1846+
<&apmixedsys CLK_APMIXED_TVDPLL>;
1847+
clock-names = "pixel", "engine", "pll";
1848+
};
1849+
18411850
mutex: mutex@14016000 {
18421851
compatible = "mediatek,mt8183-disp-mutex";
18431852
reg = <0 0x14016000 0 0x1000>;

‎arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169

170170
adsp_mem: memory@60000000 {
171171
compatible = "shared-dma-pool";
172-
reg = <0 0x60000000 0 0xA00000>;
172+
reg = <0 0x60000000 0 0x1000000>;
173173
no-map;
174174
};
175175

@@ -353,7 +353,8 @@
353353
pinctrl-names = "default", "sleep";
354354
pinctrl-0 = <&dpi_pins_default>;
355355
pinctrl-1 = <&dpi_pins_sleep>;
356-
status = "okay";
356+
/* TODO Re-enable after DP to Type-C port muxing can be described */
357+
status = "disabled";
357358
};
358359

359360
&dpi_out {

0 commit comments

Comments
 (0)