Skip to content

Commit 1133ae1

Browse files
arndbarndb
committed
Merge tag 'mtk-dts64-fixes-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into arm/fixes
MediaTek ARM64 DeviceTree fixes for v6.7 Fixes for various MediaTek SoCs, including MT7986: - eMMC HS400 mode failures - Cooling trips for emergency system shutdown - BPI-R3 machine SFP power limit and active cooling MT8173: - EVB device tree unit_address_vs_reg warning MT8183: - unit_address_vs_reg and simple_bus_reg warnings - Kukui device tree nodes naming consistency and adhering to bindings - Jacuzzi device tree unnecessary cells removed as those were producing avoid_unnecessary_addr_size MT8186: - Power domains faults due to incorrect clocks - GPU speed bin nvmem cell name was wrong, producing issues with interpreting the speedbin with GPU OPPs MT8195: - Local Arbiter (and whole system) ability to suspend - Cherry device tree interrupts_property warning ...and another unit_address_vs_reg warning on MT7622. * tag 'mtk-dts64-fixes-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux: arm64: dts: mediatek: cherry: Fix interrupt cells for MT6360 on I2C7 arm64: dts: mediatek: mt8183-kukui-jacuzzi: fix dsi unnecessary cells properties arm64: dts: mediatek: mt7622: fix memory node warning check arm64: dts: mediatek: mt8186: fix clock names for power domains arm64: dts: mediatek: mt8186: Change gpu speedbin nvmem cell name arm64: dts: mt7986: change cooling trips arm64: dts: mt7986: define 3W max power to both SFP on BPI-R3 arm64: dts: mt7986: fix emmc hs400 mode without uboot initialization arm64: dts: mt8183: kukui: Fix underscores in node names arm64: dts: mediatek: mt8183: Move thermal-zones to the root node arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names arm64: dts: mediatek: mt8183-evb: Fix unit_address_vs_reg warning on ntc arm64: dts: mediatek: mt8183: Fix unit address for scp reserved memory arm64: dts: mediatek: mt8195: Fix PM suspend/resume with venc clocks Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9c7f01d + 5943b8f commit 1133ae1

12 files changed

+241
-205
lines changed

‎arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
};
7474
};
7575

76-
memory {
76+
memory@40000000 {
7777
reg = <0 0x40000000 0 0x40000000>;
7878
};
7979

‎arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
};
5656
};
5757

58-
memory {
58+
memory@40000000 {
5959
reg = <0 0x40000000 0 0x20000000>;
6060
};
6161

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
compatible = "sff,sfp";
127127
i2c-bus = <&i2c_sfp1>;
128128
los-gpios = <&pio 46 GPIO_ACTIVE_HIGH>;
129+
maximum-power-milliwatt = <3000>;
129130
mod-def0-gpios = <&pio 49 GPIO_ACTIVE_LOW>;
130131
tx-disable-gpios = <&pio 20 GPIO_ACTIVE_HIGH>;
131132
tx-fault-gpios = <&pio 7 GPIO_ACTIVE_HIGH>;
@@ -137,6 +138,7 @@
137138
i2c-bus = <&i2c_sfp2>;
138139
los-gpios = <&pio 31 GPIO_ACTIVE_HIGH>;
139140
mod-def0-gpios = <&pio 47 GPIO_ACTIVE_LOW>;
141+
maximum-power-milliwatt = <3000>;
140142
tx-disable-gpios = <&pio 15 GPIO_ACTIVE_HIGH>;
141143
tx-fault-gpios = <&pio 48 GPIO_ACTIVE_HIGH>;
142144
};
@@ -150,16 +152,16 @@
150152
trip = <&cpu_trip_active_high>;
151153
};
152154

