[kernel] bump to linux 5.15.142

YuzukiHD · Dec 12, 2023 · 6390029 · 6390029
1 parent 5a6ee0b
commit 6390029
Show file tree

Hide file tree

Showing 659 changed files with 5,844 additions and 5,862 deletions.
diff --git a/kernel/config/dts/linux-5.15/sun8i-v851s-tinyvision.dts b/kernel/config/dts/linux-5.15/sun8i-v851s-tinyvision.dts
@@ -16,7 +16,7 @@
 	};
 
 	chosen {
-		bootargs = "mem=64M cma=4M root=/dev/mmcblk0p2 earlyprintk=sunxi-uart,0x02500000 loglevel=8 initcall_debug=0 rootwait console=ttyS0 init=/init";
+		bootargs = "root=/dev/mmcblk0p2 earlyprintk=sunxi-uart,0x02500000 loglevel=8 initcall_debug=0 rootwait console=ttyS0 init=/init";
 	};
 };
 

diff --git a/kernel/config/dts/linux-5.15/sun8iw21p1.dtsi b/kernel/config/dts/linux-5.15/sun8iw21p1.dtsi
@@ -27,7 +27,7 @@
 
 	memory@40000000 {
 		device_type = "memory";
-		reg = <0x00000000 0x40000000 0x00000000 0x20000000>;
+		reg = <0x00000000 0x40000000 0x00000000 0x4000000>;
 	};
 
 	aliases {

diff --git a/kernel/linux-5.15/Makefile b/kernel/linux-5.15/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 15
-SUBLEVEL = 138
+SUBLEVEL = 142
 EXTRAVERSION =
 NAME = Trick or Treat
 
@@ -516,7 +516,7 @@ LINUXINCLUDE    := \
 		-I$(objtree)/arch/$(SRCARCH)/include/generated \
 		$(if $(building_out_of_srctree),-I$(srctree)/include) \
 		-I$(objtree)/include \
-		-I$(objtree)/bsp/include \
+		-I$(srctree)/bsp/include \
 		$(USERINCLUDE)
 
 KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE

diff --git a/kernel/linux-5.15/arch/arm/boot/dts/Makefile b/kernel/linux-5.15/arch/arm/boot/dts/Makefile
@@ -1280,7 +1280,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-v3s-licheepi-zero.dtb \
 	sun8i-v3s-licheepi-zero-dock.dtb \
 	sun8i-v40-bananapi-m2-berry.dtb \
-	sun8i-v851se-tinyvision.dtb
+	sun8i-v851s-tinyvision.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-optimus.dtb \
 	sun9i-a80-cubieboard4.dtb

diff --git a/kernel/linux-5.15/arch/arm/boot/dts/qcom-mdm9615.dtsi b/kernel/linux-5.15/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -82,14 +82,12 @@
 		};
 	};
 
-	regulators {
-		vsdcc_fixed: vsdcc-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "SDCC Power";
-			regulator-min-microvolt = <2700000>;
-			regulator-max-microvolt = <2700000>;
-			regulator-always-on;
-		};
+	vsdcc_fixed: vsdcc-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "SDCC Power";
+		regulator-min-microvolt = <2700000>;
+		regulator-max-microvolt = <2700000>;
+		regulator-always-on;
 	};
 
 	soc: soc {

diff --git a/kernel/linux-5.15/arch/arm/boot/dts/r8a7792-blanche.dts b/kernel/linux-5.15/arch/arm/boot/dts/r8a7792-blanche.dts
@@ -239,7 +239,7 @@
 	};
 
 	keyboard_pins: keyboard {
-		pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_02";
+		pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_2";
 		bias-pull-up;
 	};
 

diff --git a/kernel/linux-5.15/arch/arm/boot/dts/sun8i-v851s-tinyvision.dts b/kernel/linux-5.15/arch/arm/boot/dts/sun8i-v851s-tinyvision.dts
@@ -0,0 +1 @@
+../../../../../config/dts/linux-5.15/sun8i-v851s-tinyvision.dts