mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v6.1.118'

Browse Source 
This is the 6.1.118 stable release

* tag 'v6.1.118': (264 commits)
  Linux 6.1.118
  9p: fix slab cache name creation for real
  fs/ntfs3: Fix general protection fault in run_is_mapped_full
  platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors
  mm: krealloc: Fix MTE false alarm in __do_krealloc
  Bluetooth: L2CAP: Fix uaf in l2cap_connect
  ext4: fix timer use-after-free on failed mount
  drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer
  uprobe: avoid out-of-bounds memory access of fetching args
  uprobes: encapsulate preparation of uprobe args buffer
  io_uring: fix possible deadlock in io_register_iowq_max_workers()
  md/raid10: improve code of mrdev in raid10_sync_request
  net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition
  LoongArch: Use "Exception return address" to comment ERA
  HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard
  HID: multitouch: Add quirk for Logitech Bolt receiver w/ Casa touchpad
  fs: Fix uninitialized value issue in from_kuid and from_kgid
  bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6
  vDPA/ifcvf: Fix pci_read_config_byte() return code handling
  nvme: make keep-alive synchronous operation
  ...

Change-Id: I444ffa78df5ea265e328ff158178c4e640030da8

Conflicts:
	arch/arm/boot/dts/rk3036.dtsi
This commit is contained in:
Tao Huang
2025-01-25 10:26:17 +08:00
parent e81819eb46 b67dc5c9ad
commit fab422d7f2
272 changed files with 2410 additions and 1488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3036-kylin.dts
View File

@@ -367,8 +367,8 @@
&i2c2 {
status = "okay";
rt5616: rt5616@1b {
compatible = "rt5616";
rt5616: audio-codec@1b {
compatible = "realtek,rt5616";
reg = <0x1b>;
clocks = <&cru SCLK_I2S_OUT>;
clock-names = "mclk";

12
arch/arm/boot/dts/rk3036.dtsi
View File

@@ -619,12 +619,13 @@
};
};
acodec: acodec-ana@20030000 {
acodec: audio-codec@20030000 {
compatible = "rockchip,rk3036-codec";
reg = <0x20030000 0x4000>;
rockchip,grf = <&grf>;
clock-names = "acodec_pclk";
clocks = <&cru PCLK_ACODEC>;
rockchip,grf = <&grf>;
#sound-dai-cells = <0>;
status = "disabled";
};
@@ -634,7 +635,6 @@
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru ACLK_VIO>, <&cru PCLK_HDMI>;
clock-names = "aclk", "pclk";
rockchip,grf = <&grf>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_ctl>;
#address-cells = <1>;
@@ -802,11 +802,11 @@
};
spi: spi@20074000 {
compatible = "rockchip,rockchip-spi";
compatible = "rockchip,rk3036-spi";
reg = <0x20074000 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
clock-names = "apb-pclk","spi_pclk";
clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
clock-names = "spiclk", "apb_pclk";
dmas = <&pdma 8>, <&pdma 9>;
dma-names = "tx", "rx";
pinctrl-names = "default";