summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Config.in.kernelversion2
-rw-r--r--target/linux/patches/6.0.11/rockchip-audio.patch12
-rw-r--r--target/linux/patches/6.0.15/board-rockpi4-0003-arm64-dts-pcie.patch (renamed from target/linux/patches/6.0.11/board-rockpi4-0003-arm64-dts-pcie.patch)0
-rw-r--r--target/linux/patches/6.0.15/enable-ethernet-bpi-m2-plus.patch (renamed from target/linux/patches/6.0.11/enable-ethernet-bpi-m2-plus.patch)0
-rw-r--r--target/linux/patches/6.0.15/rockchip-115200.patch (renamed from target/linux/patches/6.0.11/rockchip-115200.patch)0
-rw-r--r--target/linux/patches/6.0.15/rockchip-pcie-timeout.patch (renamed from target/linux/patches/6.0.11/rockchip-pcie-timeout.patch)0
6 files changed, 1 insertions, 13 deletions
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 2d4db2101..debdcca6d 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -35,7 +35,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
config ADK_TARGET_LINUX_KERNEL_VERSION_6_0
- bool "6.0.11"
+ bool "6.0.15"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_CRIS
diff --git a/target/linux/patches/6.0.11/rockchip-audio.patch b/target/linux/patches/6.0.11/rockchip-audio.patch
deleted file mode 100644
index 9520d2ad2..000000000
--- a/target/linux/patches/6.0.11/rockchip-audio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-6.0.11.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi linux-6.0.11/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
---- linux-6.0.11.orig/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-02 17:43:18.000000000 +0100
-+++ linux-6.0.11/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2022-12-24 19:48:31.620199852 +0100
-@@ -452,6 +452,8 @@
- clocks = <&cru SCLK_I2S_8CH_OUT>;
- clock-names = "mclk";
- #sound-dai-cells = <0>;
-+ interrupt-parent = <&gpio1>;
-+ interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;
-
- port {
- es8316_p0_0: endpoint {
diff --git a/target/linux/patches/6.0.11/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.0.15/board-rockpi4-0003-arm64-dts-pcie.patch
index 1777e7a86..1777e7a86 100644
--- a/target/linux/patches/6.0.11/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/target/linux/patches/6.0.15/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/target/linux/patches/6.0.11/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.0.15/enable-ethernet-bpi-m2-plus.patch
index 7e9abd9ce..7e9abd9ce 100644
--- a/target/linux/patches/6.0.11/enable-ethernet-bpi-m2-plus.patch
+++ b/target/linux/patches/6.0.15/enable-ethernet-bpi-m2-plus.patch
diff --git a/target/linux/patches/6.0.11/rockchip-115200.patch b/target/linux/patches/6.0.15/rockchip-115200.patch
index ad8a2d7a7..ad8a2d7a7 100644
--- a/target/linux/patches/6.0.11/rockchip-115200.patch
+++ b/target/linux/patches/6.0.15/rockchip-115200.patch
diff --git a/target/linux/patches/6.0.11/rockchip-pcie-timeout.patch b/target/linux/patches/6.0.15/rockchip-pcie-timeout.patch
index 2ef7df2da..2ef7df2da 100644
--- a/target/linux/patches/6.0.11/rockchip-pcie-timeout.patch
+++ b/target/linux/patches/6.0.15/rockchip-pcie-timeout.patch