From bba8d13ed99581fa26522dc7bdf07a39d68ed5b4 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 5 Jul 2013 23:10:02 +0000
Subject: [PATCH] Add PCI IDs for HighPoint RocketRAID 4521, 3620, 3622 and
 3640 controllers.  Update the hptiop(4) manual page to reflect this as well
 as mentioning that some cards are already end-of-life.

Many thanks to Highpoint for providing this driver update.

MFC after:	1 day
---
 share/man/man4/hptiop.4 | 18 +++++++++++++++++-
 sys/dev/hptiop/hptiop.c |  6 +++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4
index ea963dd1248..c1017f1f449 100644
--- a/share/man/man4/hptiop.4
+++ b/share/man/man4/hptiop.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 2012
+.Dd July 5, 2013
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -60,6 +60,8 @@ driver supports the following SAS and SATA RAID controllers:
 .It
 HighPoint RocketRAID 4522
 .It
+HighPoint RocketRAID 4521
+.It
 HighPoint RocketRAID 4520
 .It
 HighPoint RocketRAID 4322
@@ -72,6 +74,20 @@ HighPoint RocketRAID 4311
 .It
 HighPoint RocketRAID 4310
 .It
+HighPoint RocketRAID 3640
+.It
+HighPoint RocketRAID 3622
+.It
+HighPoint RocketRAID 3620
+.El
+.Pp
+The
+.Nm
+driver also supports the following SAS and SATA RAID controllers that
+are already End-of-Life:
+.Pp
+.Bl -bullet -compact
+.It
 HighPoint RocketRAID 4211
 .It
 HighPoint RocketRAID 4210
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 8ded4367e1d..50a9c43e754 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/hptiop/hptiop.h>
 
 static const char driver_name[] = "hptiop";
-static const char driver_version[] = "v1.8";
+static const char driver_version[] = "v1.9";
 
 static devclass_t hptiop_devclass;
 
@@ -1821,8 +1821,12 @@ static int hptiop_probe(device_t dev)
 
 	switch (id) {
 		case 0x4520:
+		case 0x4521:
 		case 0x4522:
 			sas = 1;
+		case 0x3620:
+		case 0x3622:
+		case 0x3640:
 			ops = &hptiop_mvfrey_ops;
 			break;
 		case 0x4210: