Permalink
Browse files

Add PCI attachment for dwiic(4) needed by Intel 100 Series machines

ok kettenis
  • Loading branch information...
jcs committed Nov 16, 2017
1 parent fd40c22 commit c6df0db74e0e302c12da7a4090c915ff4b90126e
View
@@ -1,4 +1,4 @@
.\" $OpenBSD: dwiic.4,v 1.2 2016/07/30 15:44:45 jcs Exp $
.\" $OpenBSD: dwiic.4,v 1.3 2017/11/16 18:12:27 jcs Exp $
.\"
.\" Copyright (c) 2016 Jonathan Gray <jsg@openbsd.org>
.\"
@@ -14,14 +14,15 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: July 30 2016 $
.Dd $Mdocdate: November 16 2017 $
.Dt DWIIC 4
.Os
.Sh NAME
.Nm dwiic
.Nd Synopsys DesignWare I2C controller
.Sh SYNOPSIS
.Cd "dwiic* at acpi?"
.Cd "dwiic* at pci?"
.Cd "iic* at dwiic?"
.Sh DESCRIPTION
The
@@ -33,6 +34,7 @@ framework.
.Sh SEE ALSO
.Xr acpi 4 ,
.Xr iic 4
.Xr pci 4
.Sh HISTORY
The
.Nm
@@ -1,4 +1,4 @@
# $OpenBSD: GENERIC,v 1.447 2017/10/28 01:37:52 yasuoka Exp $
# $OpenBSD: GENERIC,v 1.448 2017/11/16 18:12:27 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -135,6 +135,7 @@ iic* at nviic?
amdpm* at pci? # AMD-7xx/8111 and NForce SMBus controller
iic* at amdpm?
dwiic* at acpi? # DesignWare Synopsys i2c controller
dwiic* at pci?
iic* at dwiic?
itherm* at pci? # Intel 3400 Thermal Sensor
@@ -1,4 +1,4 @@
# $OpenBSD: RAMDISK_CD,v 1.168 2017/06/14 22:35:43 mikeb Exp $
# $OpenBSD: RAMDISK_CD,v 1.169 2017/11/16 18:12:27 jcs Exp $
machine amd64
maxusers 4
@@ -72,6 +72,7 @@ pci* at pchb?
#pcib* at pci? # PCI-ISA bridge
dwiic* at acpi?
dwiic* at pci?
iic* at dwiic?
ihidev* at iic?
View
@@ -1,4 +1,4 @@
# $OpenBSD: files,v 1.655 2017/11/14 06:46:43 dlg Exp $
# $OpenBSD: files,v 1.656 2017/11/16 18:12:27 jcs Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -524,6 +524,10 @@ file dev/spdmem.c spdmem
device oaic: scsi
file dev/ic/aic6250.c oaic
# Synopsys DesignWare I2C controller
device dwiic: i2cbus
file dev/ic/dwiic.c dwiic
# legitimate pseudo-devices
pseudo-device vnd: disk
pseudo-device rd: disk
View
@@ -1,4 +1,4 @@
/* $OpenBSD: acpi.c,v 1.333 2017/11/14 10:17:13 kettenis Exp $ */
/* $OpenBSD: acpi.c,v 1.334 2017/11/16 18:12:27 jcs Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -71,7 +71,7 @@ int acpi_hasprocfvs;
#define ACPIEN_RETRIES 15
void acpi_pci_match(struct device *, struct pci_attach_args *);
struct aml_node *acpi_pci_match(struct device *, struct pci_attach_args *);
pcireg_t acpi_pci_min_powerstate(pci_chipset_tag_t, pcitag_t);
void acpi_pci_set_powerstate(pci_chipset_tag_t, pcitag_t, int, int);
int acpi_pci_notify(struct aml_node *, int, void *);
@@ -669,7 +669,7 @@ acpi_getpci(struct aml_node *node, void *arg)
return (1);
}
void
struct aml_node *
acpi_pci_match(struct device *dev, struct pci_attach_args *pa)
{
struct acpi_pci *pdev;
@@ -695,7 +695,11 @@ acpi_pci_match(struct device *dev, struct pci_attach_args *pa)
acpi_pci_set_powerstate(pa->pa_pc, pa->pa_tag, state, 0);
aml_register_notify(pdev->node, NULL, acpi_pci_notify, pdev, 0);
return pdev->node;
}
return NULL;
}
pcireg_t
Oops, something went wrong.

0 comments on commit c6df0db

Please sign in to comment.