From owner-svn-src-head@freebsd.org Sat Oct 7 16:48:44 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A058E3C4A5; Sat, 7 Oct 2017 16:48:44 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0378018CB; Sat, 7 Oct 2017 16:48:43 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97Gmg4X073933; Sat, 7 Oct 2017 16:48:42 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97GmgKF073928; Sat, 7 Oct 2017 16:48:42 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201710071648.v97GmgKF073928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Sat, 7 Oct 2017 16:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324383 - in head/sys: arm/allwinner/clkng arm/allwinner/h3 conf X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/sys: arm/allwinner/clkng arm/allwinner/h3 conf X-SVN-Commit-Revision: 324383 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Oct 2017 16:48:44 -0000 Author: manu Date: Sat Oct 7 16:48:42 2017 New Revision: 324383 URL: https://svnweb.freebsd.org/changeset/base/324383 Log: Allwinner: Add clock driver for ccu_sun8i_r SUN8I and SUN50I (H3, H5, A83T and A64) have a second clock controller unit. It controls the clocks for the second gpio controller, the IR controller etc ... Support for A83T is not supported. Tested On: OrangePi One, Pine64 Added: head/sys/arm/allwinner/clkng/ccu_sun8i_r.c (contents, props changed) head/sys/arm/allwinner/clkng/ccu_sun8i_r.h (contents, props changed) Modified: head/sys/arm/allwinner/clkng/aw_ccung.c head/sys/arm/allwinner/h3/files.h3 head/sys/conf/files.arm64 Modified: head/sys/arm/allwinner/clkng/aw_ccung.c ============================================================================== --- head/sys/arm/allwinner/clkng/aw_ccung.c Sat Oct 7 09:47:31 2017 (r324382) +++ head/sys/arm/allwinner/clkng/aw_ccung.c Sat Oct 7 16:48:42 2017 (r324383) @@ -64,10 +64,12 @@ __FBSDID("$FreeBSD$"); #if defined(SOC_ALLWINNER_A64) #include +#include #endif #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5) #include +#include #endif #include "clkdev_if.h" @@ -79,26 +81,30 @@ static struct resource_spec aw_ccung_spec[] = { }; #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 } }; @@ -320,6 +326,9 @@ aw_ccung_attach(device_t dev) 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: @@ -329,6 +338,9 @@ aw_ccung_attach(device_t dev) #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 } Added: head/sys/arm/allwinner/clkng/ccu_sun8i_r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/ccu_sun8i_r.c Sat Oct 7 16:48:42 2017 (r324383) @@ -0,0 +1,127 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include + +/* 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]); +} Added: head/sys/arm/allwinner/clkng/ccu_sun8i_r.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/clkng/ccu_sun8i_r.h Sat Oct 7 16:48:42 2017 (r324383) @@ -0,0 +1,34 @@ +/*- + * Copyright (c) 2017 Emmanuel Vadot + * 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__ */ Modified: head/sys/arm/allwinner/h3/files.h3 ============================================================================== --- head/sys/arm/allwinner/h3/files.h3 Sat Oct 7 09:47:31 2017 (r324382) +++ head/sys/arm/allwinner/h3/files.h3 Sat Oct 7 16:48:42 2017 (r324383) @@ -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 Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Sat Oct 7 09:47:31 2017 (r324382) +++ head/sys/conf/files.arm64 Sat Oct 7 16:48:42 2017 (r324383) @@ -43,6 +43,7 @@ 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