From: kevlo <kevlo@openbsd.org>
Date: Thu, 23 May 2024 08:06:22 +0000 (+0000)
Subject: Add support for Quectel EM060K.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a9c8241feb9bc777e8235f02d63bf53348d36b9a;p=openbsd

Add support for Quectel EM060K.
The Quectel EM060K is set by default to MBIM mode.

Tested by Shawn Chiou
ok jsg@
---

diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4
index c51a1134677..c7ff19e1644 100644
--- a/share/man/man4/umb.4
+++ b/share/man/man4/umb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: umb.4,v 1.18 2024/04/15 06:12:46 jmc Exp $
+.\"	$OpenBSD: umb.4,v 1.19 2024/05/23 08:06:22 kevlo Exp $
 .\"
 .\" Copyright (c) 2016 genua mbH
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 15 2024 $
+.Dd $Mdocdate: May 23 2024 $
 .Dt UMB 4
 .Os
 .Sh NAME
@@ -56,6 +56,7 @@ The following devices should work:
 .\" .It Huawei ME906s -- attaches but needs more work
 .It Medion Mobile S4222 (MediaTek OEM)
 .It Quectel EC25
+.It Quectel EM060K
 .It Quectel RM500Q
 .It SIMCom SIM7600
 .It SIMCom SIM8262E-M2
diff --git a/share/man/man4/umsm.4 b/share/man/man4/umsm.4
index 2c0a9f87fd6..3f7d93e6360 100644
--- a/share/man/man4/umsm.4
+++ b/share/man/man4/umsm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: umsm.4,v 1.96 2021/05/18 14:23:03 kevlo Exp $
+.\"	$OpenBSD: umsm.4,v 1.97 2024/05/23 08:06:22 kevlo Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 18 2021 $
+.Dd $Mdocdate: May 23 2024 $
 .Dt UMSM 4
 .Os
 .Sh NAME
@@ -101,6 +101,7 @@ driver:
 .It Li "Option iCON 505" Ta "USB"
 .It Li "Option GlobeTrotter HSUPA 380E" Ta "PCI Express Mini Card"
 .It Li "Quectel EC25" Ta "PCI Express Mini Card"
+.It Li "Quectel EM060K" Ta "M.2"
 .It Li "Sierra Wireless MC8755" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8775" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8790" Ta "PCI Express Mini Card"
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index b778280765e..35f849b4b7f 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.126 2024/05/23 03:21:09 jsg Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.127 2024/05/23 08:06:22 kevlo Exp $	*/
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -177,6 +177,7 @@ static const struct umsm_type umsm_devs[] = {
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG95 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_BG96 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG06 }, 0},
+	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EM060K }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG15 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG35 }, 0},
 	{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG520R }, 0},
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 1cff0f87573..92293fb58fa 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.764 2024/05/21 07:13:29 jsg Exp $
+$OpenBSD: usbdevs,v 1.765 2024/05/23 08:06:22 kevlo Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -3726,6 +3726,7 @@ product QUECTEL EG91		0x0191	EG91
 product QUECTEL EG95		0x0195	EG95
 product QUECTEL BG96		0x0296	BG96
 product QUECTEL EG06		0x0306	EG06/EP06/EM06
+product QUECTEL EM060K		0x030b	EM060K
 product QUECTEL AG15		0x0415	AG15
 product QUECTEL AG35		0x0435	AG35
 product QUECTEL AG520R		0x0452	AG520R