Skip to content

Commit fc444ad

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "The majority of these last fixes are for devicetree files. These address two important regressions for the Qualcomm SMMU and the Raspberry Pi 4 USB controller, as well as a larger number of patches fixing minor mistakes in board specific files for Rockchips, i.MX, starfive and broadcom. The non-DT changes are - A fix for an old boot regression on Renesas shmobile chips - Another boot time regression for for the Qualcomm PDR SoC driver, among a few other Qualcomm firmware driver fixes for efivars and tzmem - Minor Kconfig fixes for davinci and OMAP1 - Minor code fixes for sparx5 reset controllers, OMAP memory controller, i.MX SCU, cpufreq and SoC drivers and a Hisilicon SoC driver - One more update to the Asahi maintainers, adding Neal Gompa as a reviewer" * tag 'soc-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (35 commits) ARM: davinci: da850: fix selecting ARCH_DAVINCI_DA8XX soc: hisilicon: kunpeng_hccs: Fix incorrect string assembly memory: omap-gpmc: drop no compatible check reset: mchp: sparx5: Fix for lan966x ARM: shmobile: smp: Enforce shmobile_smp_* alignment MAINTAINERS: Add myself (Neal Gompa) as a reviewer for ARM Apple support MAINTAINERS: Add apple-spi driver & binding files arm64: dts: rockchip: slow down emmc freq for rock 5 itx ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC3200 ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC5300 ARM: dts: bcm2711: Don't mark timer regs unconfigured ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi arm64: dts: rockchip: Add avdd HDMI supplies to RockPro64 board dtsi arm64: dts: rockchip: Remove undocumented sdmmc property from lubancat-1 arm64: dts: rockchip: fix pinmux of UART5 for PX30 Ringneck on Haikou arm64: dts: rockchip: fix pinmux of UART0 for PX30 Ringneck on Haikou arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S arm64: dts: bcm2712: PL011 UARTs are actually r1p5 ARM: dts: bcm2711: PL011 UARTs are actually r1p5 ...
2 parents 47c7efa + 45d5fe1 commit fc444ad

31 files changed

+119
-99
lines changed

‎MAINTAINERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,6 +2213,7 @@ ARM/APPLE MACHINE SUPPORT
22132213
M: Sven Peter <sven@svenpeter.dev>
22142214
M: Janne Grunau <j@jannau.net>
22152215
R: Alyssa Rosenzweig <alyssa@rosenzweig.io>
2216+
R: Neal Gompa <neal@gompa.dev>
22162217
L: asahi@lists.linux.dev
22172218
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22182219
S: Maintained
@@ -2237,6 +2238,7 @@ F: Documentation/devicetree/bindings/pci/apple,pcie.yaml
22372238
F: Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
22382239
F: Documentation/devicetree/bindings/power/apple*
22392240
F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
2241+
F: Documentation/devicetree/bindings/spi/apple,spi.yaml
22402242
F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
22412243
F: arch/arm64/boot/dts/apple/
22422244
F: drivers/bluetooth/hci_bcm4377.c
@@ -2254,6 +2256,7 @@ F: drivers/nvmem/apple-efuses.c
22542256
F: drivers/pinctrl/pinctrl-apple-gpio.c
22552257
F: drivers/pwm/pwm-apple.c
22562258
F: drivers/soc/apple/*
2259+
F: drivers/spi/spi-apple.c
22572260
F: drivers/watchdog/apple_wdt.c
22582261
F: include/dt-bindings/interrupt-controller/apple-aic.h
22592262
F: include/dt-bindings/pinctrl/apple.h

‎arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include "bcm2835-rpi.dtsi"
33

4-
#include <dt-bindings/power/raspberrypi-power.h>
54
#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
65

76
/ {
@@ -101,7 +100,3 @@
101100
&vchiq {
102101
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
103102
};
104-
105-
&xhci {
106-
power-domains = <&power RPI_POWER_DOMAIN_USB>;
107-
};

‎arch/arm/boot/dts/broadcom/bcm2711.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
clocks = <&clocks BCM2835_CLOCK_UART>,
135135
<&clocks BCM2835_CLOCK_VPU>;
136136
clock-names = "uartclk", "apb_pclk";
137-
arm,primecell-periphid = <0x00241011>;
137+
arm,primecell-periphid = <0x00341011>;
138138
status = "disabled";
139139
};
140140

@@ -145,7 +145,7 @@
145145
clocks = <&clocks BCM2835_CLOCK_UART>,
146146
<&clocks BCM2835_CLOCK_VPU>;
147147
clock-names = "uartclk", "apb_pclk";
148-
arm,primecell-periphid = <0x00241011>;
148+
arm,primecell-periphid = <0x00341011>;
149149
status = "disabled";
150150
};
151151

@@ -156,7 +156,7 @@
156156
clocks = <&clocks BCM2835_CLOCK_UART>,
157157
<&clocks BCM2835_CLOCK_VPU>;
158158
clock-names = "uartclk", "apb_pclk";
159-
arm,primecell-periphid = <0x00241011>;
159+
arm,primecell-periphid = <0x00341011>;
160160
status = "disabled";
161161
};
162162

@@ -167,7 +167,7 @@
167167
clocks = <&clocks BCM2835_CLOCK_UART>,
168168
<&clocks BCM2835_CLOCK_VPU>;
169169
clock-names = "uartclk", "apb_pclk";
170-
arm,primecell-periphid = <0x00241011>;
170+
arm,primecell-periphid = <0x00341011>;
171171
status = "disabled";
172172
};
173173

@@ -451,8 +451,6 @@
451451
IRQ_TYPE_LEVEL_LOW)>,
452452
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
453453
IRQ_TYPE_LEVEL_LOW)>;
454-
/* This only applies to the ARMv7 stub */
455-
arm,cpu-registers-not-fw-configured;
456454
};
457455

