Skip to content

Commit 5eb4573

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "There are a lot of minor DT fixes for Mediatek, Rockchip, Qualcomm and Microchip and NXP, addressing both build-time warnings and bugs found during runtime testing. Most of these changes are machine specific fixups, but there are a few notable regressions that affect an entire SoC: - The Qualcomm MSI support that was improved for 6.9 ended up being wrong on some chips and now gets fixed. - The i.MX8MP camera interface broke due to a typo and gets updated again. The main driver fix is also for Qualcomm platforms, rewriting an interface in the QSEECOM firmware support that could lead to crashing the kernel from a trusted application. The only other code changes are minor fixes for Mediatek SoC drivers" * tag 'soc-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (50 commits) ARM: dts: imx6ull-tarragon: fix USB over-current polarity soc: mediatek: mtk-socinfo: depends on CONFIG_SOC_BUS soc: mediatek: mtk-svs: Append "-thermal" to thermal zone names arm64: dts: imx8mp: Fix assigned-clocks for second CSI2 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property ARM: dts: microchip: at91-sama7g5ek: Replace regulator-suspend-voltage with the valid property arm64: dts: rockchip: Fix USB interface compatible string on kobol-helios64 arm64: dts: qcom: sc8180x: Fix ss_phy_irq for secondary USB controller arm64: dts: qcom: sm8650: Fix the msi-map entries arm64: dts: qcom: sm8550: Fix the msi-map entries arm64: dts: qcom: sm8450: Fix the msi-map entries arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP arm64: dts: qcom: x1e80100: Fix the compatible for cluster idle states arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 2 arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 1 arm64: dts: rockchip: drop redundant pcie-reset-suspend in Scarlet Dumo arm64: dts: rockchip: mark system power controller and fix typo on orangepi-5-plus ...
2 parents e6ebf01 + 9f26bc7 commit 5eb4573

Some content is hidden

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

44 files changed

+331
-193
lines changed

‎Documentation/devicetree/bindings/soc/rockchip/grf.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ allOf:
171171
unevaluatedProperties: false
172172

173173
pcie-phy:
174+
type: object
174175
description:
175176
Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
176177

‎arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242

243243
regulator-state-standby {
244244
regulator-on-in-suspend;
245-
regulator-suspend-voltage = <1150000>;
245+
regulator-suspend-microvolt = <1150000>;
246246
regulator-mode = <4>;
247247
};
248248

@@ -263,7 +263,7 @@
263263

264264
regulator-state-standby {
265265
regulator-on-in-suspend;
266-
regulator-suspend-voltage = <1050000>;
266+
regulator-suspend-microvolt = <1050000>;
267267
regulator-mode = <4>;
268268
};
269269

@@ -280,7 +280,7 @@
280280
regulator-always-on;
281281

282282
regulator-state-standby {
283-
regulator-suspend-voltage = <1800000>;
283+
regulator-suspend-microvolt = <1800000>;
284284
regulator-on-in-suspend;
285285
};
286286

@@ -296,7 +296,7 @@
296296
regulator-always-on;
297297

298298
regulator-state-standby {
299-
regulator-suspend-voltage = <3300000>;
299+
regulator-suspend-microvolt = <3300000>;
300300
regulator-on-in-suspend;
301301
};
302302

‎arch/arm/boot/dts/microchip/at91-sama7g5ek.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293

294294
regulator-state-standby {
295295
regulator-on-in-suspend;
296-
regulator-suspend-voltage = <1150000>;
296+
regulator-suspend-microvolt = <1150000>;
297297
regulator-mode = <4>;
298298
};
299299

@@ -314,7 +314,7 @@
314314

315315
regulator-state-standby {
316316
regulator-on-in-suspend;
317-
regulator-suspend-voltage = <1050000>;
317+
regulator-suspend-microvolt = <1050000>;
318318
regulator-mode = <4>;
319319
};
320320

@@ -331,7 +331,7 @@
331331
regulator-always-on;
332332

333333
regulator-state-standby {
334-
regulator-suspend-voltage = <1800000>;
334+
regulator-suspend-microvolt = <1800000>;
335335
regulator-on-in-suspend;
336336
};
337337

