commit 0c75b355b340890939b8bd1ce8d70ac54fe46bd2
Author: Jan Palus <[email protected]>
Date: Tue Feb 21 14:12:22 2023 +0100
updated arm64 config and patches for 6.2
kernel-arm64.config | 2 ++
kernel-multiarch.config | 28 +++++++++++++++--
kernel.spec | 2 --
odroid-n2-fan.patch | 80 -------------------------------------------------
4 files changed, 27 insertions(+), 85 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index be5bbd98..266cb6b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -213,7 +213,6 @@ Patch7000: kernel-inittmpfs.patch
Patch8000: rpi-sound.patch
Patch8001: kernel-pinebook-pro.patch
Patch8002: atheros-disallow-retrain-nongen1-pcie.patch
-Patch8003: odroid-n2-fan.patch
# Do not remove this line, please. It is easier for me to uncomment two lines,
then patch
# kernel.spec every time.
@@ -665,7 +664,6 @@ cd linux-%{basever}
%patch8000 -p1
%patch8001 -p1
%patch8002 -p1
-%patch8003 -p1
%endif
%if %{with rt}
diff --git a/kernel-arm64.config b/kernel-arm64.config
index 8d056eb3..6fdd451b 100644
--- a/kernel-arm64.config
+++ b/kernel-arm64.config
@@ -29,6 +29,7 @@ ARM64_ERRATUM_2054223 arm64=y
ARM64_ERRATUM_2067961 arm64=y
ARM64_ERRATUM_2441009 arm64=y
ARM64_ERRATUM_2457168 arm64=y
+ARM64_ERRATUM_2645198 arm64=y
CAVIUM_ERRATUM_22375 arm64=y
CAVIUM_ERRATUM_23154 arm64=y
CAVIUM_ERRATUM_27456 arm64=y
@@ -160,6 +161,7 @@ NVHE_EL2_DEBUG arm64=n
#-
#- *** FILE: drivers/acpi/Kconfig ***
#-
+ACPI_FPDT arm64=y
ACPI_VIDEO arm64=m
ACPI_CONTAINER arm64=y
ACPI_HED arm64=y
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 803b3e21..cd2e9ac0 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -79,6 +79,8 @@ CRYPTO_SM4_AESNI_AVX2_X86_64 all=m
CRYPTO_SM4_AESNI_AVX_X86_64 all=m
CRYPTO_SM4_ARM64_CE arm64=m
CRYPTO_SM4_ARM64_CE_BLK arm64=m
+CRYPTO_SM4_ARM64_CE_CCM arm64=m
+CRYPTO_SM4_ARM64_CE_GCM arm64=m
CRYPTO_SM4_ARM64_NEON_BLK arm64=m
CRYPTO_TWOFISH_586 i386=m
CRYPTO_TWOFISH_AVX_X86_64 all=m
@@ -1080,6 +1082,7 @@ CLK_RK3328 arm64=y
CLK_RK3368 arm64=y
CLK_RK3399 arm64=y
CLK_RK3568 arm64=y
+CLK_RK3588 arm64=y
#-
#- *** FILE: drivers/clk/sunxi-ng/Kconfig ***
@@ -1335,6 +1338,7 @@ CRYPTO_DEV_CCP all=y
CRYPTO_DEV_CAVIUM_ZIP arm64=m
#- file drivers/crypto/vmx/Kconfig goes here
CRYPTO_DEV_ROCKCHIP arm64=m
+CRYPTO_DEV_ROCKCHIP_DEBUG arm64=n
#- file drivers/crypto/chelsio/Kconfig goes here
#- file drivers/crypto/virtio/Kconfig goes here
#- file drivers/crypto/stm32/Kconfig goes here
@@ -2247,6 +2251,7 @@ DRM_PANEL_ILITEK_ILI9341 arm=m arm64=m
DRM_PANEL_ILITEK_ILI9881C arm=m arm64=m
DRM_PANEL_INNOLUX_EJ030NA arm=m arm64=m
DRM_PANEL_INNOLUX_P079ZCA arm=m arm64=m
+DRM_PANEL_JADARD_JD9365DA_H3 arm64=m
DRM_PANEL_JDI_LT070ME05000 arm=m arm64=m
DRM_PANEL_JDI_R63452 arm=m arm64=m
DRM_PANEL_KHADAS_TS050 arm=m arm64=m
@@ -2257,6 +2262,7 @@ DRM_PANEL_SAMSUNG_LD9040 arm=m arm64=m
DRM_PANEL_LG_LB035Q02 arm=m arm64=m
DRM_PANEL_LG_LG4573 arm=m arm64=m
DRM_PANEL_NEC_NL8048HL11 arm=m arm64=m
+DRM_PANEL_NEWVISION_NV3051D arm64=m
DRM_PANEL_NEWVISION_NV3052C arm=m arm64=m
DRM_PANEL_NOVATEK_NT35510 arm=m arm64=m
DRM_PANEL_NOVATEK_NT35560 arm=m arm64=m
@@ -4039,6 +4045,7 @@ INPUT_CM109 all=m
INPUT_REGULATOR_HAPTIC all=m
INPUT_RETU_PWRBUTTON all=m
INPUT_TPS65218_PWRBUTTON all=m
+INPUT_TPS65219_PWRBUTTON arm64=m
INPUT_AXP20X_PEK all=m
INPUT_TWL4030_PWRBUTTON powerpc=m
INPUT_UINPUT all=m sparc=n
@@ -4877,6 +4884,7 @@ VIDEO_S5K5BAF all=m
VIDEO_S5K6A3 all=m
VIDEO_S5K6AA all=m
VIDEO_SR030PC30 all=m
+VIDEO_ST_VGXY61 arm64=m
VIDEO_VS6624 all=m
#- file drivers/media/i2c/ccs/Kconfig goes here
#- file drivers/media/i2c/et8ek8/Kconfig goes here
@@ -5827,6 +5835,7 @@ MFD_TPS65217 all=m
MFD_TI_LP873X all=m
MFD_TI_LP87565 arm=m arm64=m
MFD_TPS65218 all=m
+MFD_TPS65219 arm64=m
MFD_TPS65912_I2C all=m
MFD_TPS65912_SPI all=y
TWL4030_CORE powerpc=y
@@ -8838,6 +8847,16 @@ ALIBABA_UNCORE_DRW_PMU arm64=m
#- file drivers/perf/arm_cspmu/Kconfig goes here
#- file drivers/perf/amlogic/Kconfig goes here
+#-
+#- *** FILE: drivers/perf/amlogic/Kconfig ***
+#-
+MESON_DDR_PMU arm64=m
+
+#-
+#- *** FILE: drivers/perf/arm_cspmu/Kconfig ***
+#-
+ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU arm64=m
+
#-
#- *** FILE: drivers/perf/hisilicon/Kconfig ***
#-
@@ -9693,6 +9712,7 @@ REGULATOR_TPS65086 all=m
REGULATOR_TPS65132 all=m
REGULATOR_TPS65217 all=m
REGULATOR_TPS65218 arm=m arm64=m
+REGULATOR_TPS65219 arm64=m
REGULATOR_TPS6524X all=m
REGULATOR_TPS6586X all=m
REGULATOR_TPS65912 all=m
@@ -10298,6 +10318,7 @@ SPI_ROCKCHIP all=m
SPI_ROCKCHIP_SFC arm64=m
SPI_SC18IS602 all=m
SPI_SIFIVE all=m
+SPI_SN_F_OSPI arm64=m
SPI_MXIC all=m
SPI_THUNDERX arm64=m
SPI_TOPCLIFF_PCH all=m
@@ -15293,6 +15314,9 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
#-
SND_BCM2835_SOC_I2S arm=m
SND_BCM63XX_I2S_WHISTLER all=m
+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
#-
#- *** FILE: sound/soc/codecs/Kconfig ***
@@ -15399,6 +15423,7 @@ SND_SOC_RK3328 all=m
SND_SOC_RK817 arm=m arm64=m
SND_SOC_RT1308_SDW all=m
SND_SOC_RT1316_SDW all=m
+SND_SOC_RT1318_SDW arm64=m
SND_SOC_RT5616 all=m
SND_SOC_RT5631 all=m
SND_SOC_RT5640 all=m
@@ -15846,9 +15871,6 @@ PCH_CAN all=m
RANDOM_TRUST_BOOTLOADER all=y
RANDOM_TRUST_CPU all=y
SMC911X arm=m
-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
TEST_SIPHASH all=m
TEST_STRSCPY all=m
USB_SISUSBVGA_CON all=y
diff --git a/odroid-n2-fan.patch b/odroid-n2-fan.patch
deleted file mode 100644
index c148daf7..00000000
--- a/odroid-n2-fan.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 44a201df71739a3c5ef3c40e58ebaccfd052d430 Mon Sep 17 00:00:00 2001
-From: Anand Moon <[email protected]>
-Date: Fri, 21 Oct 2022 05:09:03 +0000
-Subject: arm64: dts: meson: Enable active coling using gpio-fan on Odroid
- N2/N2+
-
-Odroid N2/N2+ support active cooling via gpio-fan controller.
-Add fan controls and tip point for cpu and ddr thermal sensor
-on this boards.
-
-Signed-off-by: Anand Moon <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Neil Armstrong <[email protected]>
----
- .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 42 ++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index fd3fa82e4c330..667d2b7749244 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -39,6 +39,14 @@
- reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
- };
-
-+ fan: gpio-fan {
-+ compatible = "gpio-fan";
-+ gpios = <&gpio_ao GPIOAO_10 GPIO_ACTIVE_HIGH>;
-+ /* Using Dummy Speed */
-+ gpio-fan,speed-map = <0 0>, <1 1>;
-+ #cooling-cells = <2>;
-+ };
-+
- leds {
- compatible = "gpio-leds";
-
-@@ -410,6 +418,40 @@
- clock-latency = <50000>;
- };
-
-+&cpu_thermal {
-+ trips {
-+ cpu_active: cpu-active {
-+ temperature = <60000>; /* millicelsius */
-+ hysteresis = <2000>; /* millicelsius */
-+ type = "active";
-+ };
-+ };
-+
-+ cooling-maps {
-+ map {
-+ trip = <&cpu_active>;
-+ cooling-device = <&fan THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
-+ };
-+ };
-+};
-+
-+&ddr_thermal {
-+ trips {
-+ ddr_active: ddr-active {
-+ temperature = <60000>; /* millicelsius */
-+ hysteresis = <2000>; /* millicelsius */
-+ type = "active";
-+ };
-+ };
-+
-+ cooling-maps {
-+ map {
-+ trip = <&ddr_active>;
-+ cooling-device = <&fan THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
-+ };
-+ };
-+};
-+
- &ext_mdio {
- external_phy: ethernet-phy@0 {
- /* Realtek RTL8211F (0x001cc916) */
---
-cgit
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/0c75b355b340890939b8bd1ce8d70ac54fe46bd2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
