Skip to content

Commit 53e99dc

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "These are the expected fixes for the SoC tree. I have let the patches pile up a little too long, so this is bigger than I would have liked. - Minor build fixes for Broadcom STB and NXP i.MX8M SoCs as well\ as TEE firmware - Updates to the MAINTAINERS file for the PolarFire SoC - Minor DT fixes for Renesas White Hawk and Arm Versatile and Juno platforms - A fix for a missing dependnecy in the NXP DPIO driver - Broadcom BCA fixes to the newly added devicetree files - Multiple fixes for Microchip AT91 based SoCs, dealing with self-refresh timings and regulator settings in DT - Several DT fixes for NXP i.MX platforms, dealing with incorrect GPIO settings, extraneous nodes, and a wrong clock setting" * tag 'soc-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (45 commits) soc: fsl: select FSL_GUTS driver for DPIO ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time ARM: dts: at91: sama5d27_wlsom1: don't keep ldo2 enabled all the time ARM: dts: at91: sama7g5ek: specify proper regulator output ranges ARM: dts: at91: sama5d2_icp: specify proper regulator output ranges ARM: dts: at91: sama5d27_wlsom1: specify proper regulator output ranges ARM: at91: pm: fix DDR recalibration when resuming from backup and self-refresh ARM: at91: pm: fix self-refresh for sama7g5 soc: brcmstb: pm-arm: Fix refcount leak and __iomem leak bugs ARM: configs: at91: remove CONFIG_MICROCHIP_PIT64B ARM: ixp4xx: fix typos in comments arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number tee: fix compiler warning in tee_shm_register() arm64: dts: freescale: verdin-imx8mp: fix atmel_mxt_ts reset polarity arm64: dts: freescale: verdin-imx8mm: fix atmel_mxt_ts reset polarity arm64: dts: imx8mp: Fix I2C5 GPIO assignment on i.MX8M Plus DHCOM arm64: dts: imx8mm-venice-gw7901: fix port/phy validation arm64: dts: verdin-imx8mm: add otg2 pd to usbphy soc: imx: gpcv2: Assert reset before ungating clock arm64: dts: ls1028a-qds-65bb: don't use in-band autoneg for 2500base-x ...
2 parents 7e18e42 + 12f0923 commit 53e99dc

36 files changed

Lines changed: 202 additions & 123 deletions

‎MAINTAINERS‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17532,9 +17532,19 @@ M: Conor Dooley <conor.dooley@microchip.com>
1753217532
M: Daire McNamara <daire.mcnamara@microchip.com>
1753317533
L: linux-riscv@lists.infradead.org
1753417534
S: Supported
17535+
F: Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
17536+
F: Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
17537+
F: Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
17538+
F: Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
17539+
F: Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
17540+
F: Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
17541+
F: Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
17542+
F: Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
17543+
F: Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
1753517544
F: arch/riscv/boot/dts/microchip/
1753617545
F: drivers/char/hw_random/mpfs-rng.c
1753717546
F: drivers/clk/microchip/clk-mpfs.c
17547+
F: drivers/i2c/busses/i2c-microchip-core.c
1753817548
F: drivers/mailbox/mailbox-mpfs.c
1753917549
F: drivers/pci/controller/pcie-microchip-host.c
1754017550
F: drivers/rtc/rtc-mpfs.c

‎arch/arm/boot/dts/arm-realview-eb.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
compatible = "arm,pl022", "arm,primecell";
400400
reg = <0x1000d000 0x1000>;
401401
clocks = <&sspclk>, <&pclk>;
402-
clock-names = "SSPCLK", "apb_pclk";
402+
clock-names = "sspclk", "apb_pclk";
403403
};
404404

405405
wdog: watchdog@10010000 {

‎arch/arm/boot/dts/arm-realview-pb1176.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
interrupt-parent = <&intc_dc1176>;
411411
interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH>;
412412
clocks = <&sspclk>, <&pclk>;
413-
clock-names = "SSPCLK", "apb_pclk";
413+
clock-names = "sspclk", "apb_pclk";
414414
};
415415

416416
pb1176_serial0: serial@1010c000 {

‎arch/arm/boot/dts/arm-realview-pb11mp.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
interrupt-parent = <&intc_pb11mp>;
556556
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
557557
clocks = <&sspclk>, <&pclk>;
558-
clock-names = "SSPCLK", "apb_pclk";
558+
clock-names = "sspclk", "apb_pclk";
559559
};
560560

561561
watchdog@1000f000 {

‎arch/arm/boot/dts/arm-realview-pbx.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
compatible = "arm,pl022", "arm,primecell";
391391
reg = <0x1000d000 0x1000>;
392392
clocks = <&sspclk>, <&pclk>;
393-
clock-names = "SSPCLK", "apb_pclk";
393+
clock-names = "sspclk", "apb_pclk";
394394
};
395395

