tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7fa0d774 6cf62f01

+15 -8
+2
MAINTAINERS
··· 26056 26056 W: https://www.tq-group.com/en/products/tq-embedded/ 26057 26057 F: arch/arm/boot/dts/nxp/imx/*mba*.dts* 26058 26058 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* 26059 26061 F: arch/arm64/boot/dts/freescale/fsl-*tqml*.dts* 26060 26062 F: arch/arm64/boot/dts/freescale/imx*mba*.dts* 26061 26063 F: arch/arm64/boot/dts/freescale/imx*tqma*.dts*
+1 -1
arch/arm/boot/dts/nxp/imx/imx6ul.dtsi
··· 339 339 #sound-dai-cells = <0>; 340 340 compatible = "fsl,imx6ul-sai", "fsl,imx6sx-sai"; 341 341 reg = <0x02030000 0x4000>; 342 - interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; 342 + interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; 343 343 clocks = <&clks IMX6UL_CLK_SAI3_IPG>, 344 344 <&clks IMX6UL_CLK_SAI3>, 345 345 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
+2 -2
arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi
··· 29 29 compatible = "nxp,imx8dxl-dwmac-eqos", "snps,dwmac-5.10a"; 30 30 reg = <0x5b050000 0x10000>; 31 31 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>; 34 34 interrupt-names = "macirq", "eth_wake_irq"; 35 35 clocks = <&eqos_lpcg IMX_LPCG_CLK_4>, 36 36 <&eqos_lpcg IMX_LPCG_CLK_6>,
+5
arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
··· 54 54 interrupt-names = "dma"; 55 55 }; 56 56 }; 57 + 58 + &pcieb_ep { 59 + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; 60 + interrupt-names = "dma"; 61 + };
+2 -2
arch/arm64/boot/dts/freescale/imx8qm-mek.dts
··· 217 217 compatible = "nxp,cbdtu02043", "gpio-sbu-mux"; 218 218 pinctrl-names = "default"; 219 219 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>; 222 222 orientation-switch; 223 223 224 224 port {
+1 -1
arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
··· 28 28 riscv,isa-base = "rv64i"; 29 29 riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "zicntr", "zicsr", 30 30 "zifencei", "zihpm", "xtheadvector"; 31 - thead,vlenb = <128>; 31 + thead,vlenb = <16>; 32 32 #cooling-cells = <2>; 33 33 34 34 cpu0_intc: interrupt-controller {
+1 -1
drivers/tee/qcomtee/call.c
··· 645 645 static void qcomtee_get_qtee_feature_list(struct tee_context *ctx, u32 id, 646 646 u32 *version) 647 647 { 648 - struct qcomtee_object_invoke_ctx *oic __free(kfree); 648 + struct qcomtee_object_invoke_ctx *oic __free(kfree) = NULL; 649 649 struct qcomtee_object *client_env, *service; 650 650 struct qcomtee_arg u[3] = { 0 }; 651 651 int result;
+1 -1
drivers/tee/qcomtee/core.c
··· 82 82 { 83 83 struct qcomtee_object *object; 84 84 struct qcomtee *qcomtee; 85 - int ret, result; 85 + int ret, result = 0; 86 86 87 87 /* RELEASE does not require any argument. */ 88 88 struct qcomtee_arg args[] = { { .type = QCOMTEE_ARG_TYPE_INV } };