v5.16.9, update imacpro applesmc patch

Fixed the matching order for "iMacPro" to be before iMac and MacPro.

When https://github.com/t2linux/kernel/tree/linux-5.16.y-t2-arch gets
updated, I'll make it so the kernel source comes from there and then it
should only be the patches putting apple-bce and apple-ibridge in tree
that will need to remain here. That might mean there'd end up being a
5.16.9-2 release which would just have some changes to packageing
but should be functionally the same.

3007-applesmc-Add-iMacPro-to-applesmc_whitelist.patch

@@ -1,12 +1,15 @@
 From 101657def81e8d1ff7522eedf9cec63a531ea2e6 Mon Sep 17 00:00:00 2001
 From: Orlando Chamberlain <redecorating@protonmail.com>
-Date: Sat, 25 Dec 2021 13:41:26 +1100
-Subject: [PATCH 1/1] applesmc: Add iMacPro to applesmc_whitelist
+Date: Thu, 10 Feb 2022 18:57:45 +1100
+Subject: [PATCHv2 1/1] applesmc: Add iMacPro to applesmc_whitelist
 
-The iMacPro1,1 is the only iMacPro, and it should need applesmc (but not
-many people have this computer so it might be hard to find someone to test
-if applesmc works on it)
+The iMacPro1,1 is the only iMacPro released before the line was
+discontinued. Add it to the applesmc_whitelist.
+
+Signed-off-by: Orlando Chamberlain <redecorating@protonmail.com>
 ---
+v1->v2: match "iMacPro" before matching "iMac" and "MacPro"
+
  drivers/hwmon/applesmc.c | 4 ++++
  1 file changed, 4 insertions(+)
 
@@ -14,17 +17,17 @@ diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
 index 8b3f73fcbb8a..b196f9939b28 100644
 --- a/drivers/hwmon/applesmc.c
 +++ b/drivers/hwmon/applesmc.c
-@@ -1812,6 +1812,10 @@ static const struct dmi_system_id applesmc_whitelist[] __initconst = {
+@@ -1804,6 +1804,10 @@ static const struct dmi_system_id applesmc_whitelist[] __initconst = {
  	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
- 	  DMI_MATCH(DMI_PRODUCT_NAME, "iMac") },
+ 	  DMI_MATCH(DMI_PRODUCT_NAME, "MacMini") },
  	},
 +	{ applesmc_dmi_match, "Apple iMacPro", {
 +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 +	  DMI_MATCH(DMI_PRODUCT_NAME, "iMacPro") },
 +	},
- 	{ applesmc_dmi_match, "Apple Xserve", {
+ 	{ applesmc_dmi_match, "Apple MacPro", {
  	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
- 	  DMI_MATCH(DMI_PRODUCT_NAME, "Xserve") },
+ 	  DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },
 -- 
 2.34.1
 

PKGBUILD

@@ -4,7 +4,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-t2
-pkgver=5.16.7
+pkgver=5.16.9
 _srcname=linux-${pkgver}
 pkgrel=1
 pkgdesc='Linux kernel for T2 Macs'
@@ -159,7 +159,7 @@ _package() {
   depends=(coreutils kmod initramfs)
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices')
-  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
+  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE linux)
   replaces=(virtualbox-guest-modules-arch wireguard-arch)
 
   cd $_srcname
@@ -184,6 +184,7 @@ _package() {
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
   depends=(pahole)
+  provides=(linux-headers)
 
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -265,6 +266,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Documentation for the $pkgdesc kernel"
+  provides=(linux-docs)
 
   cd $_srcname
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -290,7 +292,7 @@ for _p in "${pkgname[@]}"; do
   }"
 done
 
-sha256sums=('5751f53e8e5415eb0494ac1513765cbdea28848963999dfdb5d4e7f4c3d8a6cd'
+sha256sums=('1660e7228ec299c187c19739d115ded97f6b1be05a24986c4c443e7c5e8b744f'
             'SKIP'
             '7cbba374356a189faac71001c5344ce8f02434684b1ce1accefc0cc4bd6718e5'
             '6b4da532421cac5600d09c0c52742aa52d848af098f7853abe60c02e9d0a3752'
@@ -306,7 +308,7 @@ sha256sums=('5751f53e8e5415eb0494ac1513765cbdea28848963999dfdb5d4e7f4c3d8a6cd'
             '62f6d63815d4843ca893ca76b84a9d32590a50358ca0962017ccd75a40884ba8'
             '2827dab6eeb2d2a08034938024f902846b5813e967a0ea253dc1ea88315da383'
             '398dec7d54c6122ae2263cd5a6d52353800a1a60fd85e52427c372ea9974a625'
-            '80198d668e894656cd6a13fad5e55dfc22a242fa5919da8e29efeed55ed061ef'
+            'd4ca5a01da5468a1d2957b8eb4a819e1b867a3bcd1cd47389d7c9ac9154b5430'
             '1366719f62b2d698693b31916569f1178f3d1b0a66e747b7f40f1389edceff07'
             '83f4be6849ba4d5f9fad647ad2eb78bf6409ee98a40ac62e8a5b80496233d70a'
             '44bd3643b2b22fedc59d79511199f30ce6759fa0acdd9a66262a53c5e046da6b'