Skip to content

Commit a6adef8

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Most of the changes are devicetree fixes for NXP, Mediatek, Rockchips Arm machines as well as Microchip RISC-V, and most of these address build-time warnings for spec violations and other minor issues. One of the Mediatek warnings was enabled by default and prevented a clean build. The ones that address serious runtime issues are all on the i.MX platform: - a boot time panic on imx8qm - USB hanging under load on imx8 - regressions on the imx93 ethernet phy Code fixes include a minor error handling for the i.MX PMU driver, and a number of firmware driver fixes: - OP-TEE fix for supplicant based device enumeration, and a new sysfs attribute to needed to fix a race against userspace - Arm SCMI fix for possible truncation/overflow in the frequency computations - Multiple FF-A fixes for the newly added notification support" * tag 'soc-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (55 commits) MAINTAINERS: change the S32G2 maintainer's email address. arm64: dts: rockchip: Fix eMMC Data Strobe PD on rk3588 ARM: dts: imx28-xea: Pass the 'model' property ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt MAINTAINERS: reinstate freescale ARM64 DT directory in i.MX entry arm64: dts: imx8-apalis: set wifi regulator to always-on ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init arm64: dts: imx8ulp: update gpio node name to align with register address arm64: dts: imx93: update gpio node name to align with register address arm64: dts: imx93: correct mediamix power arm64: dts: imx8qm: Add imx8qm's own pm to avoid panic during startup arm64: dts: freescale: imx8-ss-dma: Fix #pwm-cells arm64: dts: freescale: imx8-ss-lsio: Fix #pwm-cells dt-bindings: pwm: imx-pwm: Unify #pwm-cells for all compatibles ARM: dts: imx6ul-pico: Describe the Ethernet PHY clock arm64: dts: imx8mp: imx8mq: Add parkmode-disable-ss-quirk on DWC3 arm64: dts: rockchip: Fix PCI node addresses on rk3399-gru arm64: dts: rockchip: drop interrupt-names property from rk3588s dfi firmware: arm_scmi: Fix possible frequency truncation when using level indexing mode firmware: arm_scmi: Fix frequency truncation by promoting multiplier type ...
2 parents 17894c2 + fd1e574 commit a6adef8

55 files changed

Lines changed: 396 additions & 328 deletions

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-bus-optee-devices‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ Description:
66
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
77
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
88
are free to create needed API under optee-ta-<uuid> directory.
9+
10+
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
11+
Date: November 2023
12+
KernelVersion: 6.7
13+
Contact: op-tee@lists.trustedfirmware.org
14+
Description:
15+
Allows to distinguish whether an OP-TEE based TA/device requires user-space
16+
tee-supplicant to function properly or not. This attribute will be present for
17+
devices which depend on tee-supplicant to be running.

‎Documentation/devicetree/bindings/pwm/imx-pwm.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ allOf:
1414

1515
properties:
1616
"#pwm-cells":
17-
description: |
18-
Should be 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.yaml
19-
in this directory for a description of the cells format.
20-
enum:
21-
- 2
22-
- 3
17+
description:
18+
The only third cell flag supported by this binding is
19+
PWM_POLARITY_INVERTED. fsl,imx1-pwm does not support this flags.
20+
const: 3
2321

2422
compatible:
2523
oneOf:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ allOf:
233233
- rockchip,rk3399-grf
234234
- rockchip,rk3399-pmugrf
235235
- rockchip,rk3568-pmugrf
236+
- rockchip,rk3588-pmugrf
236237
- rockchip,rv1108-grf
237238
- rockchip,rv1108-pmugrf
238239

‎MAINTAINERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2143,6 +2143,7 @@ S: Maintained
21432143
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
21442144
F: arch/arm/boot/dts/nxp/imx/
21452145
F: arch/arm/boot/dts/nxp/mxs/
2146+
F: arch/arm64/boot/dts/freescale/
21462147
X: arch/arm64/boot/dts/freescale/fsl-*
21472148
X: arch/arm64/boot/dts/freescale/qoriq-*
21482149
X: drivers/media/i2c/
@@ -2523,7 +2524,7 @@ F: drivers/*/*/*wpcm*
25232524
F: drivers/*/*wpcm*
25242525

25252526
ARM/NXP S32G ARCHITECTURE
2526-
M: Chester Lin <clin@suse.com>
2527+
M: Chester Lin <chester62515@gmail.com>
25272528
R: Andreas Färber <afaerber@suse.de>
25282529
R: Matthias Brugger <mbrugger@suse.com>
25292530
R: NXP S32 Linux Team <s32@nxp.com>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
3737
};
3838

39-
&leds {
40-
/delete-node/ led_act;
41-
};
39+
/delete-node/ &led_act;
4240

4341
&pm {
4442
/delete-property/ system-power-controller;

‎arch/arm/boot/dts/nxp/imx/imx6q-skov-reve-mi1010ait-1cp1.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737

3838
&clks {
3939
assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
40-
<&clks IMX6QDL_CLK_LDB_DI1_SEL>;
40+
<&clks IMX6QDL_CLK_LDB_DI1_SEL>, <&clks IMX6QDL_CLK_ENET_REF_SEL>;
4141
assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>,
42-
<&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>;
42+
<&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, <&clk50m_phy>;
4343
};
4444

4545
&hdmi {

‎arch/arm/boot/dts/nxp/imx/imx6ul-pico.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
max-speed = <100>;
122122
interrupt-parent = <&gpio5>;
123123
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
124+
clocks = <&clks IMX6UL_CLK_ENET_REF>;
125+
clock-names = "rmii-ref";
124126
};
125127
};
126128
};

‎arch/arm/boot/dts/nxp/imx/imx7s.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
};
455455

456456
gpt1: timer@302d0000 {
457-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
457+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
458458
reg = <0x302d0000 0x10000>;
459459
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
460460
clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
@@ -463,7 +463,7 @@
463463
};
464464

465465
gpt2: timer@302e0000 {
466-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
466+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
467467
reg = <0x302e0000 0x10000>;
468468
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
469469
clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
@@ -473,7 +473,7 @@
473473
};
474474

475475
gpt3: timer@302f0000 {
476-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
476+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
477477
reg = <0x302f0000 0x10000>;
478478
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
479479
clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
@@ -483,7 +483,7 @@
483483
};
484484

485485
gpt4: timer@30300000 {
486-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
486+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
487487
reg = <0x30300000 0x10000>;
488488
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
489489
clocks = <&clks IMX7D_GPT4_ROOT_CLK>,

‎arch/arm/boot/dts/nxp/mxs/imx28-xea.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "imx28-lwe.dtsi"
99

1010
/ {
11+
model = "Liebherr XEA board";
1112
compatible = "lwn,imx28-xea", "fsl,imx28";
1213
};
1314

‎arch/arm/boot/dts/rockchip/rk3128.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@
848848
};
849849

850850
sdmmc_pwren: sdmmc-pwren {
851-
rockchip,pins = <1 RK_PB6 1 &pcfg_pull_default>;
851+
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_default>;
852852
};
853853

854854
sdmmc_bus4: sdmmc-bus4 {

0 commit comments

Comments
 (0)