396396
wdog0: watchdog@1000f000 {

‎arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
regulators {
7777
vdd_3v3: VDD_IO {
7878
regulator-name = "VDD_IO";
79-
regulator-min-microvolt = <1200000>;
80-
regulator-max-microvolt = <3700000>;
79+
regulator-min-microvolt = <3300000>;
80+
regulator-max-microvolt = <3300000>;
8181
regulator-initial-mode = <2>;
8282
regulator-allowed-modes = <2>, <4>;
8383
regulator-always-on;
@@ -95,8 +95,8 @@
9595

9696
vddio_ddr: VDD_DDR {
9797
regulator-name = "VDD_DDR";
98-
regulator-min-microvolt = <600000>;
99-
regulator-max-microvolt = <1850000>;
98+
regulator-min-microvolt = <1200000>;
99+
regulator-max-microvolt = <1200000>;
100100
regulator-initial-mode = <2>;
101101
regulator-allowed-modes = <2>, <4>;
102102
regulator-always-on;
@@ -118,8 +118,8 @@
118118

119119
vdd_core: VDD_CORE {
120120
regulator-name = "VDD_CORE";
121-
regulator-min-microvolt = <600000>;
122-
regulator-max-microvolt = <1850000>;
121+
regulator-min-microvolt = <1250000>;
122+
regulator-max-microvolt = <1250000>;
123123
regulator-initial-mode = <2>;
124124
regulator-allowed-modes = <2>, <4>;
125125
regulator-always-on;
@@ -160,8 +160,8 @@
160160

161161
LDO1 {
162162
regulator-name = "LDO1";
163-
regulator-min-microvolt = <1200000>;
164-
regulator-max-microvolt = <3700000>;
163+
regulator-min-microvolt = <3300000>;
164+
regulator-max-microvolt = <3300000>;
165165
regulator-always-on;
166166

167167
regulator-state-standby {
@@ -175,9 +175,8 @@
175175

176176
LDO2 {
177177
regulator-name = "LDO2";
178-
regulator-min-microvolt = <1200000>;
179-
regulator-max-microvolt = <3700000>;
180-
regulator-always-on;
178+
regulator-min-microvolt = <1800000>;
179+
regulator-max-microvolt = <3300000>;
181180

182181
regulator-state-standby {
183182
regulator-on-in-suspend;

‎arch/arm/boot/dts/at91-sama5d2_icp.dts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
regulators {
197197
vdd_io_reg: VDD_IO {
198198
regulator-name = "VDD_IO";
199-
regulator-min-microvolt = <1200000>;
200-
regulator-max-microvolt = <3700000>;
199+
regulator-min-microvolt = <3300000>;
200+
regulator-max-microvolt = <3300000>;
201201
regulator-initial-mode = <2>;
202202
regulator-allowed-modes = <2>, <4>;
203203
regulator-always-on;
@@ -215,8 +215,8 @@
215215

216216
VDD_DDR {
217217
regulator-name = "VDD_DDR";
218-
regulator-min-microvolt = <600000>;
219-
regulator-max-microvolt = <1850000>;
218+
regulator-min-microvolt = <1350000>;
219+
regulator-max-microvolt = <1350000>;
220220
regulator-initial-mode = <2>;
221221
regulator-allowed-modes = <2>, <4>;
222222
regulator-always-on;
@@ -234,8 +234,8 @@
234234

235235
VDD_CORE {
236236
regulator-name = "VDD_CORE";
237-
regulator-min-microvolt = <600000>;
238-
regulator-max-microvolt = <1850000>;
237+
regulator-min-microvolt = <1250000>;
238+
regulator-max-microvolt = <1250000>;
239239
regulator-initial-mode = <2>;
240240
regulator-allowed-modes = <2>, <4>;
241241
regulator-always-on;
@@ -257,7 +257,6 @@
257257
regulator-max-microvolt = <1850000>;
258258
regulator-initial-mode = <2>;
259259
regulator-allowed-modes = <2>, <4>;
260-
regulator-always-on;
261260

262261
regulator-state-standby {
263262
regulator-on-in-suspend;
@@ -272,8 +271,8 @@
272271

273272
LDO1 {
274273
regulator-name = "LDO1";
275-
regulator-min-microvolt = <1200000>;
276-
regulator-max-microvolt = <3700000>;
274+
regulator-min-microvolt = <2500000>;
275+
regulator-max-microvolt = <2500000>;
277276
regulator-always-on;
278277

279278
regulator-state-standby {
@@ -287,8 +286,8 @@
287286

288287
LDO2 {
289288
regulator-name = "LDO2";
290-
regulator-min-microvolt = <1200000>;
291-
regulator-max-microvolt = <3700000>;
289+
regulator-min-microvolt = <3300000>;
290+
regulator-max-microvolt = <3300000>;
292291
regulator-always-on;
293292

294293
regulator-state-standby {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@
244244
regulators {
245245
vdd_3v3: VDD_IO {
246246
regulator-name = "VDD_IO";
247-
regulator-min-microvolt = <1200000>;
248-
regulator-max-microvolt = <3700000>;
247+
regulator-min-microvolt = <3300000>;
248+
regulator-max-microvolt = <3300000>;
249249
regulator-initial-mode = <2>;
250250
regulator-allowed-modes = <2>, <4>;
251251
regulator-always-on;
@@ -264,8 +264,8 @@
264264

265265
vddioddr: VDD_DDR {
266266
regulator-name = "VDD_DDR";
267-
regulator-min-microvolt = <1300000>;
268-
regulator-max-microvolt = <1450000>;
267+
regulator-min-microvolt = <1350000>;
268+
regulator-max-microvolt = <1350000>;
269269
regulator-initial-mode = <2>;
270270
regulator-allowed-modes = <2>, <4>;
271271
regulator-always-on;
@@ -285,8 +285,8 @@
285285

286286
vddcore: VDD_CORE {
287287
regulator-name = "VDD_CORE";
288-
regulator-min-microvolt = <1100000>;
289-
regulator-max-microvolt = <1850000>;
288+
regulator-min-microvolt = <1150000>;
289+
regulator-max-microvolt = <1150000>;
290290
regulator-initial-mode = <2>;
291291
regulator-allowed-modes = <2>, <4>;
292292
regulator-always-on;
@@ -306,7 +306,7 @@
306306
vddcpu: VDD_OTHER {
307307
regulator-name = "VDD_OTHER";
308308
regulator-min-microvolt = <1050000>;
309-
regulator-max-microvolt = <1850000>;
309+
regulator-max-microvolt = <1250000>;
310310
regulator-initial-mode = <2>;
311311
regulator-allowed-modes = <2>, <4>;
312312
regulator-ramp-delay = <3125>;
@@ -326,8 +326,8 @@
326326

327327
vldo1: LDO1 {
328328
regulator-name = "LDO1";
329-
regulator-min-microvolt = <1200000>;
330-
regulator-max-microvolt = <3700000>;
329+
regulator-min-microvolt = <1800000>;
330+
regulator-max-microvolt = <1800000>;
331331
regulator-always-on;
332332

333333
regulator-state-standby {

‎arch/arm/boot/dts/bcm63178.dtsi‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,26 @@
3232
next-level-cache = <&L2_0>;
3333
enable-method = "psci";
3434
};
35+
3536
CA7_2: cpu@2 {
3637
device_type = "cpu";
3738
compatible = "arm,cortex-a7";
3839
reg = <0x2>;
3940
next-level-cache = <&L2_0>;
4041
enable-method = "psci";
4142
};
43+
4244
L2_0: l2-cache0 {
4345
compatible = "cache";
4446
};
4547
};
4648

4749
timer {
4850
compatible = "arm,armv7-timer";
49-
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
50-
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
51-
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
52-
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
51+
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
52+
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
53+
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
54+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>;
5355
arm,cpu-registers-not-fw-configured;
5456
};
5557

@@ -80,23 +82,23 @@
8082
psci {
8183
compatible = "arm,psci-0.2";
8284
method = "smc";
83-
cpu_off = <1>;
84-
cpu_on = <2>;
8585
};
8686

8787
axi@81000000 {
8888
compatible = "simple-bus";
8989
#address-cells = <1>;
9090
#size-cells = <1>;
91-
ranges = <0 0x81000000 0x4000>;
91+
ranges = <0 0x81000000 0x8000>;
9292

9393
gic: interrupt-controller@1000 {
9494
compatible = "arm,cortex-a7-gic";
9595
#interrupt-cells = <3>;
96-
#address-cells = <0>;
9796
interrupt-controller;
97+
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_HIGH)>;
9898
reg = <0x1000 0x1000>,
99-
<0x2000 0x2000>;
99+
<0x2000 0x2000>,
100+
<0x4000 0x2000>,
101+
<0x6000 0x2000>;
100102
};
101103
};
102104

‎arch/arm/boot/dts/bcm6846.dtsi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040

4141
timer {
4242
compatible = "arm,armv7-timer";
43-
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
44-
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
45-
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
46-
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
43+
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
44+
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
45+
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
46+
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
4747
arm,cpu-registers-not-fw-configured;
4848
};
4949

@@ -65,23 +65,23 @@
6565
psci {
6666
compatible = "arm,psci-0.2";
6767
method = "smc";
68-
cpu_off = <1>;
69-
cpu_on = <2>;
7068
};
7169

7270
axi@81000000 {
7371
compatible = "simple-bus";
7472
#address-cells = <1>;
7573
#size-cells = <1>;
76-
ranges = <0 0x81000000 0x4000>;
74+
ranges = <0 0x81000000 0x8000>;
7775

7876
gic: interrupt-controller@1000 {
7977
compatible = "arm,cortex-a7-gic";
8078
#interrupt-cells = <3>;
81-
#address-cells = <0>;
8279
interrupt-controller;
80+
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
8381
reg = <0x1000 0x1000>,
84-
<0x2000 0x2000>;
82+
<0x2000 0x2000>,
83+
<0x4000 0x2000>,
84+
<0x6000 0x2000>;
8585
};
8686
};
8787

0 commit comments

Comments
 (0)