summaryrefslogtreecommitdiff
path: root/sys/arch/octeon
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-11-18 04:59:28 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-11-18 04:59:28 +0000
commit04f4fd76477f9bee6e88b2aa82a9c46a51f80f39 (patch)
tree9935138ac63e8c8ae00028da5c0eb13af341b64f /sys/arch/octeon
parent0cee7345e3961e7ba697c89781480b70b1b12ff6 (diff)
Add the board ID for the Ubiquiti Unifi Security Gateway.
From Justin Hibbits, thanks!
Diffstat (limited to 'sys/arch/octeon')
-rw-r--r--sys/arch/octeon/dev/cn30xxgmx.c3
-rw-r--r--sys/arch/octeon/dev/cn30xxsmi.c3
-rw-r--r--sys/arch/octeon/dev/octrtc.c3
-rw-r--r--sys/arch/octeon/include/octeonvar.h3
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index 54af0427f82..53b65541e06 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxgmx.c,v 1.38 2017/11/05 04:57:28 visa Exp $ */
+/* $OpenBSD: cn30xxgmx.c,v 1.39 2017/11/18 04:59:27 visa Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -1114,6 +1114,7 @@ cn30xxgmx_rgmii_timing(struct cn30xxgmx_port_softc *sc)
clk_rx_setting = 24;
break;
case BOARD_TYPE_UBIQUITI_E100:
+ case BOARD_TYPE_UBIQUITI_E110:
clk_tx_setting = 16;
clk_rx_setting = 0;
break;
diff --git a/sys/arch/octeon/dev/cn30xxsmi.c b/sys/arch/octeon/dev/cn30xxsmi.c
index 9b128cc015a..a37c657cb99 100644
--- a/sys/arch/octeon/dev/cn30xxsmi.c
+++ b/sys/arch/octeon/dev/cn30xxsmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxsmi.c,v 1.4 2017/05/02 13:26:49 visa Exp $ */
+/* $OpenBSD: cn30xxsmi.c,v 1.5 2017/11/18 04:59:27 visa Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -181,6 +181,7 @@ cn30xxsmi_get_phy(int phandle, int port, struct cn30xxsmi_softc **psmi,
switch (octeon_boot_info->board_type) {
case BOARD_TYPE_UBIQUITI_E100:
+ case BOARD_TYPE_UBIQUITI_E110:
if (port > 2)
return ENOENT;
reg = 7 - port;
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c
index 804cbbba7c7..40487a05400 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: octrtc.c,v 1.8 2017/07/29 02:50:17 visa Exp $ */
+/* $OpenBSD: octrtc.c,v 1.9 2017/11/18 04:59:27 visa Exp $ */
/*
* Copyright (c) 2013, 2014 Paul Irofti.
@@ -77,6 +77,7 @@ union mio_tws_sw_twsi_reg {
static const uint16_t no_rtc_boards[] = {
BOARD_TYPE_UBIQUITI_E100,
+ BOARD_TYPE_UBIQUITI_E110,
BOARD_TYPE_UBIQUITI_E200,
BOARD_TYPE_UBIQUITI_E300,
BOARD_TYPE_UBIQUITI_E1000,
diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h
index ab33e4557c5..df21f08b389 100644
--- a/sys/arch/octeon/include/octeonvar.h
+++ b/sys/arch/octeon/include/octeonvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: octeonvar.h,v 1.41 2017/11/05 04:59:09 visa Exp $ */
+/* $OpenBSD: octeonvar.h,v 1.42 2017/11/18 04:59:27 visa Exp $ */
/* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */
/*-
@@ -166,6 +166,7 @@ struct octeon_fau_map {
#define BOARD_TYPE_CN3010_EVB_HS5 11
#define BOARD_TYPE_UBIQUITI_E100 20002
#define BOARD_TYPE_UBIQUITI_E200 20003
+#define BOARD_TYPE_UBIQUITI_E110 20004
#define BOARD_TYPE_UBIQUITI_E1000 20010
#define BOARD_TYPE_RHINOLABS_SHASTA 20012
#define BOARD_TYPE_DSR_500 20015