Skip to content

Commit 7fa0d77

Browse files
committed
Merge tag 'soc-fixes-6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "A few last minute fixes came in this week: - interrupt and gpio numbers in foud separate i.MX8 specific devicetree files were wrong - The vector length property in the C906 CPU description used the wrong unit - Two bugs with uninitialized stack variables in the tee subsystem - Alexander Stein now maintains additional devicetree files" * tag 'soc-fixes-6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: riscv: dts: allwinner: d1: fix vlenb property MAINTAINERS: Add entry for TQ-Systems AM335 device trees tee: qcomtee: initialize result before use in release worker arm64: dts: imx8qm-mek: fix mux-controller select/enable-gpios polarity tee: qcomtee: fix uninitialized pointers with free attribute ARM: dts: nxp: imx6ul: correct SAI3 interrupt line arm64: dts: imx8dxl-ss-conn: swap interrupts number of eqos arm64: dts: imx8dxl: Correct pcie-ep interrupt number
2 parents 6cf62f0 + 3ecfcf3 commit 7fa0d77

8 files changed

Lines changed: 15 additions & 8 deletions

File tree

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26056,6 +26056,8 @@ S: Supported
2605626056
W: https://www.tq-group.com/en/products/tq-embedded/
2605726057
F: arch/arm/boot/dts/nxp/imx/*mba*.dts*
2605826058
F: arch/arm/boot/dts/nxp/imx/*tqma*.dts*
26059+
F: arch/arm/boot/dts/ti/omap/*mba*.dts*
26060+
F: arch/arm/boot/dts/ti/omap/*tqma*.dts*
2605926061
F: arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
2606026062
F: arch/arm64/boot/dts/freescale/imx*mba*.dts*
2606126063
F: arch/arm64/boot/dts/freescale/imx*tqma*.dts*

arch/arm/boot/dts/nxp/imx/imx6ul.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
#sound-dai-cells = <0>;
340340
compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai";
341341
reg = <0x02030000 0x4000>;
342-
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
342+
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
343343
clocks = <&clks IMX6UL_CLK_SAI3_IPG>,
344344
<&clks IMX6UL_CLK_SAI3>,
345345
<&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;

arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
compatible = "nxp,imx8dxl-dwmac-eqos", "snps,dwmac-5.10a";
3030
reg = <0x5b050000 0x10000>;
3131
interrupt-parent = <&gic>;
32-
interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
33-
<GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
32+
interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
33+
<GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
3434
interrupt-names = "macirq", "eth_wake_irq";
3535
clocks = <&eqos_lpcg IMX_LPCG_CLK_4>,
3636
<&eqos_lpcg IMX_LPCG_CLK_6>,

arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@
5454
interrupt-names = "dma";
5555
};
5656
};
57+
58+
&pcieb_ep {
59+
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
60+
interrupt-names = "dma";
61+
};

arch/arm64/boot/dts/freescale/imx8qm-mek.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
compatible = "nxp,cbdtu02043", "gpio-sbu-mux";
218218
pinctrl-names = "default";
219219
pinctrl-0 = <&pinctrl_typec_mux>;
220-
select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_LOW>;
221-
enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>;
220+
select-gpios = <&lsio_gpio4 6 GPIO_ACTIVE_HIGH>;
221+
enable-gpios = <&lsio_gpio4 19 GPIO_ACTIVE_LOW>;
222222
orientation-switch;
223223

224224
port {

arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
riscv,isa-base = "rv64i";
2929
riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr",
3030
"zifencei", "zihpm", "xtheadvector";
31-
thead,vlenb = <128>;
31+
thead,vlenb = <16>;
3232
#cooling-cells = <2>;
3333

3434
cpu0_intc: interrupt-controller {

drivers/tee/qcomtee/call.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static void qcomtee_get_version(struct tee_device *teedev,
645645
static void qcomtee_get_qtee_feature_list(struct tee_context *ctx, u32 id,
646646
u32 *version)
647647
{
648-
struct qcomtee_object_invoke_ctx *oic __free(kfree);
648+
struct qcomtee_object_invoke_ctx *oic __free(kfree) = NULL;
649649
struct qcomtee_object *client_env, *service;
650650
struct qcomtee_arg u[3] = { 0 };
651651
int result;

drivers/tee/qcomtee/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void qcomtee_do_release_qtee_object(struct work_struct *work)
8282
{
8383
struct qcomtee_object *object;
8484
struct qcomtee *qcomtee;
85-
int ret, result;
85+
int ret, result = 0;
8686

8787
/* RELEASE does not require any argument. */
8888
struct qcomtee_arg args[] = { { .type = QCOMTEE_ARG_TYPE_INV } };

0 commit comments

Comments
 (0)