Skip to content

Commit cbfb477

Browse files
khusikakhusika
committed
Merge tag 'v6.1.117' into orange-pi-6.1-rk35xx
This is the 6.1.117 stable release * tag 'v6.1.117' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.117 media: amphion: Fix VPU core alias name vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans hv_sock: Initializing vsk->trans to NULL to prevent a dangling pointer net: sched: use RCU read-side critical section in taprio_dump() ASoC: amd: yc: fix internal mic on Xiaomi Book Pro 14 2022 ucounts: fix counter leak in inc_rlimit_get_ucounts() ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove() irqchip/gic-v3: Force propagation of the active state with a read-back USB: serial: option: add Quectel RG650V USB: serial: option: add Fibocom FG132 0x0112 composition USB: serial: qcserial: add support for Sierra Wireless EM86xx USB: serial: io_edgeport: fix use after free in debug printk usb: typec: fix potential out of bounds in ucsi_ccg_update_set_new_cam_cmd() usb: dwc3: fix fault at system suspend if device was already runtime suspended usb: musb: sunxi: Fix accessing an released usb phy signal: restore the override_rlimit logic fs/proc: fix compile warning about variable 'vmcore_mmap_ops' filemap: Fix bounds checking in filemap_read() media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format kselftest/arm64: Initialise current at build time in signal tests net: do not delay dst_entries_add() in dst_release() Revert "wifi: mac80211: fix RCU list iterations" bnxt_re: avoid shift undefined behavior in bnxt_qplib_alloc_init_hwq riscv/purgatory: align riscv_kernel_entry btrfs: reinitialize delayed ref list after deleting it from the list arm64: Kconfig: Make SME depend on BROKEN for now mptcp: use sock_kfree_s instead of kfree net: vertexcom: mse102x: Fix possible double free of TX skb net: wwan: t7xx: Fix off-by-one error in t7xx_dpmaif_rx_buf_alloc() nfs: Fix KMSAN warning in decode_getfattr_attrs() posix-cpu-timers: Clear TICK_DEP_BIT_POSIX_TIMER on clone ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3 ALSA: usb-audio: Add quirk for HP 320 FHD Webcam dm-unstriped: cast an operand to sector_t to prevent potential uint32_t overflow dm cache: fix potential out-of-bounds access on the first resume dm cache: optimize dirty bit checking with find_next_bit when resizing dm cache: fix out-of-bounds access to the dirty bitset when resizing dm cache: fix flushing uninitialized delayed_work on cache_ctr error dm cache: correct the number of origin blocks to match the target length thermal/drivers/qcom/lmh: Remove false lockdep backtrace drm/amdgpu: prevent NULL pointer dereference if ATIF is not supported drm/amdgpu: add missing size check in amdgpu_debugfs_gprwave_read() drm/amdgpu: Adjust debugfs eviction and IB access permissions pwm: imx-tpm: Use correct MODULO value for EPWM mode ksmbd: fix slab-use-after-free in smb3_preauth_hash_rsp ksmbd: Fix the missing xa_store error check ksmbd: fix slab-use-after-free in ksmbd_smb2_session_create can: mcp251xfd: mcp251xfd_ring_alloc(): fix coalescing configuration when switching CAN modes can: mcp251xfd: mcp251xfd_get_tef_len(): fix length calculation media: v4l2-ctrls-api: fix error handling for v4l2_g_ctrl() media: v4l2-tpg: prevent the risk of a division by zero media: pulse8-cec: fix data timestamp at pulse8_setup() media: cx24116: prevent overflows on SNR calculus media: s5p-jpeg: prevent buffer overflows media: ar0521: don't overflow when checking PLL values ASoC: stm32: spdifrx: fix dma channel release in stm32_spdifrx_remove thermal/of: support thermal zones w/o trips subnode tools/lib/thermal: Fix sampling handler context ptr ALSA: firewire-lib: fix return value on fail in amdtp_tscm_init() scsi: sd_zbc: Use kvzalloc() to allocate REPORT ZONES buffer media: adv7604: prevent underflow condition when reporting colorspace media: dvb_frontend: don't play tricks with underflow values media: dvbdev: prevent the risk of out of memory access media: stb0899_algo: initialize cfr before using it Revert "ALSA: hda/conexant: Mute speakers at suspend / shutdown" net: arc: rockchip: fix emac mdio node support net: arc: fix the device for dma_map_single/dma_unmap_single virtio_net: Add hash_key_length check net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case net: phy: ti: add PHY_RST_AFTER_CLK_EN flag net: hns3: fix kernel crash when uninstalling driver i40e: fix race condition by adding filter's intermediate sync state ice: change q_index variable type to s16 to store -1 value can: c_can: fix {rx,tx}_errors statistics sctp: properly validate chunk size in sctp_sf_ootb() net: enetc: set MAC address to the VF net_device security/keys: fix slab-out-of-bounds in key_task_permission nfs: avoid i_lock contention in nfs_clear_invalid_mapping NFSv3: handle out-of-order write replies. NFSv3: only use NFS timeout for MOUNT when protocols are compatible sunrpc: handle -ENOTCONN in xs_tcp_setup_socket() platform/x86/amd/pmc: Detect when STB is not available HID: core: zero-initialize the report buffer ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin ARM: dts: rockchip: Fix the spi controller on rk3036 ARM: dts: rockchip: drop grf reference from rk3036 hdmi ARM: dts: rockchip: fix rk3036 acodec node arm64: dts: imx8mp: correct sdhc ipg clk arm64: dts: imx8-ss-vpu: Fix imx8qm VPU IRQs arm64: dts: imx8qxp: Add VPU subsystem file arm64: dts: imx8qm: Fix VPU core alias name arm64: dts: rockchip: Fix LED triggers on rk3308-roc-cc arm64: dts: rockchip: Remove #cooling-cells from fan on Theobroma lion arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards arm64: dts: rockchip: Fix wakeup prop names on PineNote BT node arm64: dts: rockchip: Remove hdmi's 2nd interrupt on rk3328 arm64: dts: rockchip: Fix rt5651 compatible value on rk3399-sapphire-excavator arm64: dts: rockchip: Fix rt5651 compatible value on rk3399-eaidk-610 Signed-off-by: Khusika Dhamar Gusti <[email protected]> Conflicts: arch/arm/boot/dts/rk3036.dtsi drivers/net/ethernet/arc/emac_main.c
2 parents d3f1bec + 59d7b1a commit cbfb477

