SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-20 01:49:10 +00:00
parent efaa6fdefb
commit e1c03975e3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
6 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/acpi/qciic.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: qciic.c,v 1.5 2022/11/06 15:36:13 patrick Exp $ */
/* $OpenBSD: qciic.c,v 1.6 2024/06/19 21:27:22 patrick Exp $ */
/*
* Copyright (c) 2022 Mark Kettenis <kettenis@openbsd.org>
*
@ -107,6 +107,7 @@ int qciic_acpi_found_ihidev(struct qciic_softc *,
const char *qciic_hids[] = {
"QCOM0610",
"QCOM0811",
"QCOM0C10",
NULL
};

10
sys/dev/acpi/xhci_acpi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: xhci_acpi.c,v 1.11 2022/10/30 15:34:54 patrick Exp $ */
/* $OpenBSD: xhci_acpi.c,v 1.12 2024/06/19 21:31:10 patrick Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
*
@ -62,6 +62,9 @@ const char *xhci_hids[] = {
"QCOM0826", /* SC7180 USB */
"QCOM24B6", /* SDM850 URS */
"QCOM24B7",
"QCOM0C8B", /* X1E80100 URS */
"QCOM0C8C",
"QCOM0D07",
NULL
};
@ -108,7 +111,10 @@ xhci_acpi_attach(struct device *parent, struct device *self, void *aux)
strcmp(aaa->aaa_dev, "QCOM068B") == 0 ||
strcmp(aaa->aaa_dev, "QCOM068C") == 0 ||
strcmp(aaa->aaa_dev, "QCOM24B6") == 0 ||
strcmp(aaa->aaa_dev, "QCOM24B7") == 0) {
strcmp(aaa->aaa_dev, "QCOM24B7") == 0 ||
strcmp(aaa->aaa_dev, "QCOM0C8B") == 0 ||
strcmp(aaa->aaa_dev, "QCOM0C8C") == 0 ||
strcmp(aaa->aaa_dev, "QCOM0D07") == 0) {
SIMPLEQ_FOREACH(node, &sc->sc_node->son, sib) {
if (strncmp(node->name, "USB", 3) == 0) {
aaa->aaa_node = node;