Bump to 6.0.1

4 files changed, 72 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50d86a1af046..30e54e3e9a27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-aarch64-rockpro64
 	pkgdesc = AArch64 with patches for PINE64's ROCKPro64
-	pkgver = 5.19.13
+	pkgver = 6.0.1
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = aarch64
@@ -13,38 +13,38 @@ pkgbase = linux-aarch64-rockpro64
 	makedepends = git
 	makedepends = dtc
 	options = !strip
-	source = http://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz
-	source = http://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.13.xz
+	source = http://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
+	source = http://www.kernel.org/pub/linux/kernel/v6.x/patch-6.0.1.xz
 	source = 0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
-	source = 0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
 	source = config
 	source = linux.preset
 	source = 60-linux.hook
 	source = 90-linux.hook
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0011-v4l2-from-list.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0020-drm-from-list.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1002-for-libreelec.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch
-	source = https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch
-	md5sums = f91bfe133d2cb1692f705947282e123a
-	md5sums = cc9f3b62e1274e401b9c37f758493a86
-	md5sums = e0514a3e8f7383c1304faeff0121dfb5
-	md5sums = 965c9f68072084cdbf1e083779d2ef0e
-	md5sums = 417932cd6167ff0b47c6dc297e3eb3fb
-	md5sums = 41cb5fef62715ead2dd109dbea8413d6
-	md5sums = 0a5f16bfec6ad982a2f6782724cca8ba
-	md5sums = 3dc88030a8f2f5a5f97266d99b149f77
-	md5sums = 7f45e67fe9eafa578b6ddad598b1ef7d
-	md5sums = bd40c808030c856d52bd3f82df2e19a7
-	md5sums = 8328bcc4d8c8f00e9ebb6186f2dd22df
-	md5sums = e27dbd3847f68f24cf9ebb5e0b8f8f9f
-	md5sums = 35235baaf83cdd1091212f5c78935ddd
-	md5sums = f0f8ca23b89c026b6ed8f877d075e586
-	md5sums = 79b113b50829169c168bcf54435914bb
-	md5sums = 7bf9d397ebd8b10b0e254bb1cda80d88
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-0011-v4l2-from-list.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-0020-drm-from-list.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-1002-for-libreelec.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch
+	source = https://github.com/LibreELEC/LibreELEC.tv/raw/fcd644f0173a04df19356813c25d48a97ddb2c04/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch
+	sha256sums = 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e
+	sha256sums = 483447baa17bb08dfeb1b966c9b93bd0a7cac096d8086b0bbd09fb0d4968fe1e
+	sha256sums = 5ac741733d6b117d9f837c1d88043aa14dedfbfe40d6a17c9a5ba8e67dce6d57
+	sha256sums = 2996843f5c08b7e05182c77bb73fb8465682f049d1e6b42ad590931aec945cde
+	sha256sums = 6837b3e2152f142f3fff595c6cbd03423f6e7b8d525aac8ae3eb3b58392bd255
+	sha256sums = 452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c
+	sha256sums = 71df1b18a3885b151a3b9d926a91936da2acc90d5e27f1ad326745779cd3759d
+	sha256sums = 2920b0d0a236ea6f12ea2a4e0d8c0b24ac72203229e3f6e2d5d386636938516e
+	sha256sums = 9a49febdd90414c9bdb91f0d09d1f4087ba42d2f3f6131d7a160741211e9e35c
+	sha256sums = 06586bc6bfcff6dbdd962e1bf709b5a9a4f6472628bd9c4842d684e95a5f6ed1
+	sha256sums = d72e7d45d3815d76f61830838665cd31dbb4e99932e440241676aa035192eb08
+	sha256sums = c054a4f23af3cba47fb1e0c08a7cb700fea251566cb68c37a64b137f0b71fac2
+	sha256sums = f9bc85d319ad8fc2e675f1755dadf9f4d9ae84ab56b4e14f3e856f7b130c5f91
+	sha256sums = 9b1010af3539ca37d139ba494e140a4ce27dd315e4c17f41f4a712704fd49913
+	sha256sums = c292579795d856bb459cb94a4ed410379b6220f90758f390e20f8a18c538f642
+	sha256sums = 58925a7e8a9d59d48b72af8bb7017c115ed2fc9b763cdd472fba03001728181c
 
 pkgname = linux-aarch64-rockpro64
 	pkgdesc = The Linux Kernel and modules - AArch64 with patches for PINE64's ROCKPro64