File tree

96 files changed

+566
-225
lines changed

Some content is hidden

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

96 files changed

+566
-225
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 116
4+
SUBLEVEL = 117
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/arm/boot/dts/rk3036-kylin.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
&i2c2 {
368368
status = "okay";
369369

370-
rt5616: rt5616@1b {
371-
compatible = "rt5616";
370+
rt5616: audio-codec@1b {
371+
compatible = "realtek,rt5616";
372372
reg = <0x1b>;
373373
clocks = <&cru SCLK_I2S_OUT>;
374374
clock-names = "mclk";

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -619,12 +619,13 @@
619619
};
620620
};
621621

622-
acodec: acodec-ana@20030000 {
622+
acodec: audio-codec@20030000 {
623623
compatible = "rockchip,rk3036-codec";
624624
reg = <0x20030000 0x4000>;
625-
rockchip,grf = <&grf>;
626625
clock-names = "acodec_pclk";
627626
clocks = <&cru PCLK_ACODEC>;
627+
rockchip,grf = <&grf>;
628+
#sound-dai-cells = <0>;
628629
status = "disabled";
629630
};
630631

@@ -634,7 +635,6 @@
634635
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
635636
clocks = <&cru ACLK_VIO>, <&cru PCLK_HDMI>;
636637
clock-names = "aclk", "pclk";
637-
rockchip,grf = <&grf>;
638638
pinctrl-names = "default";
639639
pinctrl-0 = <&hdmi_ctl>;
640640
#address-cells = <1>;
@@ -802,11 +802,11 @@
802802
};
803803

804804
spi: spi@20074000 {
805-
compatible = "rockchip,rockchip-spi";
805+
compatible = "rockchip,rk3036-spi";
806806
reg = <0x20074000 0x1000>;
807807
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
808-
clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
809-
clock-names = "apb-pclk","spi_pclk";
808+
clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
809+
clock-names = "spiclk", "apb_pclk";
810810
dmas = <&pdma 8>, <&pdma 9>;
811811
dma-names = "tx", "rx";
812812
pinctrl-names = "default";

‎arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,6 +2113,7 @@ config ARM64_SME
21132113
bool "ARM Scalable Matrix Extension support"
21142114
default y
21152115
depends on ARM64_SVE
2116+
depends on BROKEN
21162117
help
21172118
The Scalable Matrix Extension (SME) is an extension to the AArch64
21182119
execution state which utilises a substantial subset of the SVE

‎arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vpu: vpu@2c000000 {
1515
mu_m0: mailbox@2d000000 {
1616
compatible = "fsl,imx6sx-mu";
1717
reg = <0x2d000000 0x20000>;
18-
interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
18+
interrupts = <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>;
1919
#mbox-cells = <2>;
2020
power-domains = <&pd IMX_SC_R_VPU_MU_0>;
2121
status = "disabled";
@@ -24,7 +24,7 @@ vpu: vpu@2c000000 {
2424
mu1_m0: mailbox@2d020000 {
2525
compatible = "fsl,imx6sx-mu";
2626
reg = <0x2d020000 0x20000>;
27-
interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;
27+
interrupts = <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>;
2828
#mbox-cells = <2>;
2929
power-domains = <&pd IMX_SC_R_VPU_MU_1>;
3030
status = "disabled";

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@
934934
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
935935
reg = <0x30b40000 0x10000>;
936936
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
937-
clocks = <&clk IMX8MP_CLK_DUMMY>,
937+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
938938
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
939939
<&clk IMX8MP_CLK_USDHC1_ROOT>;
940940
clock-names = "ipg", "ahb", "per";
@@ -948,7 +948,7 @@
948948
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
949949
reg = <0x30b50000 0x10000>;
950950
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
951-
clocks = <&clk IMX8MP_CLK_DUMMY>,
951+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
952952
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
953953
<&clk IMX8MP_CLK_USDHC2_ROOT>;
954954
clock-names = "ipg", "ahb", "per";
@@ -962,7 +962,7 @@
962962
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
963963
reg = <0x30b60000 0x10000>;
964964
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
965-
clocks = <&clk IMX8MP_CLK_DUMMY>,
965+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
966966
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
967967
<&clk IMX8MP_CLK_USDHC3_ROOT>;
968968
clock-names = "ipg", "ahb", "per";

‎arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// SPDX-License-Identifier: (GPL-2.0-or-later OR X11)
2+
/*
3+
* Copyright 2023 TQ-Systems GmbH <[email protected]>,
4+
* D-82229 Seefeld, Germany.
5+
* Author: Alexander Stein
6+
*/
7+
8+
&mu_m0 {
9+
interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
10+
};
11+
12+
&mu1_m0 {
13+
interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;
14+
};
15+
16+
&vpu_core0 {
17+
reg = <0x2d040000 0x10000>;
18+
};
19+
20+
&vpu_core1 {
21+
reg = <0x2d050000 0x10000>;
22+
};
23+
24+
/delete-node/ &mu2_m0;
25+
/delete-node/ &vpu_core2;

‎arch/arm64/boot/dts/freescale/imx8qxp.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@
4646
serial1 = &lpuart1;
4747
serial2 = &lpuart2;
4848
serial3 = &lpuart3;
49-
vpu_core0 = &vpu_core0;
50-
vpu_core1 = &vpu_core1;
51-
vpu_core2 = &vpu_core2;
49+
vpu-core0 = &vpu_core0;
50+
vpu-core1 = &vpu_core1;
5251
};
5352

5453
cpus {
@@ -316,6 +315,7 @@
316315
};
317316

318317
#include "imx8qxp-ss-img.dtsi"
318+
#include "imx8qxp-ss-vpu.dtsi"
319319
#include "imx8qxp-ss-adma.dtsi"
320320
#include "imx8qxp-ss-conn.dtsi"
321321
#include "imx8qxp-ss-lsio.dtsi"

‎arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
power_led: led-0 {
3838
label = "firefly:red:power";
39-
linux,default-trigger = "ir-power-click";
39+
linux,default-trigger = "default-on";
4040
default-state = "on";
4141
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
4242
};
4343

4444
user_led: led-1 {
4545
label = "firefly:blue:user";
46-
linux,default-trigger = "ir-user-click";
46+
linux,default-trigger = "rc-feedback";
4747
default-state = "off";
4848
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
4949
};

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,8 +1221,7 @@
12211221
compatible = "rockchip,rk3328-dw-hdmi";
12221222
reg = <0x0 0xff3c0000 0x0 0x20000>;
12231223
reg-io-width = <4>;
1224-
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,
1225-
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
1224+
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
12261225
clocks = <&cru PCLK_HDMI>,
12271226
<&cru SCLK_HDMI_SFC>,
12281227
<&cru SCLK_RTC32K>;

0 commit comments

Comments
 (0)