Index: head/sys/arm/allwinner/clkng/aw_ccung.c
===================================================================
--- head/sys/arm/allwinner/clkng/aw_ccung.c	(revision 324382)
+++ head/sys/arm/allwinner/clkng/aw_ccung.c	(revision 324383)
@@ -1,384 +1,396 @@
 /*-
  * Copyright (c) 2017 Emmanuel Vadot <manu@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 ``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 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$
  */
 
 /*
  * Allwinner Clock Control Unit
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/bus.h>
 
 #include <dev/fdt/simplebus.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <dev/extres/clk/clk.h>
 #include <dev/extres/clk/clk_gate.h>
 
 #include <dev/extres/hwreset/hwreset.h>
 
 #include <arm/allwinner/clkng/aw_ccung.h>
 #include <arm/allwinner/clkng/aw_clk.h>
 
 #ifdef __aarch64__
 #include "opt_soc.h"
 #endif
 
 #if defined(SOC_ALLWINNER_A31)
 #include <arm/allwinner/clkng/ccu_a31.h>
 #endif
 
 #if defined(SOC_ALLWINNER_A64)
 #include <arm/allwinner/clkng/ccu_a64.h>
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
 #endif
 
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 #include <arm/allwinner/clkng/ccu_h3.h>
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
 #endif
 
 #include "clkdev_if.h"
 #include "hwreset_if.h"
 
 static struct resource_spec aw_ccung_spec[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ -1, 0 }
 };
 
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
-#define	H3_CCU	1
+#define	H3_CCU		1
+#define	H3_R_CCU	2
 #endif
 
 #if defined(SOC_ALLWINNER_A31)
-#define	A31_CCU	2
+#define	A31_CCU		3
 #endif
 
 #if defined(SOC_ALLWINNER_A64)
-#define	A64_CCU	2
+#define	A64_CCU		4
+#define	A64_R_CCU	5
 #endif
 
 static struct ofw_compat_data compat_data[] = {
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 	{ "allwinner,sun8i-h3-ccu", H3_CCU },
+	{ "allwinner,sun8i-h3-r-ccu", H3_R_CCU },
 #endif
 #if defined(SOC_ALLWINNER_A31)
 	{ "allwinner,sun6i-a31-ccu", A31_CCU },
 #endif
 #if defined(SOC_ALLWINNER_A64)
 	{ "allwinner,sun50i-a64-ccu", A64_CCU },
+	{ "allwinner,sun50i-a64-r-ccu", A64_R_CCU },
 #endif
 	{NULL, 0 }
 };
 
 #define	CCU_READ4(sc, reg)		bus_read_4((sc)->res, (reg))
 #define	CCU_WRITE4(sc, reg, val)	bus_write_4((sc)->res, (reg), (val))
 
 static int
 aw_ccung_write_4(device_t dev, bus_addr_t addr, uint32_t val)
 {
 	struct aw_ccung_softc *sc;
 
 	sc = device_get_softc(dev);
 	CCU_WRITE4(sc, addr, val);
 	return (0);
 }
 
 static int
 aw_ccung_read_4(device_t dev, bus_addr_t addr, uint32_t *val)
 {
 	struct aw_ccung_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	*val = CCU_READ4(sc, addr);
 	return (0);
 }
 
 static int
 aw_ccung_modify_4(device_t dev, bus_addr_t addr, uint32_t clr, uint32_t set)
 {
 	struct aw_ccung_softc *sc;
 	uint32_t reg;
 
 	sc = device_get_softc(dev);
 
 	reg = CCU_READ4(sc, addr);
 	reg &= ~clr;
 	reg |= set;
 	CCU_WRITE4(sc, addr, reg);
 
 	return (0);
 }
 
 static int
 aw_ccung_reset_assert(device_t dev, intptr_t id, bool reset)
 {
 	struct aw_ccung_softc *sc;
 	uint32_t val;
 
 	sc = device_get_softc(dev);
 
 	if (id >= sc->nresets || sc->resets[id].offset == 0)
 		return (0);
 
 	mtx_lock(&sc->mtx);
 	val = CCU_READ4(sc, sc->resets[id].offset);
 	if (reset)
 		val &= ~(1 << sc->resets[id].shift);
 	else
 		val |= 1 << sc->resets[id].shift;
 	CCU_WRITE4(sc, sc->resets[id].offset, val);
 	mtx_unlock(&sc->mtx);
 
 	return (0);
 }
 
 static int
 aw_ccung_reset_is_asserted(device_t dev, intptr_t id, bool *reset)
 {
 	struct aw_ccung_softc *sc;
 	uint32_t val;
 
 	sc = device_get_softc(dev);
 
 	if (id >= sc->nresets || sc->resets[id].offset == 0)
 		return (0);
 
 	mtx_lock(&sc->mtx);
 	val = CCU_READ4(sc, sc->resets[id].offset);
 	*reset = (val & (1 << sc->resets[id].shift)) != 0 ? false : true;
 	mtx_unlock(&sc->mtx);
 
 	return (0);
 }
 
 static void
 aw_ccung_device_lock(device_t dev)
 {
 	struct aw_ccung_softc *sc;
 
 	sc = device_get_softc(dev);
 	mtx_lock(&sc->mtx);
 }
 
 static void
 aw_ccung_device_unlock(device_t dev)
 {
 	struct aw_ccung_softc *sc;
 
 	sc = device_get_softc(dev);
 	mtx_unlock(&sc->mtx);
 }
 
 static int
 aw_ccung_probe(device_t dev)
 {
 
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
 	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
 		return (ENXIO);
 
 	device_set_desc(dev, "Allwinner Clock Control Unit NG");
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
 aw_ccung_register_gates(struct aw_ccung_softc *sc)
 {
 	struct clk_gate_def def;
 	int i;
 
 	for (i = 0; i < sc->ngates; i++) {
 		if (sc->gates[i].name == NULL)
 			continue;
 		memset(&def, 0, sizeof(def));
 		def.clkdef.id = i;
 		def.clkdef.name = sc->gates[i].name;
 		def.clkdef.parent_names = &sc->gates[i].parent_name;
 		def.clkdef.parent_cnt = 1;
 		def.offset = sc->gates[i].offset;
 		def.shift = sc->gates[i].shift;
 		def.mask = 1;
 		def.on_value = 1;
 		def.off_value = 0;
 		clknode_gate_register(sc->clkdom, &def);
 	}
 
 	return (0);
 }
 
 static void
 aw_ccung_init_clocks(struct aw_ccung_softc *sc)
 {
 	struct clknode *clknode;
 	int i, error;
 
 	for (i = 0; i < sc->n_clk_init; i++) {
 		clknode = clknode_find_by_name(sc->clk_init[i].name);
 		if (clknode == NULL) {
 			device_printf(sc->dev, "Cannot find clock %s\n",
 			    sc->clk_init[i].name);
 			continue;
 		}
 
 		if (sc->clk_init[i].parent_name != NULL) {
 			if (bootverbose)
 				device_printf(sc->dev, "Setting %s as parent for %s\n",
 				    sc->clk_init[i].parent_name,
 				    sc->clk_init[i].name);
 			error = clknode_set_parent_by_name(clknode,
 			    sc->clk_init[i].parent_name);
 			if (error != 0) {
 				device_printf(sc->dev,
 				    "Cannot set parent to %s for %s\n",
 				    sc->clk_init[i].parent_name,
 				    sc->clk_init[i].name);
 				continue;
 			}
 		}
 		if (sc->clk_init[i].default_freq != 0) {
 			error = clknode_set_freq(clknode,
 			    sc->clk_init[i].default_freq, 0 , 0);
 			if (error != 0) {
 				device_printf(sc->dev,
 				    "Cannot set frequency for %s to %ju\n",
 				    sc->clk_init[i].name,
 				    sc->clk_init[i].default_freq);
 				continue;
 			}
 		}
 		if (sc->clk_init[i].enable) {
 			error = clknode_enable(clknode);
 			if (error != 0) {
 				device_printf(sc->dev,
 				    "Cannot enable %s\n",
 				    sc->clk_init[i].name);
 				continue;
 			}
 		}
 	}
 }
 
 static int
 aw_ccung_attach(device_t dev)
 {
 	struct aw_ccung_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 
 	if (bus_alloc_resources(dev, aw_ccung_spec, &sc->res) != 0) {
 		device_printf(dev, "cannot allocate resources for device\n");
 		return (ENXIO);
 	}
 
 	mtx_init(&sc->mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
 
 	sc->clkdom = clkdom_create(dev);
 	if (sc->clkdom == NULL)
 		panic("Cannot create clkdom\n");
 
 	switch (sc->type) {
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 	case H3_CCU:
 		ccu_h3_register_clocks(sc);
 		break;
+	case H3_R_CCU:
+		ccu_sun8i_r_register_clocks(sc);
+		break;
 #endif
 #if defined(SOC_ALLWINNER_A31)
 	case A31_CCU:
 		ccu_a31_register_clocks(sc);
 		break;
 #endif
 #if defined(SOC_ALLWINNER_A64)
 	case A64_CCU:
 		ccu_a64_register_clocks(sc);
+		break;
+	case A64_R_CCU:
+		ccu_sun8i_r_register_clocks(sc);
 		break;
 #endif
 	}
 
 	if (sc->gates)
 		aw_ccung_register_gates(sc);
 	if (clkdom_finit(sc->clkdom) != 0)
 		panic("cannot finalize clkdom initialization\n");
 
 	clkdom_xlock(sc->clkdom);
 	aw_ccung_init_clocks(sc);
 	clkdom_unlock(sc->clkdom);
 
 	if (bootverbose)
 		clkdom_dump(sc->clkdom);
 
 	/* If we have resets, register our self as a reset provider */
 	if (sc->resets)
 		hwreset_register_ofw_provider(dev);
 
 	return (0);
 }
 
 static device_method_t aw_ccung_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		aw_ccung_probe),
 	DEVMETHOD(device_attach,	aw_ccung_attach),
 
 	/* clkdev interface */
 	DEVMETHOD(clkdev_write_4,	aw_ccung_write_4),
 	DEVMETHOD(clkdev_read_4,	aw_ccung_read_4),
 	DEVMETHOD(clkdev_modify_4,	aw_ccung_modify_4),
 	DEVMETHOD(clkdev_device_lock,	aw_ccung_device_lock),
 	DEVMETHOD(clkdev_device_unlock,	aw_ccung_device_unlock),
 
 	/* Reset interface */
 	DEVMETHOD(hwreset_assert,	aw_ccung_reset_assert),
 	DEVMETHOD(hwreset_is_asserted,	aw_ccung_reset_is_asserted),
 
 	DEVMETHOD_END
 };
 
 static driver_t aw_ccung_driver = {
 	"aw_ccung",
 	aw_ccung_methods,
 	sizeof(struct aw_ccung_softc),
 };
 
 static devclass_t aw_ccung_devclass;
 
 EARLY_DRIVER_MODULE(aw_ccung, simplebus, aw_ccung_driver, aw_ccung_devclass,
     0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(aw_ccung, 1);
Index: head/sys/arm/allwinner/clkng/ccu_sun8i_r.c
===================================================================
--- head/sys/arm/allwinner/clkng/ccu_sun8i_r.c	(nonexistent)
+++ head/sys/arm/allwinner/clkng/ccu_sun8i_r.c	(revision 324383)
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 2017 Emmanuel Vadot <manu@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 ``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 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$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <dev/extres/clk/clk_div.h>
+#include <dev/extres/clk/clk_fixed.h>
+#include <dev/extres/clk/clk_mux.h>
+
+#include <arm/allwinner/clkng/aw_ccung.h>
+#include <arm/allwinner/clkng/aw_clk.h>
+#include <arm/allwinner/clkng/aw_clk_nm.h>
+#include <arm/allwinner/clkng/aw_clk_nkmp.h>
+#include <arm/allwinner/clkng/aw_clk_prediv_mux.h>
+
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
+
+#include <gnu/dts/include/dt-bindings/clock/sun8i-r-ccu.h>
+#include <gnu/dts/include/dt-bindings/reset/sun8i-r-ccu.h>
+
+/* Non-exported clocks */
+#define	CLK_AHB0	1
+#define	CLK_APB0	2
+
+static struct aw_ccung_reset ccu_sun8i_r_resets[] = {
+	CCU_RESET(RST_APB0_IR, 0xb0, 1)
+	CCU_RESET(RST_APB0_TIMER, 0xb0, 2)
+	CCU_RESET(RST_APB0_RSB, 0xb0, 4)
+	CCU_RESET(RST_APB0_UART, 0xb0, 6)
+};
+
+static struct aw_ccung_gate ccu_sun8i_r_gates[] = {
+	CCU_GATE(CLK_APB0_PIO, "apb0-pio", "apb0", 0x28, 0)
+	CCU_GATE(CLK_APB0_IR, "apb0-ir", "apb0", 0x28, 1)
+	CCU_GATE(CLK_APB0_TIMER, "apb0-timer", "apb0", 0x28, 2)
+	CCU_GATE(CLK_APB0_RSB, "apb0-rsb", "apb0", 0x28, 3)
+	CCU_GATE(CLK_APB0_UART, "apb0-uart", "apb0", 0x28, 4)
+	CCU_GATE(CLK_APB0_I2C, "apb0-i2c", "apb0", 0x28, 6)
+	CCU_GATE(CLK_APB0_TWD, "apb0-twd", "apb0", 0x28, 7)
+};
+
+static const char *ar100_parents[] = {"osc32k", "osc24M", "pll_periph0", "iosc"};
+PREDIV_CLK(ar100_clk, CLK_AR100,				/* id */
+    "ar100", ar100_parents,					/* name, parents */
+    0x00,							/* offset */
+    16, 2,							/* mux */
+    4, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO,			/* div */
+    8, 5, 0, AW_CLK_FACTOR_HAS_COND,				/* prediv */
+    16, 2, 2);							/* prediv condition */
+
+static const char *ahb0_parents[] = {"ar100"};
+FIXED_CLK(ahb0_clk,
+    CLK_AHB0,			/* id */
+    "ahb0",			/* name */
+    ahb0_parents,		/* parent */
+    0,				/* freq */
+    1,				/* mult */
+    1,				/* div */
+    0);				/* flags */
+
+static const char *apb0_parents[] = {"ahb0"};
+DIV_CLK(apb0_clk,
+    CLK_APB0,			/* id */
+    "apb0", apb0_parents,	/* name, parents */
+    0x0c,			/* offset */
+    0, 2,			/* shift, width */
+    0, NULL);			/* flags, div table */
+
+static struct aw_clk_prediv_mux_def *prediv_mux_clks[] = {
+	&ar100_clk,
+};
+
+static struct clk_div_def *div_clks[] = {
+	&apb0_clk,
+};
+
+static struct clk_fixed_def *fixed_factor_clks[] = {
+	&ahb0_clk,
+};
+
+void
+ccu_sun8i_r_register_clocks(struct aw_ccung_softc *sc)
+{
+	int i;
+
+	sc->resets = ccu_sun8i_r_resets;
+	sc->nresets = nitems(ccu_sun8i_r_resets);
+	sc->gates = ccu_sun8i_r_gates;
+	sc->ngates = nitems(ccu_sun8i_r_gates);
+
+	for (i = 0; i < nitems(prediv_mux_clks); i++)
+		aw_clk_prediv_mux_register(sc->clkdom, prediv_mux_clks[i]);
+	for (i = 0; i < nitems(div_clks); i++)
+		clknode_div_register(sc->clkdom, div_clks[i]);
+	for (i = 0; i < nitems(fixed_factor_clks); i++)
+		clknode_fixed_register(sc->clkdom, fixed_factor_clks[i]);
+}

Property changes on: head/sys/arm/allwinner/clkng/ccu_sun8i_r.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/arm/allwinner/clkng/ccu_sun8i_r.h
===================================================================
--- head/sys/arm/allwinner/clkng/ccu_sun8i_r.h	(nonexistent)
+++ head/sys/arm/allwinner/clkng/ccu_sun8i_r.h	(revision 324383)
@@ -0,0 +1,34 @@
+/*-
+ * Copyright (c) 2017 Emmanuel Vadot <manu@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 ``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 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$
+ */
+
+#ifndef	__CCU_SUN8I_R_H__
+#define __CCU_SUN8I_R_H__
+
+void	ccu_sun8i_r_register_clocks(struct aw_ccung_softc *sc);
+
+#endif /* __CCU_SUN8I_R_H__ */

Property changes on: head/sys/arm/allwinner/clkng/ccu_sun8i_r.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/arm/allwinner/h3/files.h3
===================================================================
--- head/sys/arm/allwinner/h3/files.h3	(revision 324382)
+++ head/sys/arm/allwinner/h3/files.h3	(revision 324383)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 arm/allwinner/clkng/ccu_h3.c		standard
+arm/allwinner/clkng/ccu_sun8i_r.c	standard
 arm/allwinner/h3/h3_padconf.c		standard
 arm/allwinner/h3/h3_r_padconf.c		standard
Index: head/sys/conf/files.arm64
===================================================================
--- head/sys/conf/files.arm64	(revision 324382)
+++ head/sys/conf/files.arm64	(revision 324383)
@@ -1,213 +1,214 @@
 # $FreeBSD$
 cloudabi64_vdso.o		optional	compat_cloudabi64	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_aarch64.S"	\
 	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_aarch64.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi64_vdso.o"
 #
 cloudabi64_vdso_blob.o		optional	compat_cloudabi64	\
 	dependency 	"cloudabi64_vdso.o"			\
 	compile-with	"${OBJCOPY} --input-target binary --output-target elf64-littleaarch64 --binary-architecture aarch64 cloudabi64_vdso.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"cloudabi64_vdso_blob.o"
 #
 arm/allwinner/a10_ehci.c	optional	ehci aw_ehci fdt
 arm/allwinner/a10_gpio.c	optional	gpio aw_gpio fdt
 arm/allwinner/a10_mmc.c		optional	mmc aw_mmc fdt
 arm/allwinner/a64/a64_padconf.c	optional	soc_allwinner_a64 fdt
 arm/allwinner/a64/a64_r_padconf.c optional	soc_allwinner_a64 fdt
 arm/allwinner/aw_ccu.c		optional	aw_ccu fdt
 arm/allwinner/aw_nmi.c		optional	aw_nmi fdt \
 	compile-with "${NORMAL_C} -I$S/gnu/dts/include"
 arm/allwinner/aw_reset.c	optional	aw_ccu fdt
 arm/allwinner/aw_rsb.c		optional	aw_rsb fdt
 arm/allwinner/aw_rtc.c		optional	aw_rtc fdt
 arm/allwinner/aw_sid.c		optional	aw_sid fdt
 arm/allwinner/aw_thermal.c	optional	aw_thermal fdt
 arm/allwinner/aw_usbphy.c	optional	ehci aw_usbphy fdt
 arm/allwinner/aw_wdog.c		optional	aw_wdog fdt
 arm/allwinner/axp81x.c		optional	axp81x fdt
 arm/allwinner/clk/aw_ahbclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_apbclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_axiclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_cpuclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_gate.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_modclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_pll.c	optional	aw_ccu fdt \
 	compile-with "${NORMAL_C} -I$S/gnu/dts/include"
 arm/allwinner/clk/aw_thsclk.c	optional	aw_ccu fdt
 arm/allwinner/clk/aw_usbclk.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_ccung.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_clk_nkmp.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_clk_nm.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_clk_prediv_mux.c	optional	aw_ccu fdt
 arm/allwinner/clkng/ccu_a64.c	optional	aw_ccu fdt
 arm/allwinner/clkng/ccu_h3.c	optional	aw_ccu fdt
+arm/allwinner/clkng/ccu_sun8i_r.c	optional	aw_ccu fdt
 
 arm/allwinner/if_awg.c		optional	awg fdt
 arm/annapurna/alpine/alpine_ccu.c		optional	al_ccu fdt
 arm/annapurna/alpine/alpine_nb_service.c	optional	al_nb_service fdt
 arm/annapurna/alpine/alpine_pci.c		optional	al_pci fdt
 arm/annapurna/alpine/alpine_pci_msix.c		optional	al_pci fdt
 arm/annapurna/alpine/alpine_serdes.c		optional al_serdes fdt		\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
 arm/arm/generic_timer.c		standard
 arm/arm/gic.c			standard
 arm/arm/gic_fdt.c		optional	fdt
 arm/arm/pmu.c			standard
 arm/broadcom/bcm2835/bcm2835_audio.c		optional sound vchiq fdt \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 arm/broadcom/bcm2835/bcm2835_bsc.c		optional bcm2835_bsc soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_cpufreq.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_dma.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_fbd.c		optional vt soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_ft5406.c		optional evdev bcm2835_ft5406 soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_gpio.c		optional gpio soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_intr.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_mbox.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_rng.c		optional random soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_vcio.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_wdog.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2836.c			optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt soc_brcm_bcm2837
 arm/mv/armada38x/armada38x_rtc.c		optional mv_rtc fdt
 arm64/acpica/acpi_machdep.c	optional	acpi
 arm64/acpica/OsdEnvironment.c	optional	acpi
 arm64/acpica/acpi_wakeup.c	optional	acpi
 arm64/acpica/pci_cfgreg.c	optional	acpi	pci
 arm64/arm64/autoconf.c		standard
 arm64/arm64/bus_machdep.c	standard
 arm64/arm64/bus_space_asm.S	standard
 arm64/arm64/busdma_bounce.c	standard
 arm64/arm64/busdma_machdep.c	standard
 arm64/arm64/bzero.S		standard
 arm64/arm64/clock.c		standard
 arm64/arm64/copyinout.S		standard
 arm64/arm64/copystr.c		standard
 arm64/arm64/cpufunc_asm.S	standard
 arm64/arm64/db_disasm.c		optional	ddb
 arm64/arm64/db_interface.c	optional	ddb
 arm64/arm64/db_trace.c		optional	ddb
 arm64/arm64/debug_monitor.c	optional	ddb
 arm64/arm64/disassem.c		optional	ddb
 arm64/arm64/dump_machdep.c	standard
 arm64/arm64/elf_machdep.c	standard
 arm64/arm64/exception.S		standard
 arm64/arm64/gicv3_its.c		optional	intrng fdt
 arm64/arm64/gic_v3.c		standard
 arm64/arm64/gic_v3_fdt.c	optional	fdt
 arm64/arm64/identcpu.c		standard
 arm64/arm64/in_cksum.c		optional	inet | inet6
 arm64/arm64/locore.S		standard	no-obj
 arm64/arm64/machdep.c		standard
 arm64/arm64/mem.c		standard
 arm64/arm64/memcpy.S		standard
 arm64/arm64/memmove.S		standard
 arm64/arm64/minidump_machdep.c	standard
 arm64/arm64/mp_machdep.c	optional	smp
 arm64/arm64/nexus.c		standard
 arm64/arm64/ofw_machdep.c	optional	fdt
 arm64/arm64/pmap.c		standard
 arm64/arm64/stack_machdep.c	optional	ddb | stack
 arm64/arm64/support.S		standard
 arm64/arm64/swtch.S		standard
 arm64/arm64/sys_machdep.c	standard
 arm64/arm64/trap.c		standard
 arm64/arm64/uio_machdep.c	standard
 arm64/arm64/uma_machdep.c	standard
 arm64/arm64/undefined.c		standard
 arm64/arm64/unwind.c		optional	ddb | kdtrace_hooks | stack
 arm64/arm64/vfp.c		standard
 arm64/arm64/vm_machdep.c	standard
 arm64/cavium/thunder_pcie_fdt.c		optional	soc_cavm_thunderx pci fdt
 arm64/cavium/thunder_pcie_pem.c		optional	soc_cavm_thunderx pci
 arm64/cavium/thunder_pcie_pem_fdt.c	optional	soc_cavm_thunderx pci fdt
 arm64/cavium/thunder_pcie_common.c	optional	soc_cavm_thunderx pci
 arm64/cloudabi64/cloudabi64_sysvec.c	optional compat_cloudabi64
 contrib/vchiq/interface/compat/vchi_bsd.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_arm.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_connected.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_core.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_shim.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 contrib/vchiq/interface/vchiq_arm/vchiq_util.c	optional vchiq soc_brcm_bcm2837 \
 	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 crypto/armv8/armv8_crypto.c	optional	armv8crypto
 armv8_crypto_wrap.o		optional	armv8crypto		\
 	dependency	"$S/crypto/armv8/armv8_crypto_wrap.c"		\
 	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"armv8_crypto_wrap.o"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec | ipsec_support
 crypto/des/des_enc.c		optional	crypto | ipsec | ipsec_support | netsmb
 dev/acpica/acpi_if.m		optional	acpi
 dev/ahci/ahci_generic.c		optional	ahci
 dev/axgbe/if_axgbe.c		optional	axgbe
 dev/axgbe/xgbe-desc.c		optional	axgbe
 dev/axgbe/xgbe-dev.c		optional	axgbe
 dev/axgbe/xgbe-drv.c		optional	axgbe
 dev/axgbe/xgbe-mdio.c		optional	axgbe
 dev/cpufreq/cpufreq_dt.c	optional	cpufreq fdt
 dev/iicbus/twsi/a10_twsi.c	optional	twsi fdt
 dev/iicbus/twsi/twsi.c		optional	twsi fdt
 dev/hwpmc/hwpmc_arm64.c		optional	hwpmc
 dev/hwpmc/hwpmc_arm64_md.c	optional	hwpmc
 dev/mbox/mbox_if.m		optional	soc_brcm_bcm2837
 dev/mmc/host/dwmmc.c		optional	dwmmc fdt
 dev/mmc/host/dwmmc_hisi.c	optional	dwmmc fdt soc_hisi_hi6220
 dev/neta/if_mvneta_fdt.c	optional	neta fdt
 dev/neta/if_mvneta.c		optional	neta mdio mii
 dev/ofw/ofw_cpu.c		optional	fdt
 dev/ofw/ofwpci.c		optional 	fdt pci
 dev/pci/pci_host_generic.c	optional	pci
 dev/pci/pci_host_generic_fdt.c	optional	pci fdt
 dev/psci/psci.c			optional	psci
 dev/psci/psci_arm64.S		optional	psci
 dev/uart/uart_cpu_arm64.c	optional	uart
 dev/uart/uart_dev_pl011.c	optional	uart pl011
 dev/usb/controller/dwc_otg_hisi.c optional	dwcotg fdt soc_hisi_hi6220
 dev/usb/controller/ehci_mv.c	optional	ehci_mv fdt
 dev/usb/controller/generic_ehci.c optional	ehci acpi
 dev/usb/controller/generic_ohci.c optional	ohci fdt
 dev/usb/controller/generic_usb_if.m optional	ohci fdt
 dev/usb/controller/xhci_mv.c	optional	xhci_mv fdt
 dev/vnic/mrml_bridge.c		optional	vnic fdt
 dev/vnic/nic_main.c		optional	vnic pci
 dev/vnic/nicvf_main.c		optional	vnic pci pci_iov
 dev/vnic/nicvf_queues.c		optional	vnic pci pci_iov
 dev/vnic/thunder_bgx_fdt.c	optional	vnic fdt
 dev/vnic/thunder_bgx.c		optional	vnic pci
 dev/vnic/thunder_mdio_fdt.c	optional	vnic fdt
 dev/vnic/thunder_mdio.c		optional	vnic
 dev/vnic/lmac_if.m		optional	inet | inet6 | vnic
 kern/kern_clocksource.c		standard
 kern/msi_if.m			optional	intrng
 kern/pic_if.m			optional	intrng
 kern/subr_devmap.c		standard
 kern/subr_intr.c		optional	intrng
 libkern/bcmp.c			standard
 libkern/ffs.c			standard
 libkern/ffsl.c			standard
 libkern/ffsll.c			standard
 libkern/fls.c			standard
 libkern/flsl.c			standard
 libkern/flsll.c			standard
 libkern/memset.c		standard
 libkern/arm64/crc32c_armv8.S	standard
 cddl/contrib/opensolaris/common/atomic/aarch64/opensolaris_atomic.S	optional zfs | dtrace compile-with "${CDDL_C}"
 cddl/dev/dtrace/aarch64/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
 cddl/dev/dtrace/aarch64/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
 cddl/dev/fbt/aarch64/fbt_isa.c				optional dtrace_fbt | dtraceall compile-with "${FBT_C}"