svn commit: r331832 - in stable/11: share/man/man4 sys/conf sys/dev/gpio sys/modules sys/modules/chvgpio

Fri Mar 30 23:31:10 UTC 2018

Author: gonzo
Date: Fri Mar 30 23:31:08 2018
New Revision: 331832
URL: https://svnweb.freebsd.org/changeset/base/331832

Log:
  MFC r329832, r329926
  
  r329832:
  [chvgpio] add GPIO driver for Intel Z8xxx SoC family
  
  Add chvgpio(4) driver for Intel Z8xxx SoC family. This product
  was formerly known as Cherry Trail but Linux and OpenBSD drivers
  refer to it as Cherry View. This driver is derived from OpenBSD
  one so the name is kept for alignment with another BSD system.
  
  Submitted by:	Tom Jones <tj at enoti.me>
  Reviewed by:	gonzo, wblock(man page)
  Differential Revision:	https://reviews.freebsd.org/D13086
  
  r329926:
  Add SPDX tags for chvgpio driver sources
  
  Also move $FreeBSD$ keyword in header to BSD license

Added:
  stable/11/share/man/man4/chvgpio.4
     - copied unchanged from r329832, head/share/man/man4/chvgpio.4
  stable/11/sys/dev/gpio/chvgpio.c
     - copied, changed from r329832, head/sys/dev/gpio/chvgpio.c
  stable/11/sys/dev/gpio/chvgpio_reg.h
     - copied, changed from r329832, head/sys/dev/gpio/chvgpio_reg.h
  stable/11/sys/modules/chvgpio/
     - copied from r329832, head/sys/modules/chvgpio/
Modified:
  stable/11/share/man/man4/Makefile
  stable/11/sys/conf/files.amd64
  stable/11/sys/conf/files.i386
  stable/11/sys/modules/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man4/Makefile
==============================================================================

--- stable/11/share/man/man4/Makefile	Fri Mar 30 21:38:53 2018	(r331831)
+++ stable/11/share/man/man4/Makefile	Fri Mar 30 23:31:08 2018	(r331832)
@@ -87,6 +87,7 @@ MAN=	aac.4 \
 	bwi.4 \
 	bwn.4 \
 	${_bytgpio.4} \
+	${_chvgpio.4} \
 	capsicum.4 \
 	cardbus.4 \
 	carp.4 \
@@ -800,6 +801,7 @@ _amdtemp.4=	amdtemp.4
 _asmc.4=	asmc.4
 _bxe.4=		bxe.4
 _bytgpio.4=	bytgpio.4
+_chvgpio.4=	chvgpio.4
 _coretemp.4=	coretemp.4
 _cpuctl.4=	cpuctl.4
 _dpms.4=	dpms.4

Copied: stable/11/share/man/man4/chvgpio.4 (from r329832, head/share/man/man4/chvgpio.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/share/man/man4/chvgpio.4	Fri Mar 30 23:31:08 2018	(r331832, copy of r329832, head/share/man/man4/chvgpio.4)
@@ -0,0 +1,65 @@
+.\" Copyright (c) 2017
+.\"	Tom Jones <tj at enoti.me>  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 17, 2017
+.Dt CHVGPIO 4
+.Os
+.Sh NAME
+.Nm chvgpio
+.Nd Intel Cherry View SoC GPIO controller
+.Sh SYNOPSIS
+.Cd "device gpio"
+.Cd "device chvgpio"
+.Sh DESCRIPTION
+.Nm
+supports the GPIO controller that can be found in Intel's Cherry View SoC
+family.
+.Pp
+The Cherry View SoC has 5 banks of GPIO pins, NORTH, EAST, SOUTHEAST, SOUTHWEST
+and VIRTUAL.
+All but VIRTUAL are exposed to userland as
+.Pa /dev/gpiocN ,
+where N is 0-3.
+Pins in each bank are pre-named to match names in the Intel® Atom™ Z8000
+Processor Series Vol 2
+.Sh SEE ALSO
+.Xr gpio 3 ,
+.Xr gpio 4 ,
+.Xr gpioctl 8
+.Rs
+.%T Intel® Atom™ Z8000 Processor Series Vol 1
+.Re
+.Rs
+.%T Intel® Atom™ Z8000 Processor Series Vol 2
+.Re
+.Sh HISTORY
+The
+.Nm
+manual page first appeared in
+.Fx 12 .
+.Sh AUTHORS
+This driver and man page were written by
+.An Tom Jones Aq Mt tj at enoti.me .

Modified: stable/11/sys/conf/files.amd64
==============================================================================
--- stable/11/sys/conf/files.amd64	Fri Mar 30 21:38:53 2018	(r331831)
+++ stable/11/sys/conf/files.amd64	Fri Mar 30 23:31:08 2018	(r331832)
@@ -279,6 +279,7 @@ dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
 dev/gpio/bytgpio.c		optional	bytgpio
+dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx

Modified: stable/11/sys/conf/files.i386
==============================================================================
--- stable/11/sys/conf/files.i386	Fri Mar 30 21:38:53 2018	(r331831)
+++ stable/11/sys/conf/files.i386	Fri Mar 30 23:31:08 2018	(r331832)
@@ -227,6 +227,7 @@ dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
 dev/gpio/bytgpio.c		optional	bytgpio
+dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional hpt27xx
 dev/hpt27xx/hpt27xx_osm_bsd.c	optional hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional hpt27xx

Copied and modified: stable/11/sys/dev/gpio/chvgpio.c (from r329832, head/sys/dev/gpio/chvgpio.c)
==============================================================================
--- head/sys/dev/gpio/chvgpio.c	Thu Feb 22 19:12:32 2018	(r329832, copy source)
+++ stable/11/sys/dev/gpio/chvgpio.c	Fri Mar 30 23:31:08 2018	(r331832)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Tom Jones <tj at enoti.me>
  * All rights reserved.
  *

Copied and modified: stable/11/sys/dev/gpio/chvgpio_reg.h (from r329832, head/sys/dev/gpio/chvgpio_reg.h)
==============================================================================
--- head/sys/dev/gpio/chvgpio_reg.h	Thu Feb 22 19:12:32 2018	(r329832, copy source)
+++ stable/11/sys/dev/gpio/chvgpio_reg.h	Fri Mar 30 23:31:08 2018	(r331832)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2017 Tom Jones <tj at enoti.me>
  * All rights reserved.
  *
@@ -23,6 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * $FreeBSD$
  */
 
 /*
@@ -40,7 +43,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $FreeBSD$
  */
 
 

Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Fri Mar 30 21:38:53 2018	(r331831)
+++ stable/11/sys/modules/Makefile	Fri Mar 30 23:31:08 2018	(r331832)
@@ -64,6 +64,7 @@ SUBDIR=	\
 	bwn \
 	bwn_pci \
 	${_bytgpio} \
+	${_chvgpio} \
 	cam \
 	${_canbepm} \
 	${_canbus} \
@@ -637,6 +638,7 @@ _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
 _bytgpio=	bytgpio
+_chvgpio=	chvgpio
 _ciss=		ciss
 _chromebook_platform=	chromebook_platform
 _cmx=		cmx