@@ -54,7 +54,7 @@ pkgname = linux-aarch64-rockpro64
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = wireless-regdb: to set the correct wireless channels of your country
-	provides = linux=5.19.13
+	provides = linux=6.0.1
 	provides = WIREGUARD-MODULE
 	conflicts = linux
 	conflicts = linux-aarch64
@@ -62,6 +62,6 @@ pkgname = linux-aarch64-rockpro64
 
 pkgname = linux-aarch64-rockpro64-headers
 	pkgdesc = Header files and scripts for building modules for linux kernel - AArch64 with patches for PINE64's ROCKPro64
-	provides = linux-headers=5.19.13
+	provides = linux-headers=6.0.1
 	conflicts = linux-headers
 	conflicts = linux-aarch64-headers
diff --git a/.gitignore b/.gitignore
index 4cdf43d6e9a0..0ca80150dd0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.patch
 *.xz
+*.zst
diff --git a/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index e0cb8e4497cd..d99ffeeeb6d3 100644
--- a/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From 89d947a0151b40ba6855d9a9e64ebd466cd64064 Mon Sep 17 00:00:00 2001
+From 648bf1e655cc1a82a32b1b556b2ecbdb03ab3a72 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 4dc43929e370..75e8736e3a73 100644
+index bfb58c91db04..29b7c4cb90f1 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -54,6 +54,7 @@
@@ -27,10 +27,10 @@ index 4dc43929e370..75e8736e3a73 100644
 +module_param(macaddr, charp, 0);
 +MODULE_PARM_DESC(macaddr, "MAC address");
 +
