Module Name: src
Committed By: martin
Date: Sun Mar 12 17:52:13 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-10]: igpio.4
src/sys/dev/acpi [netbsd-10]: igpio_acpi.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #116):
sys/dev/acpi/igpio_acpi.c: revision 1.2
share/man/man4/igpio.4: revision 1.4
igpio(4): Disable Baytrail and Lynxpoint support. Fixes PR kern/57225.
It seems additional code is required to support Baytrail and Lynxpoint.
Disable those support.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/share/man/man4/igpio.4
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/dev/acpi/igpio_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/igpio.4
diff -u src/share/man/man4/igpio.4:1.2.2.1 src/share/man/man4/igpio.4:1.2.2.2
--- src/share/man/man4/igpio.4:1.2.2.1 Mon Jan 23 12:16:00 2023
+++ src/share/man/man4/igpio.4 Sun Mar 12 17:52:13 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: igpio.4,v 1.2.2.1 2023/01/23 12:16:00 martin Exp $
+.\" $NetBSD: igpio.4,v 1.2.2.2 2023/03/12 17:52:13 martin Exp $
.\"
.\" Copyright (c) 2022 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 7, 2023
+.Dd February 27, 2023
.Dt IGPIO 4
.Os
.Sh NAME
@@ -45,7 +45,6 @@ interface for the following Intel chipse
.It Alder Lake-N
.It Alder Lake-P
.It Alder Lake-S
-.It Baytrail
.It Cannon Lake-H
.It Cannon Lake-LP
.It Cedarfork
@@ -58,14 +57,13 @@ interface for the following Intel chipse
.It Jasper Lake
.It Lakefield
.It Lewisburg
-.It Lynxpoint
.It Raptor Lake-S
.It Sunrisepoint-H
.It Sunrisepoint-LP
.It Tiger Lake-H
.It Tiger Lake-LP
.El
-Support for Broxton and Cherryview is not enabled yet.
+Support for Baytrail, Broxton, Cherryview and Lynxpoint are not enabled yet.
.Pp
The driver supports
.Dv GPIO_PIN_INPUT ,
Index: src/sys/dev/acpi/igpio_acpi.c
diff -u src/sys/dev/acpi/igpio_acpi.c:1.1 src/sys/dev/acpi/igpio_acpi.c:1.1.4.1
--- src/sys/dev/acpi/igpio_acpi.c:1.1 Thu Mar 24 02:24:25 2022
+++ src/sys/dev/acpi/igpio_acpi.c Sun Mar 12 17:52:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: igpio_acpi.c,v 1.1 2022/03/24 02:24:25 manu Exp $ */
+/* $NetBSD: igpio_acpi.c,v 1.1.4.1 2023/03/12 17:52:13 martin Exp $ */
/*-
* Copyright (c) 2021,2022 Emmanuel Dreyfus
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igpio_acpi.c,v 1.1 2022/03/24 02:24:25 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igpio_acpi.c,v 1.1.4.1 2023/03/12 17:52:13 martin Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -62,10 +62,6 @@ static int igpio_acpi_intr(void *);
CFATTACH_DECL_NEW(igpio_acpi, sizeof(struct igpio_acpi_softc), igpio_acpi_match, igpio_acpi_attach, igpio_acpi_detach, NULL);
static const struct device_compatible_entry compat_data[] = {
- { .compat = "INT33B2" }, /* baytrail */
- { .compat = "INT33C7" }, /* lynxpoint */
- { .compat = "INT33FC" }, /* baytrail */
- { .compat = "INT3437" }, /* lynxpoint */
{ .compat = "INT344B" }, /* sunrisepoint */
{ .compat = "INT3450" }, /* cannonlake */
{ .compat = "INT3451" }, /* sunrisepoint */
@@ -89,6 +85,10 @@ static const struct device_compatible_en
* Complete bank setup in src/sys/dev/ic/igpioreg.h
* before enabling
*/
+ { .compat = "INT33B2" }, /* baytrail */
+ { .compat = "INT33C7" }, /* lynxpoint */
+ { .compat = "INT33FC" }, /* baytrail */
+ { .compat = "INT3437" }, /* lynxpoint */
{ .compat = "INT3452" }, /* broxton */
{ .compat = "INT34D1" }, /* broxton */
{ .compat = "apollolake-pinctrl" }, /* broxton */
