Author: manu
Date: Tue Dec 26 16:50:49 2017
New Revision: 327216
URL: https://svnweb.freebsd.org/changeset/base/327216

Log:
  man4: Move back allwinner man page to share/man/man4
  
  But only install them for arm or aarch64 since they are used on both arch.

Added:
  head/share/man/man4/aw_gpio.4
     - copied unchanged from r327215, head/share/man/man4/man4.arm/aw_gpio.4
  head/share/man/man4/aw_mmc.4
     - copied unchanged from r327215, head/share/man/man4/man4.arm/aw_mmc.4
  head/share/man/man4/aw_rtc.4
     - copied unchanged from r327215, head/share/man/man4/man4.arm/aw_rtc.4
Deleted:
  head/share/man/man4/man4.arm/aw_gpio.4
  head/share/man/man4/man4.arm/aw_mmc.4
  head/share/man/man4/man4.arm/aw_rtc.4
Modified:
  head/share/man/man4/Makefile
  head/share/man/man4/man4.arm/Makefile

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile        Tue Dec 26 16:38:04 2017        
(r327215)
+++ head/share/man/man4/Makefile        Tue Dec 26 16:50:49 2017        
(r327216)
@@ -70,6 +70,9 @@ MAN=  aac.4 \
        audit.4 \
        auditpipe.4 \
        aue.4 \
+       ${_aw_gpio.4} \
+       ${_aw_mmc.4} \
+       ${_aw_rtc.4} \
        axe.4 \
        axge.4 \
        bce.4 \
@@ -754,6 +757,12 @@ MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 _armv8crypto.4=        armv8crypto.4
+.endif
+
+.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64"
+_aw_gpio.4=    aw_gpio.4
+_aw_mmc.4=     aw_mmc.4
+_aw_rtc.4=     aw_rtc.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"

Copied: head/share/man/man4/aw_gpio.4 (from r327215, 
head/share/man/man4/man4.arm/aw_gpio.4)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/man/man4/aw_gpio.4       Tue Dec 26 16:50:49 2017        
(r327216, copy of r327215, head/share/man/man4/man4.arm/aw_gpio.4)
@@ -0,0 +1,102 @@
+.\"-
+.\" Copyright (c) 2017 Emmanuel Vadot <m...@freebsd.org>
+.\" 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 Dec 25, 2017
+.Dt AW_GPIO 4
+.Os
+.Sh NAME
+.Nm aw_gpio
+.Nd driver for the GPIO and pin muxing functionalities on Allwinner SoC
+.Sh SYNOPSIS
+.Cd "device gpio"
+.Cd "options SOC_ALLWINNER_A10"
+.Cd "options SOC_ALLWINNER_A13"
+.Cd "options SOC_ALLWINNER_A20"
+.Cd "options SOC_ALLWINNER_A31"
+.Cd "options SOC_ALLWINNER_A31S"
+.Cd "options SOC_ALLWINNER_A33"
+.Cd "options SOC_ALLWINNER_A83T"
+.Cd "options SOC_ALLWINNER_H2PLUS"
+.Cd "options SOC_ALLWINNER_H3"
+.Cd "options SOC_ALLWINNER_A64"
+.Cd "options SOC_ALLWINNER_H5"
+.Sh DESCRIPTION
+The
+.Nm
+device driver provides support for the Allwinner pin muxing and GPIO on
+Allwinner SoCs.
+.Sh HARDWARE
+The current version of the
+.Nm
+driver supports the GPIO/pinmuxing controller with one of the following
+compatible strings :
+.Pp
+.Bl -bullet -compact
+.It
+allwinner,sun4i-a10-pinctrl
+.It
+allwinner,sun5i-a13-pinctrl
+.It
+allwinner,sun7i-a20-pinctrl
+.It
+allwinner,sun6i-a31-pinctrl
+.It
+allwinner,sun6i-a31s-pinctrl
+.It
+allwinner,sun6i-a31-r-pinctrl
+.It
+allwinner,sun6i-a33-pinctrl
+.It
+allwinner,sun8i-a83t-pinctrl
+.It
+allwinner,sun8i-a83t-r-pinctrl
+.It
+allwinner,sun8i-h3-pinctrl
+.It
+allwinner,sun50i-h5-pinctrl
+.It
+allwinner,sun8i-h3-r-pinctrl
+.It
+allwinner,sun50i-a64-pinctrl
+.It
+allwinner,sun50i-a64-r-pinctrl
+.El
+.Sh SEE ALSO
+.Xr fdt 4 ,
+.Xr gpio 4
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+device driver was originally written by
+.An Ganbold Tsagaankhuu Aq Mt ganb...@freebsd.org .
+This manual page was written by
+.An Emmanuel Vadot Aq Mt m...@freebsd.org .

