Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-10]: src Pull up following revision(s) (requested by msaitoh in t...
details: https://anonhg.NetBSD.org/src/rev/6fc45c62bc97
branches: netbsd-10
changeset: 373185:6fc45c62bc97
user: martin <martin%NetBSD.org@localhost>
date: Mon Jan 23 12:15:59 2023 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #53):
sys/dev/ic/igpio.c: revision 1.5
sys/dev/ic/igpioreg.h: revision 1.3
sys/dev/ic/igpioreg.h: revision 1.4
sys/dev/ic/igpioreg.h: revision 1.5
sys/dev/ic/igpioreg.h: revision 1.6
sys/dev/ic/igpioreg.h: revision 1.7
sys/dev/ic/igpioreg.h: revision 1.8
sys/dev/ic/igpiovar.h: revision 1.2
share/man/man4/igpio.4: revision 1.3
Fix entries for Lewisburg.
One more fix for Lewisburg.
Modify comment. Whitespace. No functional change.
Whitespace. No functional change.
Whitespace. No functional change.
Move entries of Alder Lake-S and Tiger Lake-LP. No functional change.
igpio: Update pin definitions.
- Add Ice Lake-N(INT34C3)
- Add Raptor Lake-S(INTC1085).
- Add another Baytrail(INT33FC).
- Modify INTC1057. It was for Tiger Lake-LP and reused for Alder Lake-N.
- Fix pin group definitions for Sunrisepoint-LP, Tiger Lake-LP, Tiger Lake-H,
Alder Lake-P and Lewisburg.
- Modify pin group names for Coffee Lake-S, Sunrisepoint-H, Cannon Lake-LP
and Denverton.
- Add two missing entries to Ice Lake-LP's pin group table.
- Modify comment. INT3455 is Ice Lake-LP.
- Add comment.
igpio.4: Update list of supported devices.
diffstat:
share/man/man4/igpio.4 | 25 +-
sys/dev/ic/igpio.c | 10 +-
sys/dev/ic/igpioreg.h | 573 ++++++++++++++++++++++++++----------------------
sys/dev/ic/igpiovar.h | 4 +-
4 files changed, 330 insertions(+), 282 deletions(-)
diffs (truncated from 819 to 300 lines):
diff -r d79c5acba6a5 -r 6fc45c62bc97 share/man/man4/igpio.4
--- a/share/man/man4/igpio.4 Thu Jan 19 11:00:25 2023 +0000
+++ b/share/man/man4/igpio.4 Mon Jan 23 12:15:59 2023 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: igpio.4,v 1.2 2022/03/24 16:33:58 wiz Exp $
+.\" $NetBSD: igpio.4,v 1.2.2.1 2023/01/23 12:16:00 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 March 24, 2022
+.Dd January 7, 2023
.Dt IGPIO 4
.Os
.Sh NAME
@@ -42,23 +42,28 @@
.Xr gpio 4
interface for the following Intel chipsets:
.Bl -tag -width autoselect -compact
-.It Alderlake
+.It Alder Lake-N
+.It Alder Lake-P
+.It Alder Lake-S
.It Baytrail
-.It Cannonlake-H
-.It Cannonlake-LP
+.It Cannon Lake-H
+.It Cannon Lake-LP
.It Cedarfork
+.It Coffee Lake-S
.It Denverton
.It Emmitsburg
-.It Geminilake
-.It Icelake
-.It Jasperlake
+.It Gemini Lake
+.It Ice Lake-LP
+.It Ice Lake-N
+.It Jasper Lake
.It Lakefield
.It Lewisburg
.It Lynxpoint
+.It Raptor Lake-S
.It Sunrisepoint-H
.It Sunrisepoint-LP
-.It Tigerlake-H
-.It Tigerlake-LP
+.It Tiger Lake-H
+.It Tiger Lake-LP
.El
Support for Broxton and Cherryview is not enabled yet.
.Pp
diff -r d79c5acba6a5 -r 6fc45c62bc97 sys/dev/ic/igpio.c
--- a/sys/dev/ic/igpio.c Thu Jan 19 11:00:25 2023 +0000
+++ b/sys/dev/ic/igpio.c Mon Jan 23 12:15:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: igpio.c,v 1.4 2022/03/26 19:35:56 riastradh Exp $ */
+/* $NetBSD: igpio.c,v 1.4.4.1 2023/01/23 12:15:59 martin Exp $ */
/*
* Copyright (c) 2021,2022 Emmanuel Dreyfus
@@ -301,7 +301,7 @@
DPRINTF(("padbar[%d] = #%x\n", i, ib->ib_padbar));
if (ib->ib_padbar > sc->sc_length[i]) {
printf("PADBAR = #%x higher than max #%lx\n",
- ib->ib_padbar, sc->sc_length[i]);
+ ib->ib_padbar, sc->sc_length[i]);
goto out;
}
@@ -320,7 +320,7 @@
npins = 1 + ibs->ibs_last_pin - ibs->ibs_first_pin;
ib->ib_intr =
- kmem_zalloc(sizeof(*ib->ib_intr) * npins, KM_SLEEP);
+ kmem_zalloc(sizeof(*ib->ib_intr) * npins, KM_SLEEP);
sc->sc_npins += npins;
}
@@ -640,8 +640,8 @@
newval |= IGPIO_PADCFG0_RXEVCFG_EDGE_BOTH;
break;
case GPIO_INTR_NEG_EDGE:
- newval |= IGPIO_PADCFG0_RXEVCFG_EDGE;
- newval |= IGPIO_PADCFG0_RXINV;
+ newval |= IGPIO_PADCFG0_RXEVCFG_EDGE;
+ newval |= IGPIO_PADCFG0_RXINV;
break;
case GPIO_INTR_POS_EDGE:
newval |= IGPIO_PADCFG0_RXEVCFG_EDGE;
diff -r d79c5acba6a5 -r 6fc45c62bc97 sys/dev/ic/igpioreg.h
--- a/sys/dev/ic/igpioreg.h Thu Jan 19 11:00:25 2023 +0000
+++ b/sys/dev/ic/igpioreg.h Mon Jan 23 12:15:59 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: igpioreg.h,v 1.2 2022/03/26 19:35:35 riastradh Exp $ */
+/* $NetBSD: igpioreg.h,v 1.2.4.1 2023/01/23 12:15:59 martin Exp $ */
/*
* Copyright (c) 2021 Emmanuel Dreyfus
@@ -82,8 +82,8 @@
int ibs_barno;
int ibs_first_pin;
int ibs_last_pin;
- int ibs_gpi_is;
- int ibs_gpi_ie;
+ int ibs_gpi_is; /* Interrupt Status */
+ int ibs_gpi_ie; /* Interrupt Enable */
};
struct igpio_pin_group {
@@ -99,7 +99,7 @@
{ "INT344B", 1, 48, 119, 0x100, 0x120 },
{ "INT344B", 2, 120, 151, 0x100, 0x120 },
- /* Sunrisepoint-H */
+ /* Coffee Lake-S (Same as Sunrisepoint-H(INT345D)) */
{ "INT3451", 0, 0, 47, 0x100, 0x120 },
{ "INT3451", 1, 48, 180, 0x100, 0x120 },
{ "INT3451", 2, 181, 191, 0x100, 0x120 },
@@ -117,91 +117,104 @@
{ "INT33C7", 0, 0, 94, 0x000, 0x000 },
{ "INT3437", 0, 0, 94, 0x000, 0x000 },
- /* Cannonlake-H */
+ /* Cannon Lake-H */
{ "INT3450", 0, 0, 50, 0x100, 0x120 },
{ "INT3450", 1, 51, 154, 0x100, 0x120 },
{ "INT3450", 2, 155, 248, 0x100, 0x120 },
{ "INT3450", 3, 249, 298, 0x100, 0x120 },
- /* Cannonlake-LP */
+ /* Cannon Lake-LP */
{ "INT34BB", 0, 0, 67, 0x100, 0x120 },
{ "INT34BB", 1, 68, 180, 0x100, 0x120 },
{ "INT34BB", 2, 181, 243, 0x100, 0x120 },
- /* Alderlake */
- { "INTC1056", 0, 0, 94, 0x200, 0x220 },
- { "INTC1056", 1, 95, 150, 0x200, 0x220 },
- { "INTC1056", 2, 151, 199, 0x200, 0x220 },
- { "INTC1056", 3, 200, 269, 0x200, 0x220 },
- { "INTC1056", 4, 270, 303, 0x200, 0x220 },
-
- /* Icelake */
+ /* Ice Lake-LP */
{ "INT3455", 0, 0, 58, 0x100, 0x110 },
{ "INT3455", 1, 59, 152, 0x100, 0x110 },
{ "INT3455", 2, 153, 215, 0x100, 0x110 },
{ "INT3455", 3, 216, 240, 0x100, 0x110 },
+ /* Ice Lake-N */
+ { "INT34C3", 0, 0, 71, 0x100, 0x120 },
+ { "INT34C3", 1, 72, 174, 0x100, 0x120 },
+ { "INT34C3", 2, 175, 204, 0x100, 0x120 },
+ { "INT34C3", 3, 205, 212, 0x100, 0x120 },
+
/* Lakefield */
{ "INT34C4", 0, 0, 59, 0x100, 0x110 },
{ "INT34C4", 1, 60, 148, 0x100, 0x110 },
{ "INT34C4", 2, 149, 237, 0x100, 0x110 },
{ "INT34C4", 3, 238, 266, 0x100, 0x110 },
- /* Tigerlake-LP */
+ /* Tiger Lake-LP */
{ "INT34C5", 0, 0, 66, 0x100, 0x120 },
{ "INT34C5", 1, 67, 170, 0x100, 0x120 },
{ "INT34C5", 2, 171, 259, 0x100, 0x120 },
{ "INT34C5", 3, 260, 276, 0x100, 0x120 },
- /* Tigerlake-LP */
- { "INTC1055", 0, 0, 66, 0x100, 0x120 },
- { "INTC1055", 1, 67, 170, 0x100, 0x120 },
- { "INTC1055", 2, 171, 259, 0x100, 0x120 },
- { "INTC1055", 3, 260, 276, 0x100, 0x120 },
+ /* Alder Lake-P (Same as Tiger Lake-LP(INT34C5)) */
+ { "INTC1055", 0, 0, 66, 0x100, 0x120 },
+ { "INTC1055", 1, 67, 170, 0x100, 0x120 },
+ { "INTC1055", 2, 171, 259, 0x100, 0x120 },
+ { "INTC1055", 3, 260, 276, 0x100, 0x120 },
- /* Tigerlake-LP */
- { "INTC1057", 0, 0, 66, 0x100, 0x120 },
- { "INTC1057", 1, 67, 170, 0x100, 0x120 },
- { "INTC1057", 2, 171, 259, 0x100, 0x120 },
- { "INTC1057", 3, 260, 276, 0x100, 0x120 },
-
- /* Tigerlake-H */
+ /* Tiger Lake-H */
{ "INT34C6", 0, 0, 78, 0x100, 0x120 },
{ "INT34C6", 1, 79, 180, 0x100, 0x120 },
{ "INT34C6", 2, 181, 217, 0x100, 0x120 },
{ "INT34C6", 3, 218, 266, 0x100, 0x120 },
{ "INT34C6", 4, 267, 290, 0x100, 0x120 },
- /* Jasperlake */
+ /* Jasper Lake */
{ "INT34C8", 0, 0, 91, 0x100, 0x120 },
{ "INT34C8", 1, 92, 194, 0x100, 0x120 },
{ "INT34C8", 2, 195, 224, 0x100, 0x120 },
{ "INT34C8", 3, 225, 232, 0x100, 0x120 },
+ /* Alder Lake-S */
+ { "INTC1056", 0, 0, 94, 0x200, 0x220 },
+ { "INTC1056", 1, 95, 150, 0x200, 0x220 },
+ { "INTC1056", 2, 151, 199, 0x200, 0x220 },
+ { "INTC1056", 3, 200, 269, 0x200, 0x220 },
+ { "INTC1056", 4, 270, 303, 0x200, 0x220 },
+
+ /* Alder Lake-N */
+ { "INTC1057", 0, 0, 66, 0x100, 0x120 },
+ { "INTC1057", 1, 67, 168, 0x100, 0x120 },
+ { "INTC1057", 2, 169, 248, 0x100, 0x120 },
+ { "INTC1057", 3, 249, 256, 0x100, 0x120 },
+
+ /* Raptor Lake-S (Same as Alder Lake-S(INTC1056)) */
+ { "INTC1085", 0, 0, 94, 0x200, 0x220 },
+ { "INTC1085", 1, 95, 150, 0x200, 0x220 },
+ { "INTC1085", 2, 151, 199, 0x200, 0x220 },
+ { "INTC1085", 3, 200, 269, 0x200, 0x220 },
+ { "INTC1085", 4, 270, 303, 0x200, 0x220 },
+
/* Lewisburg */
- { "INT3536", 0, 0, 7, 0x100, 0x110 },
- { "INT3536", 1, 72, 13, 0x100, 0x110 },
- { "INT3536", 3, 133, 14, 0x100, 0x110 },
- { "INT3536", 4, 144, 17, 0x100, 0x110 },
+ { "INT3536", 0, 0, 71, 0x100, 0x110 },
+ { "INT3536", 1, 72, 132, 0x100, 0x110 },
+ { "INT3536", 3, 133, 143, 0x100, 0x110 },
+ { "INT3536", 4, 144, 178, 0x100, 0x110 },
{ "INT3536", 5, 179, 246, 0x100, 0x110 },
/* Emmitsburg */
- { "INTC1071", 0, 0, 65, 0x200, 0x210 },
- { "INTC1071", 1, 66, 111, 0x200, 0x210 },
- { "INTC1071", 2, 112, 145, 0x200, 0x210 },
- { "INTC1071", 3, 146, 183, 0x200, 0x210 },
- { "INTC1071", 4, 184, 261, 0x200, 0x210 },
+ { "INTC1071", 0, 0, 65, 0x200, 0x210 },
+ { "INTC1071", 1, 66, 111, 0x200, 0x210 },
+ { "INTC1071", 2, 112, 145, 0x200, 0x210 },
+ { "INTC1071", 3, 146, 183, 0x200, 0x210 },
+ { "INTC1071", 4, 184, 261, 0x200, 0x210 },
/* Denverton */
- { "INTC3000", 0, 0, 40, 0x100, 0x120 },
- { "INTC3000", 1, 41, 153, 0x100, 0x120 },
+ { "INTC3000", 0, 0, 40, 0x100, 0x120 },
+ { "INTC3000", 1, 41, 153, 0x100, 0x120 },
/* Cedarfork */
- { "INTC3001", 0, 0, 167, 0x200, 0x230 },
- { "INTC3001", 1, 168, 236, 0x200, 0x230 },
+ { "INTC3001", 0, 0, 167, 0x200, 0x230 },
+ { "INTC3001", 1, 168, 236, 0x200, 0x230 },
- /* Geminilake */
- { "INT3453", 0, 0, 34, 0x100, 0x110 },
+ /* Gemini Lake */
+ { "INT3453", 0, 0, 34, 0x100, 0x110 },
#ifdef notyet
/*
@@ -210,267 +223,297 @@
/* Broxton */
{ "apollolake-pinctrl", 0, 0, 0, 0x100, 0x110 },
{ "broxton-pinctrl", 0, 0, 0, 0x100, 0x110 },
- { "INT34D1", 0, 0, 0, 0x100, 0x110 },
- { "INT3452", 0, 0, 0, 0x100, 0x110 },
+ { "INT34D1", 0, 0, 0, 0x100, 0x110 },
+ { "INT3452", 0, 0, 0, 0x100, 0x110 },
/* Cherryview */
- { "INT33FF", 0, 0, 0, 0x000, 0x000 },
+ { "INT33FF", 0, 0, 0, 0x000, 0x000 },
#endif
- { NULL, 0, 0, 0, 0x000, 0x000 },
+ { NULL, 0, 0, 0, 0x000, 0x000 },
};
struct igpio_pin_group igpio_pin_group[] = {
/* Sunrisepoint-LP */
- { "INT344B", 0, 151, "A" },
+ { "INT344B", 0, 0, "GPP_A" },
+ { "INT344B", 1, 24, "GPP_B" },
+ { "INT344B", 0, 48, "GPP_C" },
+ { "INT344B", 1, 72, "GPP_D" },
+ { "INT344B", 2, 96, "GPP_E" },
+ { "INT344B", 0, 120, "GPP_F" },
+
+ /* Coffee Lake-S (Same as Sunrisepoint-H(INT345D)) */
+ { "INT3451", 0, 0, "GPP_A" },
+ { "INT3451", 1, 24, "GPP_B" },
+ { "INT3451", 0, 48, "GPP_C" },
+ { "INT3451", 1, 72, "GPP_D" },
+ { "INT3451", 2, 96, "GPP_E" },
Home |
Main Index |
Thread Index |
Old Index