From d6969a1f5d3e575a160ca41c2c71cbef78b556aa Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 11 Jan 2022 00:37:23 +0000
Subject: [PATCH] match on Intel Jasper Lake

cavs/hda is pci class multimedia subclass audio so not automatically
matched by azalia but confirmed to work after matched

tested by Sven Wolf on Acer Swift 1 SF114-34 with Pentium Silver N6000
---
 sys/dev/pci/azalia.c    | 6 ++++--
 sys/dev/pci/dwiic_pci.c | 8 +++++++-
 sys/dev/pci/ichiic.c    | 3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 824840bca3f..83fa8d1d7f0 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.267 2022/01/09 05:42:45 jsg Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.268 2022/01/11 00:37:23 jsg Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -482,6 +482,7 @@ azalia_configure_pci(azalia_t *az)
 	case PCI_PRODUCT_INTEL_BAYTRAIL_HDA:
 	case PCI_PRODUCT_INTEL_BSW_HDA:
 	case PCI_PRODUCT_INTEL_GLK_HDA:
+	case PCI_PRODUCT_INTEL_JSL_HDA:
 		reg = azalia_pci_read(az->pc, az->tag,
 		    INTEL_PCIE_NOSNOOP_REG);
 		reg &= INTEL_PCIE_NOSNOOP_MASK;
@@ -495,7 +496,8 @@ const struct pci_matchid azalia_pci_devices[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_HDA },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_300SERIES_U_HDA },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_400SERIES_CAVS },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA }
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_HDA },
 };
 
 int
diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c
index ff41b19039d..db73d18df42 100644
--- a/sys/dev/pci/dwiic_pci.c
+++ b/sys/dev/pci/dwiic_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_pci.c,v 1.18 2021/10/30 03:27:35 jsg Exp $ */
+/* $OpenBSD: dwiic_pci.c,v 1.19 2022/01/11 00:37:23 jsg Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  * PCI attachment
@@ -138,6 +138,12 @@ const struct pci_matchid dwiic_pci_ids[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_6 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_7 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_8 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_0 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_1 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_2 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_3 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_4 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_5 },
 };
 
 int
diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c
index 0c996799153..1c4ea5ece4d 100644
--- a/sys/dev/pci/ichiic.c
+++ b/sys/dev/pci/ichiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ichiic.c,v 1.46 2021/10/30 03:27:35 jsg Exp $	*/
+/*	$OpenBSD: ichiic.c,v 1.47 2022/01/11 00:37:23 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -135,6 +135,7 @@ const struct pci_matchid ichiic_ids[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_SMB },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_SMB },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_600SERIES_SMB },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_SMB },
 };
 
 int
-- 
2.20.1