- static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
- 					    u32 *data, int in_pm)
+ static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
+ 					  u32 *data)
  {
-@@ -805,8 +810,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
  	return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -92,4 +92,3 @@ index 4dc43929e370..75e8736e3a73 100644
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
 2.37.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 7608025db019..a8491f33993a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,49 +5,51 @@
 buildarch=8
 
 pkgbase=linux-aarch64-rockpro64
-_srcname=linux-5.19
+_srcname=linux-6.0
 _kernelname=${pkgbase#linux}
+_libreelec_patch_commit=fcd644f0173a04df19356813c25d48a97ddb2c04
 pkgdesc="AArch64 with patches for PINE64's ROCKPro64"
-pkgver=5.19.13
+pkgver=6.0.1
 pkgrel=1
 arch=('aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'dtc')
 options=('!strip')
-source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+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"
         '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
-        '0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
+#        '0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch'
         'config'
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook'
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0011-v4l2-from-list.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-0020-drm-from-list.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-1002-for-libreelec.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch"
-        "https://github.com/LibreELEC/LibreELEC.tv/raw/master/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-0002-rockchip-from-list.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-0011-v4l2-from-list.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-0020-drm-from-list.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-1001-v4l2-rockchip.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-1002-for-libreelec.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-2000-v4l2-wip-rkvdec-hevc.patch"
+        "https://github.com/LibreELEC/LibreELEC.tv/raw/${_libreelec_patch_commit}/projects/Rockchip/patches/linux/default/linux-2001-v4l2-wip-iep-driver.patch"
 )
-md5sums=('f91bfe133d2cb1692f705947282e123a'
-         'cc9f3b62e1274e401b9c37f758493a86'
-         'e0514a3e8f7383c1304faeff0121dfb5'
-         '965c9f68072084cdbf1e083779d2ef0e'
-         '417932cd6167ff0b47c6dc297e3eb3fb'
-         '41cb5fef62715ead2dd109dbea8413d6'
-         '0a5f16bfec6ad982a2f6782724cca8ba'
-         '3dc88030a8f2f5a5f97266d99b149f77'
-         '7f45e67fe9eafa578b6ddad598b1ef7d'
-         'bd40c808030c856d52bd3f82df2e19a7'
-         '8328bcc4d8c8f00e9ebb6186f2dd22df'
-         'e27dbd3847f68f24cf9ebb5e0b8f8f9f'
-         '35235baaf83cdd1091212f5c78935ddd'
-         'f0f8ca23b89c026b6ed8f877d075e586'
-         '79b113b50829169c168bcf54435914bb'
-         '7bf9d397ebd8b10b0e254bb1cda80d88')
+sha256sums=('5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e'
+            '483447baa17bb08dfeb1b966c9b93bd0a7cac096d8086b0bbd09fb0d4968fe1e'
+            '5ac741733d6b117d9f837c1d88043aa14dedfbfe40d6a17c9a5ba8e67dce6d57'
+            '2996843f5c08b7e05182c77bb73fb8465682f049d1e6b42ad590931aec945cde'
+            '6837b3e2152f142f3fff595c6cbd03423f6e7b8d525aac8ae3eb3b58392bd255'
+            '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
+            '71df1b18a3885b151a3b9d926a91936da2acc90d5e27f1ad326745779cd3759d'
+            '2920b0d0a236ea6f12ea2a4e0d8c0b24ac72203229e3f6e2d5d386636938516e'
+            '9a49febdd90414c9bdb91f0d09d1f4087ba42d2f3f6131d7a160741211e9e35c'
+            '06586bc6bfcff6dbdd962e1bf709b5a9a4f6472628bd9c4842d684e95a5f6ed1'
+            'd72e7d45d3815d76f61830838665cd31dbb4e99932e440241676aa035192eb08'
+            'c054a4f23af3cba47fb1e0c08a7cb700fea251566cb68c37a64b137f0b71fac2'
+            'f9bc85d319ad8fc2e675f1755dadf9f4d9ae84ab56b4e14f3e856f7b130c5f91'
+            '9b1010af3539ca37d139ba494e140a4ce27dd315e4c17f41f4a712704fd49913'
+            'c292579795d856bb459cb94a4ed410379b6220f90758f390e20f8a18c538f642'
+            '58925a7e8a9d59d48b72af8bb7017c115ed2fc9b763cdd472fba03001728181c')
 
 prepare() {
   cd $_srcname
@@ -62,14 +64,16 @@ prepare() {
 
   # ALARM patches
   git apply -v ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
-  git apply -v ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
+#  git apply -v ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
 
   #Libreelec Patches
-  cat ../linux-1000-drm-rockchip.patch | tail -n 3691 > ../linux-1000-drm-rockchip.patch.mod
+  #cat ../linux-1000-drm-rockchip.patch | tail -n 3691 > ../linux-1000-drm-rockchip.patch.mod
+  git apply -v ../linux-0001-rockchip-from-6.1.patch
   git apply -v ../linux-0002-rockchip-from-list.patch
   git apply -v ../linux-0011-v4l2-from-list.patch
   git apply -v ../linux-0020-drm-from-list.patch
-  git apply -v ../linux-1000-drm-rockchip.patch.mod
+#  git apply -v ../linux-1000-drm-rockchip.patch.mod
+  git apply -v ../linux-1000-drm-rockchip.patch
   git apply -v ../linux-1001-v4l2-rockchip.patch
   git apply -v ../linux-1002-for-libreelec.patch
   git apply -v ../linux-2000-v4l2-wip-rkvdec-hevc.patch