Copied: head/share/man/man4/aw_mmc.4 (from r327215, 
head/share/man/man4/man4.arm/aw_mmc.4)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/man/man4/aw_mmc.4        Tue Dec 26 16:50:49 2017        
(r327216, copy of r327215, head/share/man/man4/man4.arm/aw_mmc.4)
@@ -0,0 +1,76 @@
+.\"-
+.\" Copyright (c) 2017 Emmanuel Vadot <m...@freebsd.org>
+.\" 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 Dec 25, 2017
+.Dt AW_MMC 4
+.Os
+.Sh NAME
+.Nm aw_mmc
+.Nd driver for the SD/MMC controller in Allwinner SoC
+.Sh SYNOPSIS
+.Cd "device mmc"
+.Sh DESCRIPTION
+The
+.Nm
+device driver provides support for the Allwinner SD/MMC host controller.
+.Sh HARDWARE
+The current version of the
+.Nm
+driver supports the SD/MMC controller with one of the following compatible 
strings :
+.Pp
+.Bl -bullet -compact
+.It
+allwinner,sun4i-a10-mmc
+.It
+allwinner,sun5i-a13-mmc
+.It
+allwinner,sun7i-a20-mmc
+.It
+allwinner,sun50i-a64-mmc
+.El
+.Sh SYSCTL VARIABLES
+The following read-only variables are available via
+.Xr sysctl 8 :
+.Bl -tag -width indent
+.It Va dev.aw_mmc.req_timeout
+Request timeout in seconds (default: 10) .
+.El
+.Sh SEE ALSO
+.Xr fdt 4 ,
+.Xr mmc 4
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+device driver was originally written by
+.An Alexander Fedorov Aq Mt alexander.fedo...@rtlservice.com .
+Later work and this manual page was done by
+.An Emmanuel Vadot Aq Mt m...@freebsd.org .

Copied: head/share/man/man4/aw_rtc.4 (from r327215, 
head/share/man/man4/man4.arm/aw_rtc.4)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/share/man/man4/aw_rtc.4        Tue Dec 26 16:50:49 2017        
(r327216, copy of r327215, head/share/man/man4/man4.arm/aw_rtc.4)
@@ -0,0 +1,63 @@
+.\"-
+.\" Copyright (c) 2017 Emmanuel Vadot <m...@freebsd.org>
+.\" 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 Dec 25, 2017
+.Dt AW_RTC 4
+.Os
+.Sh NAME
+.Nm aw_rtc
+.Nd driver for the RTC controller in Allwinner SoC
+.Sh DESCRIPTION
+The
+.Nm
+device driver provides support for the Allwinner RTC controller.
+.Sh HARDWARE
+The current version of the
+.Nm
+driver supports the RTC controller with one of the following compatible
+strings :
+.Pp
+.Bl -bullet -compact
+.It
+allwinner,sun4i-a10-rtc
+.It
+allwinner,sun7i-a20-rtc
+.It
+allwinner,sun6i-a31-rtc
+.El
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+The
+.Nm
+device driver was written by
+.An Vladimir Belian Aq Mt fat...@gmail.com .
+This manual page was written by
+.An Emmanuel Vadot Aq Mt m...@freebsd.org .

Modified: head/share/man/man4/man4.arm/Makefile
==============================================================================
--- head/share/man/man4/man4.arm/Makefile       Tue Dec 26 16:38:04 2017        
(r327215)
+++ head/share/man/man4/man4.arm/Makefile       Tue Dec 26 16:50:49 2017        
(r327216)
@@ -2,10 +2,7 @@
 
 PACKAGE=runtime-manuals
 
-MAN=   aw_gpio.4 \
-       aw_mmc.4 \
-       aw_rtc.4 \
-       cgem.4 \
+MAN=   cgem.4 \
        devcfg.4 \
        mge.4 \
        npe.4 \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to