summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-11-20 15:13:10 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-11-20 15:13:10 +0000
commite4b130d4e5a3b7a9f2cc3caeb4358da1ebbefe9b (patch)
tree1d6e4f05c984587c4157b83ebe1e26332226ec9d
parent9ac77d72cc302a4894063c1c37a262f7b1aa3267 (diff)
Fix the product code of the Unifi Security Gateway.
Prompted by Justin Hibbits
-rw-r--r--sys/arch/octeon/dev/cn30xxgmx.c4
-rw-r--r--sys/arch/octeon/dev/cn30xxsmi.c4
-rw-r--r--sys/arch/octeon/dev/octrtc.c4
-rw-r--r--sys/arch/octeon/include/octeonvar.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index 53b65541e06..fb5c2a05bf2 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxgmx.c,v 1.39 2017/11/18 04:59:27 visa Exp $ */
+/* $OpenBSD: cn30xxgmx.c,v 1.40 2017/11/20 15:13:08 visa Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -1114,7 +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:
+ case BOARD_TYPE_UBIQUITI_E120:
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 a37c657cb99..afa10958e54 100644
--- a/sys/arch/octeon/dev/cn30xxsmi.c
+++ b/sys/arch/octeon/dev/cn30xxsmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxsmi.c,v 1.5 2017/11/18 04:59:27 visa Exp $ */
+/* $OpenBSD: cn30xxsmi.c,v 1.6 2017/11/20 15:13:09 visa Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -181,7 +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:
+ case BOARD_TYPE_UBIQUITI_E120:
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 40487a05400..2f2773c8733 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: octrtc.c,v 1.9 2017/11/18 04:59:27 visa Exp $ */
+/* $OpenBSD: octrtc.c,v 1.10 2017/11/20 15:13:09 visa Exp $ */
/*
* Copyright (c) 2013, 2014 Paul Irofti.
@@ -77,7 +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_E120,
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 df21f08b389..6d6b7e1285d 100644
--- a/sys/arch/octeon/include/octeonvar.h
+++ b/sys/arch/octeon/include/octeonvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: octeonvar.h,v 1.42 2017/11/18 04:59:27 visa Exp $ */
+/* $OpenBSD: octeonvar.h,v 1.43 2017/11/20 15:13:09 visa Exp $ */
/* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */
/*-
@@ -166,7 +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_E120 20004
#define BOARD_TYPE_UBIQUITI_E1000 20010
#define BOARD_TYPE_RHINOLABS_SHASTA 20012
#define BOARD_TYPE_DSR_500 20015