153-
cpu-active-low {
155+
cpu-active-med {
154156
/* active: set fan to cooling level 1 */
155157
cooling-device = <&fan 1 1>;
156-
trip = <&cpu_trip_active_low>;
158+
trip = <&cpu_trip_active_med>;
157159
};
158160

159-
cpu-passive {
160-
/* passive: set fan to cooling level 0 */
161+
cpu-active-low {
162+
/* active: set fan to cooling level 0 */
161163
cooling-device = <&fan 0 0>;
162-
trip = <&cpu_trip_passive>;
164+
trip = <&cpu_trip_active_low>;
163165
};
164166
};
165167
};

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,10 @@
374374
reg = <0 0x11230000 0 0x1000>,
375375
<0 0x11c20000 0 0x1000>;
376376
interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
377+
assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
378+
<&topckgen CLK_TOP_EMMC_250M_SEL>;
379+
assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,
380+
<&topckgen CLK_TOP_NET1PLL_D5_D2>;
377381
clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
378382
<&infracfg CLK_INFRA_MSDC_HCK_CK>,
379383
<&infracfg CLK_INFRA_MSDC_CK>,
@@ -610,22 +614,34 @@
610614
thermal-sensors = <&thermal 0>;
611615

612616
trips {
617+
cpu_trip_crit: crit {
618+
temperature = <125000>;
619+
hysteresis = <2000>;
620+
type = "critical";
621+
};
622+
623+
cpu_trip_hot: hot {
624+
temperature = <120000>;
625+
hysteresis = <2000>;
626+
type = "hot";
627+
};
628+
613629
cpu_trip_active_high: active-high {
614630
temperature = <115000>;
615631
hysteresis = <2000>;
616632
type = "active";
617633
};
618634

619-
cpu_trip_active_low: active-low {
635+
cpu_trip_active_med: active-med {
620636
temperature = <85000>;
621637
hysteresis = <2000>;
622638
type = "active";
623639
};
624640

625-
cpu_trip_passive: passive {
626-
temperature = <40000>;
641+
cpu_trip_active_low: active-low {
642+
temperature = <60000>;
627643
hysteresis = <2000>;
628-
type = "passive";
644+
type = "active";
629645
};
630646
};
631647
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
4545
};
4646

47-
usb_p1_vbus: regulator@0 {
47+
usb_p1_vbus: regulator-usb-p1 {
4848
compatible = "regulator-fixed";
4949
regulator-name = "usb_vbus";
5050
regulator-min-microvolt = <5000000>;
@@ -53,7 +53,7 @@
5353
enable-active-high;
5454
};
5555

56-
usb_p0_vbus: regulator@1 {
56+
usb_p0_vbus: regulator-usb-p0 {
5757
compatible = "regulator-fixed";
5858
regulator-name = "vbus";
5959
regulator-min-microvolt = <5000000>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
#address-cells = <2>;
3232
#size-cells = <2>;
3333
ranges;
34-
scp_mem_reserved: scp_mem_region {
34+
scp_mem_reserved: memory@50000000 {
3535
compatible = "shared-dma-pool";
3636
reg = <0 0x50000000 0 0x2900000>;
3737
no-map;
3838
};
3939
};
4040

41-
ntc@0 {
41+
thermal-sensor {
4242
compatible = "murata,ncp03wf104";
4343
pullup-uv = <1800000>;
4444
pullup-ohm = <390000>;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191

9292
&dsi0 {
9393
status = "okay";
94+
/delete-property/#size-cells;
95+
/delete-property/#address-cells;
9496
/delete-node/panel@0;
9597
ports {
9698
port {
@@ -441,20 +443,20 @@
441443
};
442444

443445
touchscreen_pins: touchscreen-pins {
444-
touch_int_odl {
446+
touch-int-odl {
445447
pinmux = <PINMUX_GPIO155__FUNC_GPIO155>;
446448
input-enable;
447449
bias-pull-up;
448450
};
449451

450-
touch_rst_l {
452+
touch-rst-l {
451453
pinmux = <PINMUX_GPIO156__FUNC_GPIO156>;
452454
output-high;
453455
};
454456
};
455457

456458
trackpad_pins: trackpad-pins {
457-
trackpad_int {
459+
trackpad-int {
458460
pinmux = <PINMUX_GPIO7__FUNC_GPIO7>;
459461
input-enable;
460462
bias-disable; /* pulled externally */

0 commit comments

Comments
 (0)