458456
cpus: cpus {
@@ -610,6 +608,7 @@
610608
#address-cells = <1>;
611609
#size-cells = <0>;
612610
interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
611+
power-domains = <&pm BCM2835_POWER_DOMAIN_USB>;
613612
/* DWC2 and this IP block share the same USB PHY,
614613
* enabling both at the same time results in lockups.
615614
* So keep this node disabled and let the bootloader
@@ -1177,6 +1176,7 @@
11771176
};
11781177

11791178
&uart0 {
1179+
arm,primecell-periphid = <0x00341011>;
11801180
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
11811181
};
11821182

‎arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,19 @@
124124
};
125125

126126
port@1 {
127-
label = "lan1";
127+
label = "lan4";
128128
};
129129

130130
port@2 {
131-
label = "lan2";
131+
label = "lan3";
132132
};
133133

134134
port@3 {
135-
label = "lan3";
135+
label = "lan2";
136136
};
137137

138138
port@4 {
139-
label = "lan4";
139+
label = "lan1";
140140
};
141141
};
142142
};

‎arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@
126126

127127
ports {
128128
port@0 {
129-
label = "lan4";
129+
label = "wan";
130130
};
131131

132132
port@1 {
133-
label = "lan3";
133+
label = "lan1";
134134
};
135135

136136
port@2 {
137137
label = "lan2";
138138
};
139139

140140
port@3 {
141-
label = "lan1";
141+
label = "lan3";
142142
};
143143

144144
port@4 {
145-
label = "wan";
145+
label = "lan4";
146146
};
147147
};
148148
};

‎arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@
108108
};
109109
};
110110

111+
poweroff {
112+
compatible = "regulator-poweroff";
113+
cpu-supply = <&vgen2_reg>;
114+
};
115+
111116
reg_module_3v3: regulator-module-3v3 {
112117
compatible = "regulator-fixed";
113118
regulator-always-on;
@@ -236,10 +241,6 @@
236241
status = "disabled";
237242
};
238243

239-
&clks {
240-
fsl,pmic-stby-poweroff;
241-
};
242-
243244
/* Apalis SPI1 */
244245
&ecspi1 {
245246
cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -527,7 +528,6 @@
527528

528529
pmic: pmic@8 {
529530
compatible = "fsl,pfuze100";
530-
fsl,pmic-stby-poweroff;
531531
reg = <0x08>;
532532

533533
regulators {

‎arch/arm/mach-davinci/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ config ARCH_DAVINCI_DA830
2727

2828
config ARCH_DAVINCI_DA850
2929
bool "DA850/OMAP-L138/AM18x based system"
30+
select ARCH_DAVINCI_DA8XX
3031
select DAVINCI_CP_INTC
3132

3233
config ARCH_DAVINCI_DA8XX

‎arch/arm/mach-omap1/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ menuconfig ARCH_OMAP1
88
select ARCH_OMAP
99
select CLKSRC_MMIO
1010
select FORCE_PCI if PCCARD
11+
select GENERIC_IRQ_CHIP
1112
select GPIOLIB
1213
help
1314
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

‎arch/arm/mach-shmobile/headsmp.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ ENDPROC(shmobile_smp_sleep)
136136
.long shmobile_smp_arg - 1b
137137

138138
.bss
139+
.align 2
139140
.globl shmobile_smp_mpidr
140141
shmobile_smp_mpidr:
141142
.space NR_CPUS * 4

‎arch/arm64/boot/dts/broadcom/bcm2712.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
228228
clocks = <&clk_uart>, <&clk_vpu>;
229229
clock-names = "uartclk", "apb_pclk";
230-
arm,primecell-periphid = <0x00241011>;
230+
arm,primecell-periphid = <0x00341011>;
231231
status = "disabled";
232232
};
233233

0 commit comments

Comments
 (0)