From 7a61d0d953be3efe4a5b20b2d486ce8323325602 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 25 Feb 2023 20:28:49 +0000
Subject: [PATCH] core/linux-aarch64 to 6.2.1-1
---
core/linux-aarch64/PKGBUILD | 9 +++++----
core/linux-aarch64/config | 8 ++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD
index e02779b3c..836116e4d 100644
--- a/core/linux-aarch64/PKGBUILD
+++ b/core/linux-aarch64/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-aarch64
_srcname=linux-6.2
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
-pkgver=6.2.0
+pkgver=6.2.1
pkgrel=1
arch=('aarch64')
url="http://www.kernel.org/"
@@ -15,7 +15,7 @@ license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz"
- #"http://www.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
+ "http://www.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz"
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
'config'
@@ -26,9 +26,10 @@ source=("http://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz"
'60-linux.hook'
'90-linux.hook')
md5sums=('787862593d7bf354cf1a5c37e21fc147'
+ 'be09fdc4f007b676d67e894d96304500'
'7b08a199a97e3e2288e5c03d8e8ded2d'
'c9d4e392555b77034e24e9f87c5ff0b3'
- 'b340d56c70f074480d723ddabd96a515'
+ 'be69f8be163395f2b5bffb52bcd36935'
'7c97cf141750ad810235b1ad06eb9f75'
'61c5ff73c136ed07a7aadbf58db3d96a'
'584777ae88bce2c5659960151b64c7d8'
@@ -45,7 +46,7 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
# add upstream patch
- #git apply --whitespace=nowarn ../patch-${pkgver}
+ git apply --whitespace=nowarn ../patch-${pkgver}
# ALARM patches
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff --git a/core/linux-aarch64/config b/core/linux-aarch64/config
index 348d45625..c68cbcc0d 100644
--- a/core/linux-aarch64/config
+++ b/core/linux-aarch64/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.2.0 Kernel Configuration
+# Linux/arm64 6.2.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -4777,7 +4777,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_IP5XXX_POWER is not set
# CONFIG_TEST_POWER is not set
# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_CW2015 is not set
+CONFIG_BATTERY_CW2015=m
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2781 is not set
@@ -7255,7 +7255,7 @@ CONFIG_SND_SOC_DMIC=m
CONFIG_SND_SOC_HDMI_CODEC=m
# CONFIG_SND_SOC_ES7134 is not set
# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8316=m
# CONFIG_SND_SOC_ES8326 is not set
CONFIG_SND_SOC_ES8328=m
CONFIG_SND_SOC_ES8328_I2C=m
@@ -10075,7 +10075,7 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
CONFIG_PHY_ROCKCHIP_PCIE=y
-# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
CONFIG_PHY_ROCKCHIP_TYPEC=y
CONFIG_PHY_ROCKCHIP_USB=y
# CONFIG_PHY_SAMSUNG_USB2 is not set