svn commit: r344894 - in head/sys: arm/allwinner/clkng conf
Emmanuel Vadot
manu at FreeBSD.org
Thu Mar 7 19:30:39 UTC 2019
Author: manu
Date: Thu Mar 7 19:30:37 2019
New Revision: 344894
URL: https://svnweb.freebsd.org/changeset/base/344894
Log:
arm64: allwinner: Add CCU DE2
The Display Engine 2 have it's own Clock and Control Unit, add support
for it.
Added:
head/sys/arm/allwinner/clkng/ccu_de2.c (contents, props changed)
Modified:
head/sys/arm/allwinner/clkng/ccu_a64.c
head/sys/conf/files.arm64
Modified: head/sys/arm/allwinner/clkng/ccu_a64.c
==============================================================================
--- head/sys/arm/allwinner/clkng/ccu_a64.c Thu Mar 7 19:28:47 2019 (r344893)
+++ head/sys/arm/allwinner/clkng/ccu_a64.c Thu Mar 7 19:30:37 2019 (r344894)
@@ -289,6 +289,15 @@ NM_CLK_WITH_FRAC(pll_video0_clk,
AW_CLK_HAS_LOCK, /* flags */
270000000, 297000000, /* freq0, freq1 */
24, 25); /* mode sel, freq sel */
+static const char *pll_video0_2x_parents[] = {"pll_video0"};
+FIXED_CLK(pll_video0_2x_clk,
+ CLK_PLL_VIDEO0_2X, /* id */
+ "pll_video0-2x", /* name */
+ pll_video0_2x_parents, /* parent */
+ 0, /* freq */
+ 2, /* mult */
+ 1, /* div */
+ 0); /* flags */
static const char *pll_ve_parents[] = {"osc24M"};
NM_CLK_WITH_FRAC(pll_ve_clk,
@@ -750,6 +759,7 @@ static struct aw_ccung_clk a64_ccu_clks[] = {
{ .type = AW_CLK_FIXED, .clk.fixed = &pll_audio_2x_clk},
{ .type = AW_CLK_FIXED, .clk.fixed = &pll_audio_4x_clk},
{ .type = AW_CLK_FIXED, .clk.fixed = &pll_audio_8x_clk},
+ { .type = AW_CLK_FIXED, .clk.fixed = &pll_video0_2x_clk},
};
static struct aw_clk_init a64_init_clks[] = {
Added: head/sys/arm/allwinner/clkng/ccu_de2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/allwinner/clkng/ccu_de2.c Thu Mar 7 19:30:37 2019 (r344894)
@@ -0,0 +1,167 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2018 Emmanuel Vadot <manu at freebsd.org>
+ *
+ * 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 <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 "opt_soc.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 <gnu/dts/include/dt-bindings/clock/sun8i-de2.h>
+#include <gnu/dts/include/dt-bindings/reset/sun8i-de2.h>
+
+/* Non exported clocks */
+#define CLK_MIXER0_DIV 3
+#define CLK_MIXER1_DIV 4
+#define CLK_WB_DIV 5
+
+static struct aw_ccung_reset de2_ccu_resets[] = {
+ CCU_RESET(RST_MIXER0, 0x08, 0)
+ CCU_RESET(RST_MIXER1, 0x08, 1)
+ CCU_RESET(RST_WB, 0x08, 2)
+};
+
+static struct aw_ccung_gate de2_ccu_gates[] = {
+ CCU_GATE(CLK_BUS_MIXER0, "mixer0", "mixer0-div", 0x00, 0)
+ CCU_GATE(CLK_BUS_MIXER1, "mixer1", "mixer1-div", 0x00, 1)
+ CCU_GATE(CLK_BUS_WB, "wb", "wb-div", 0x00, 2)
+
+ CCU_GATE(CLK_MIXER0, "bus-mixer0", "bus-de", 0x04, 0)
+ CCU_GATE(CLK_MIXER1, "bus-mixer1", "bus-de", 0x04, 1)
+ CCU_GATE(CLK_WB, "bus-wb", "bus-de", 0x04, 2)
+};
+
+static const char *div_parents[] = {"de"};
+
+NM_CLK(mixer0_div_clk,
+ CLK_MIXER0_DIV, /* id */
+ "mixer0-div", div_parents, /* names, parents */
+ 0x0C, /* offset */
+ 0, 0, 1, AW_CLK_FACTOR_FIXED, /* N factor (fake)*/
+ 0, 4, 0, 0, /* M flags */
+ 0, 0, /* mux */
+ 0, /* gate */
+ AW_CLK_SCALE_CHANGE); /* flags */
+
+NM_CLK(mixer1_div_clk,
+ CLK_MIXER1_DIV, /* id */
+ "mixer1-div", div_parents, /* names, parents */
+ 0x0C, /* offset */
+ 0, 0, 1, AW_CLK_FACTOR_FIXED, /* N factor (fake)*/
+ 4, 4, 0, 0, /* M flags */
+ 0, 0, /* mux */
+ 0, /* gate */
+ AW_CLK_SCALE_CHANGE); /* flags */
+
+NM_CLK(wb_div_clk,
+ CLK_WB_DIV, /* id */
+ "wb-div", div_parents, /* names, parents */
+ 0x0C, /* offset */
+ 0, 0, 1, AW_CLK_FACTOR_FIXED, /* N factor (fake)*/
+ 8, 4, 0, 0, /* M flags */
+ 0, 0, /* mux */
+ 0, /* gate */
+ AW_CLK_SCALE_CHANGE); /* flags */
+
+static struct aw_ccung_clk de2_ccu_clks[] = {
+ { .type = AW_CLK_NM, .clk.nm = &mixer0_div_clk},
+ { .type = AW_CLK_NM, .clk.nm = &mixer1_div_clk},
+ { .type = AW_CLK_NM, .clk.nm = &wb_div_clk},
+};
+
+static struct ofw_compat_data compat_data[] = {
+ {"allwinner,sun50i-a64-de2-clk", 1},
+ {"allwinner,sun50i-h5-de2-clk", 1},
+ {NULL, 0}
+};
+
+static int
+ccu_de2_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 DE2 Clock Control Unit");
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+ccu_de2_attach(device_t dev)
+{
+ struct aw_ccung_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ sc->resets = de2_ccu_resets;
+ sc->nresets = nitems(de2_ccu_resets);
+ sc->gates = de2_ccu_gates;
+ sc->ngates = nitems(de2_ccu_gates);
+ sc->clks = de2_ccu_clks;
+ sc->nclks = nitems(de2_ccu_clks);
+
+ return (aw_ccung_attach(dev));
+}
+
+static device_method_t ccu_de2_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, ccu_de2_probe),
+ DEVMETHOD(device_attach, ccu_de2_attach),
+
+ DEVMETHOD_END
+};
+
+static devclass_t ccu_de2ng_devclass;
+
+DEFINE_CLASS_1(ccu_de2, ccu_de2_driver, ccu_de2_methods,
+ sizeof(struct aw_ccung_softc), aw_ccung_driver);
+
+EARLY_DRIVER_MODULE(ccu_de2, simplebus, ccu_de2_driver,
+ ccu_de2ng_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_LAST);
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Thu Mar 7 19:28:47 2019 (r344893)
+++ head/sys/conf/files.arm64 Thu Mar 7 19:30:37 2019 (r344894)
@@ -51,6 +51,7 @@ arm/allwinner/clkng/aw_clk_prediv_mux.c optional aw_cc
arm/allwinner/clkng/ccu_a64.c optional soc_allwinner_a64 aw_ccu fdt
arm/allwinner/clkng/ccu_h3.c optional soc_allwinner_h5 aw_ccu fdt
arm/allwinner/clkng/ccu_sun8i_r.c optional aw_ccu fdt
+arm/allwinner/clkng/ccu_de2.c optional aw_ccu fdt
# Allwinner padconf files
arm/allwinner/a64/a64_padconf.c optional soc_allwinner_a64 fdt
More information about the svn-src-all
mailing list