@@ -346,7 +346,7 @@
346346
regulator-max-microvolt = <3700000>;
347347

348348
regulator-state-standby {
349-
regulator-suspend-voltage = <1800000>;
349+
regulator-suspend-microvolt = <1800000>;
350350
regulator-on-in-suspend;
351351
};
352352

‎arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@
805805
&pinctrl_usb_pwr>;
806806
dr_mode = "host";
807807
power-active-high;
808+
over-current-active-low;
808809
disable-over-current;
809810
status = "okay";
810811
};

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@
16721672
<&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>,
16731673
<&clk IMX8MP_CLK_MEDIA_AXI_ROOT>;
16741674
clock-names = "pclk", "wrap", "phy", "axi";
1675-
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>,
1675+
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM2_PIX>,
16761676
<&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>;
16771677
assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>,
16781678
<&clk IMX8MP_CLK_24M>;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
};
130130

131131
&pio {
132-
eth_default: eth_default {
132+
eth_default: eth-default-pins {
133133
tx_pins {
134134
pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GBE_TXD3>,
135135
<MT2712_PIN_72_GBE_TXD2__FUNC_GBE_TXD2>,
@@ -156,7 +156,7 @@
156156
};
157157
};
158158

159-
eth_sleep: eth_sleep {
159+
eth_sleep: eth-sleep-pins {
160160
tx_pins {
161161
pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GPIO71>,
162162
<MT2712_PIN_72_GBE_TXD2__FUNC_GPIO72>,
@@ -182,14 +182,14 @@
182182
};
183183
};
184184

185-
usb0_id_pins_float: usb0_iddig {
185+
usb0_id_pins_float: usb0-iddig-pins {
186186
pins_iddig {
187187
pinmux = <MT2712_PIN_12_IDDIG_P0__FUNC_IDDIG_A>;
188188
bias-pull-up;
189189
};
190190
};
191191

192-
usb1_id_pins_float: usb1_iddig {
192+
usb1_id_pins_float: usb1-iddig-pins {
193193
pins_iddig {
194194
pinmux = <MT2712_PIN_14_IDDIG_P1__FUNC_IDDIG_B>;
195195
bias-pull-up;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,11 @@
249249
#clock-cells = <1>;
250250
};
251251

252-
infracfg: syscon@10001000 {
252+
infracfg: clock-controller@10001000 {
253253
compatible = "mediatek,mt2712-infracfg", "syscon";
254254
reg = <0 0x10001000 0 0x1000>;
255255
#clock-cells = <1>;
256+
#reset-cells = <1>;
256257
};
257258

258259
pericfg: syscon@10003000 {

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

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
clock-names = "hif_sel";
253253
};
254254

255-
cir: cir@10009000 {
255+
cir: ir-receiver@10009000 {
256256
compatible = "mediatek,mt7622-cir";
257257
reg = <0 0x10009000 0 0x1000>;
258258
interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;
@@ -283,16 +283,14 @@
283283
};
284284
};
285285

286-
apmixedsys: apmixedsys@10209000 {
287-
compatible = "mediatek,mt7622-apmixedsys",
288-
"syscon";
286+
apmixedsys: clock-controller@10209000 {
287+
compatible = "mediatek,mt7622-apmixedsys";
289288
reg = <0 0x10209000 0 0x1000>;
290289
#clock-cells = <1>;
291290
};
292291

293-
topckgen: topckgen@10210000 {
294-
compatible = "mediatek,mt7622-topckgen",
295-
"syscon";
292+
topckgen: clock-controller@10210000 {
293+
compatible = "mediatek,mt7622-topckgen";
296294
reg = <0 0x10210000 0 0x1000>;
297295
#clock-cells = <1>;
298296
};
@@ -515,7 +513,6 @@
515513
<&pericfg CLK_PERI_AUXADC_PD>;
516514
clock-names = "therm", "auxadc";
517515
resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
518-
reset-names = "therm";
519516
mediatek,auxadc = <&auxadc>;
520517
mediatek,apmixedsys = <&apmixedsys>;
521518
nvmem-cells = <&thermal_calibration>;
@@ -734,9 +731,8 @@
734731
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
735732
};
736733

737-
ssusbsys: ssusbsys@1a000000 {
738-
compatible = "mediatek,mt7622-ssusbsys",
739-
"syscon";
734+
ssusbsys: clock-controller@1a000000 {
735+
compatible = "mediatek,mt7622-ssusbsys";
740736
reg = <0 0x1a000000 0 0x1000>;
741737
#clock-cells = <1>;
742738
#reset-cells = <1>;
@@ -793,9 +789,8 @@
793789
};
794790
};
795791

796-
pciesys: pciesys@1a100800 {
797-
compatible = "mediatek,mt7622-pciesys",
798-
"syscon";
792+
pciesys: clock-controller@1a100800 {
793+
compatible = "mediatek,mt7622-pciesys";
799794
reg = <0 0x1a100800 0 0x1000>;
800795
#clock-cells = <1>;
801796
#reset-cells = <1>;
@@ -921,12 +916,13 @@
921916
};
922917
};
923918

924-
hifsys: syscon@1af00000 {
925-
compatible = "mediatek,mt7622-hifsys", "syscon";
919+
hifsys: clock-controller@1af00000 {
920+
compatible = "mediatek,mt7622-hifsys";
926921
reg = <0 0x1af00000 0 0x70>;
922+
#clock-cells = <1>;
927923
};
928924

929-
ethsys: syscon@1b000000 {
925+
ethsys: clock-controller@1b000000 {
930926
compatible = "mediatek,mt7622-ethsys",
931927
"syscon";
932928
reg = <0 0x1b000000 0 0x1000>;
@@ -966,9 +962,7 @@
966962
};
967963

968964
eth: ethernet@1b100000 {
969-
compatible = "mediatek,mt7622-eth",
970-
"mediatek,mt2701-eth",
971-
"syscon";
965+
compatible = "mediatek,mt7622-eth";
972966
reg = <0 0x1b100000 0 0x20000>;
973967
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_LOW>,
974968
<GIC_SPI 224 IRQ_TYPE_LEVEL_LOW>,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,19 +146,19 @@
146146

147147
&cpu_thermal {
148148
cooling-maps {
149-
cpu-active-high {
149+
map-cpu-active-high {
150150
/* active: set fan to cooling level 2 */
151151
cooling-device = <&fan 2 2>;
152152
trip = <&cpu_trip_active_high>;
153153
};
154154

155-
cpu-active-med {
155+
map-cpu-active-med {
156156
/* active: set fan to cooling level 1 */
157157
cooling-device = <&fan 1 1>;
158158
trip = <&cpu_trip_active_med>;
159159
};
160160

161-
cpu-active-low {
161+
map-cpu-active-low {
162162
/* active: set fan to cooling level 0 */
163163
cooling-device = <&fan 0 0>;
164164
trip = <&cpu_trip_active_low>;

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,8 @@
332332
reg = <0 0x1100c800 0 0x800>;
333333
interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
334334
clocks = <&infracfg CLK_INFRA_THERM_CK>,
335-
<&infracfg CLK_INFRA_ADC_26M_CK>,
336-
<&infracfg CLK_INFRA_ADC_FRC_CK>;
337-
clock-names = "therm", "auxadc", "adc_32k";
335+
<&infracfg CLK_INFRA_ADC_26M_CK>;
336+
clock-names = "therm", "auxadc";
338337
nvmem-cells = <&thermal_calibration>;
339338
nvmem-cell-names = "calibration-data";
340339
#thermal-sensor-cells = <1>;
@@ -492,8 +491,6 @@
492491
compatible = "mediatek,mt7986-ethsys",
493492
"syscon";
494493
reg = <0 0x15000000 0 0x1000>;
495-
#address-cells = <1>;
496-
#size-cells = <1>;
497494
#clock-cells = <1>;
498495
#reset-cells = <1>;
499496
};
@@ -556,7 +553,6 @@
556553
<&topckgen CLK_TOP_SGM_325M_SEL>;
557554
assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>,
558555
<&apmixedsys CLK_APMIXED_SGMPLL>;
559-
#reset-cells = <1>;
560556
#address-cells = <1>;
561557
#size-cells = <0>;
562558
mediatek,ethsys = <&ethsys>;

0 commit comments

Comments
 (0)