clk: rockchip: rename RK1108 to RV1108
authorAndy Yan <andy.yan@rock-chips.com>
Fri, 17 Mar 2017 17:18:38 +0000 (18:18 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Wed, 22 Mar 2017 17:03:04 +0000 (18:03 +0100)
Rockchip finally named the SOC as RV1108, so change it.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
[include rename in rk1108.dtsi to prevent compile errors]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm/boot/dts/rk1108.dtsi
drivers/clk/rockchip/Makefile
drivers/clk/rockchip/clk-rk1108.c [deleted file]
drivers/clk/rockchip/clk-rv1108.c [new file with mode: 0644]
drivers/clk/rockchip/clk.h
include/dt-bindings/clock/rk1108-cru.h [deleted file]
include/dt-bindings/clock/rv1108-cru.h [new file with mode: 0644]

index d6194bff7afe6e4c85f299918e99f7320a91adf7..4867342b88d47c1f0b9165f699e03548876ac811 100644 (file)
@@ -41,7 +41,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/clock/rk1108-cru.h>
+#include <dt-bindings/clock/rv1108-cru.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 / {
        #address-cells = <1>;
index 141971488f409c91f0bafc63b71c52ab98019cef..26b220c988b29cd74104b46bc5598701b79565c4 100644 (file)
@@ -12,7 +12,7 @@ obj-y += clk-muxgrf.o
 obj-y  += clk-ddr.o
 obj-$(CONFIG_RESET_CONTROLLER) += softrst.o
 
-obj-y  += clk-rk1108.o
+obj-y  += clk-rv1108.o
 obj-y  += clk-rk3036.o
 obj-y  += clk-rk3188.o
 obj-y  += clk-rk3228.o
diff --git a/drivers/clk/rockchip/clk-rk1108.c b/drivers/clk/rockchip/clk-rk1108.c
deleted file mode 100644 (file)
index 92750d7..0000000
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
- * Author: Shawn Lin <shawn.lin@rock-chips.com>
- *         Andy Yan <andy.yan@rock-chips.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/clk-provider.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/syscore_ops.h>
-#include <dt-bindings/clock/rk1108-cru.h>
-#include "clk.h"
-
-#define RK1108_GRF_SOC_STATUS0 0x480
-
-enum rk1108_plls {
-       apll, dpll, gpll,
-};
-
-static struct rockchip_pll_rate_table rk1108_pll_rates[] = {
-       /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */
-       RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1584000000, 1, 66, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1560000000, 1, 65, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1536000000, 1, 64, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1512000000, 1, 63, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1488000000, 1, 62, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1464000000, 1, 61, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1440000000, 1, 60, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1416000000, 1, 59, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1392000000, 1, 58, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1368000000, 1, 57, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1344000000, 1, 56, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1320000000, 1, 55, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1296000000, 1, 54, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1272000000, 1, 53, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1248000000, 1, 52, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1200000000, 1, 50, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1188000000, 2, 99, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1104000000, 1, 46, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1100000000, 12, 550, 1, 1, 1, 0),
-       RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0),
-       RK3036_PLL_RATE(1000000000, 6, 500, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 984000000, 1, 82, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 960000000, 1, 80, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 936000000, 1, 78, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 912000000, 1, 76, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 900000000, 4, 300, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 888000000, 1, 74, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 864000000, 1, 72, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 840000000, 1, 70, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 816000000, 1, 68, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 800000000, 6, 400, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 700000000, 6, 350, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 696000000, 1, 58, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 600000000, 1, 75, 3, 1, 1, 0),
-       RK3036_PLL_RATE( 594000000, 2, 99, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 504000000, 1, 63, 3, 1, 1, 0),
-       RK3036_PLL_RATE( 500000000, 6, 250, 2, 1, 1, 0),
-       RK3036_PLL_RATE( 408000000, 1, 68, 2, 2, 1, 0),
-       RK3036_PLL_RATE( 312000000, 1, 52, 2, 2, 1, 0),
-       RK3036_PLL_RATE( 216000000, 1, 72, 4, 2, 1, 0),
-       RK3036_PLL_RATE(  96000000, 1, 64, 4, 4, 1, 0),
-       { /* sentinel */ },
-};
-
-#define RK1108_DIV_CORE_MASK           0xf
-#define RK1108_DIV_CORE_SHIFT          4
-
-#define RK1108_CLKSEL0(_core_peri_div) \
-       {                               \
-               .reg = RK1108_CLKSEL_CON(1),    \
-               .val = HIWORD_UPDATE(_core_peri_div, RK1108_DIV_CORE_MASK,\
-                               RK1108_DIV_CORE_SHIFT)  \
-       }
-
-#define RK1108_CPUCLK_RATE(_prate, _core_peri_div)                     \
-       {                                                               \
-               .prate = _prate,                                        \
-               .divs = {                                               \
-                       RK1108_CLKSEL0(_core_peri_div),         \
-               },                                                      \
-       }
-
-static struct rockchip_cpuclk_rate_table rk1108_cpuclk_rates[] __initdata = {
-       RK1108_CPUCLK_RATE(816000000, 4),
-       RK1108_CPUCLK_RATE(600000000, 4),
-       RK1108_CPUCLK_RATE(312000000, 4),
-};
-
-static const struct rockchip_cpuclk_reg_data rk1108_cpuclk_data = {
-       .core_reg = RK1108_CLKSEL_CON(0),
-       .div_core_shift = 0,
-       .div_core_mask = 0x1f,
-       .mux_core_alt = 1,
-       .mux_core_main = 0,
-       .mux_core_shift = 8,
-       .mux_core_mask = 0x1,
-};
-
-PNAME(mux_pll_p)               = { "xin24m", "xin24m"};
-PNAME(mux_ddrphy_p)            = { "dpll_ddr", "gpll_ddr", "apll_ddr" };
-PNAME(mux_armclk_p)            = { "apll_core", "gpll_core", "dpll_core" };
-PNAME(mux_usb480m_pre_p)       = { "usbphy", "xin24m" };
-PNAME(mux_hdmiphy_phy_p)       = { "hdmiphy", "xin24m" };
-PNAME(mux_dclk_hdmiphy_pre_p)  = { "dclk_hdmiphy_src_gpll", "dclk_hdmiphy_src_dpll" };
-PNAME(mux_pll_src_4plls_p)     = { "dpll", "hdmiphy", "gpll", "usb480m" };
-PNAME(mux_pll_src_3plls_p)     = { "apll", "gpll", "dpll" };
-PNAME(mux_pll_src_2plls_p)     = { "dpll", "gpll" };
-PNAME(mux_pll_src_apll_gpll_p) = { "apll", "gpll" };
-PNAME(mux_aclk_peri_src_p)     = { "aclk_peri_src_dpll", "aclk_peri_src_gpll" };
-PNAME(mux_aclk_bus_src_p)      = { "aclk_bus_src_gpll", "aclk_bus_src_apll", "aclk_bus_src_dpll" };
-PNAME(mux_mmc_src_p)           = { "dpll", "gpll", "xin24m", "usb480m" };
-PNAME(mux_pll_src_dpll_gpll_usb480m_p) = { "dpll", "gpll", "usb480m" };
-PNAME(mux_uart0_p)             = { "uart0_src", "uart0_frac", "xin24m" };
-PNAME(mux_uart1_p)             = { "uart1_src", "uart1_frac", "xin24m" };
-PNAME(mux_uart2_p)             = { "uart2_src", "uart2_frac", "xin24m" };
-PNAME(mux_sclk_macphy_p)       = { "sclk_macphy_pre", "ext_gmac" };
-PNAME(mux_i2s0_pre_p)          = { "i2s0_src", "i2s0_frac", "ext_i2s", "xin12m" };
-PNAME(mux_i2s_out_p)           = { "i2s0_pre", "xin12m" };
-PNAME(mux_i2s1_p)              = { "i2s1_src", "i2s1_frac", "xin12m" };
-PNAME(mux_i2s2_p)              = { "i2s2_src", "i2s2_frac", "xin12m" };
-
-static struct rockchip_pll_clock rk1108_pll_clks[] __initdata = {
-       [apll] = PLL(pll_rk3399, PLL_APLL, "apll", mux_pll_p, 0, RK1108_PLL_CON(0),
-                    RK1108_PLL_CON(3), 8, 31, 0, rk1108_pll_rates),
-       [dpll] = PLL(pll_rk3399, PLL_DPLL, "dpll", mux_pll_p, 0, RK1108_PLL_CON(8),
-                    RK1108_PLL_CON(11), 8, 31, 0, NULL),
-       [gpll] = PLL(pll_rk3399, PLL_GPLL, "gpll", mux_pll_p, 0, RK1108_PLL_CON(16),
-                    RK1108_PLL_CON(19), 8, 31, ROCKCHIP_PLL_SYNC_RATE, rk1108_pll_rates),
-};
-
-#define MFLAGS CLK_MUX_HIWORD_MASK
-#define DFLAGS CLK_DIVIDER_HIWORD_MASK
-#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE)
-#define IFLAGS ROCKCHIP_INVERTER_HIWORD_MASK
-
-static struct rockchip_clk_branch rk1108_uart0_fracmux __initdata =
-       MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(13), 8, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_uart1_fracmux __initdata =
-       MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(14), 8, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_uart2_fracmux __initdata =
-       MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(15), 8, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_i2s0_fracmux __initdata =
-       MUX(0, "i2s0_pre", mux_i2s0_pre_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(5), 12, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_i2s1_fracmux __initdata =
-       MUX(0, "i2s1_pre", mux_i2s1_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(6), 12, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_i2s2_fracmux __initdata =
-       MUX(0, "i2s2_pre", mux_i2s2_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(7), 12, 2, MFLAGS);
-
-static struct rockchip_clk_branch rk1108_clk_branches[] __initdata = {
-       MUX(0, "hdmi_phy", mux_hdmiphy_phy_p, CLK_SET_RATE_PARENT,
-                       RK1108_MISC_CON, 13, 2, MFLAGS),
-       MUX(0, "usb480m", mux_usb480m_pre_p, CLK_SET_RATE_PARENT,
-                       RK1108_MISC_CON, 15, 2, MFLAGS),
-       /*
-        * Clock-Architecture Diagram 2
-        */
-
-       /* PD_CORE */
-       GATE(0, "dpll_core", "dpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 1, GFLAGS),
-       GATE(0, "apll_core", "apll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 0, GFLAGS),
-       GATE(0, "gpll_core", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 2, GFLAGS),
-       COMPOSITE_NOMUX(0, "pclken_dbg", "armclk", CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(1), 4, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,
-                       RK1108_CLKGATE_CON(0), 5, GFLAGS),
-       COMPOSITE_NOMUX(ACLK_ENMCORE, "aclkenm_core", "armclk", CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(1), 0, 3, DFLAGS | CLK_DIVIDER_READ_ONLY,
-                       RK1108_CLKGATE_CON(0), 4, GFLAGS),
-       GATE(ACLK_CORE, "aclk_core", "aclkenm_core", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(11), 0, GFLAGS),
-       GATE(0, "pclk_dbg", "pclken_dbg", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(11), 1, GFLAGS),
-
-       /* PD_RKVENC */
-
-       /* PD_RKVDEC */
-
-       /* PD_PMU_wrapper */
-       COMPOSITE_NOMUX(0, "pmu_24m_ena", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(38), 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(8), 12, GFLAGS),
-       GATE(0, "pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 0, GFLAGS),
-       GATE(0, "intmem1", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 1, GFLAGS),
-       GATE(0, "gpio0_pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 2, GFLAGS),
-       GATE(0, "pmugrf", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 3, GFLAGS),
-       GATE(0, "pmu_noc", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 4, GFLAGS),
-       GATE(0, "i2c0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 5, GFLAGS),
-       GATE(0, "pwm0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(10), 6, GFLAGS),
-       COMPOSITE(0, "pwm0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(12), 7, 1, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(8), 15, GFLAGS),
-       COMPOSITE(0, "i2c0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(19), 7, 1, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(8), 14, GFLAGS),
-       GATE(0, "pvtm_pmu", "xin24m", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(8), 13, GFLAGS),
-
-       /*
-        * Clock-Architecture Diagram 4
-        */
-       COMPOSITE(0, "aclk_vio0_2wrap_occ", mux_pll_src_4plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(6), 0, GFLAGS),
-       GATE(0, "aclk_vio0_pre", "aclk_vio0_2wrap_occ", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(17), 0, GFLAGS),
-       COMPOSITE_NOMUX(0, "hclk_vio_pre", "aclk_vio0_pre", 0,
-                       RK1108_CLKSEL_CON(29), 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(7), 2, GFLAGS),
-       COMPOSITE_NOMUX(0, "pclk_vio_pre", "aclk_vio0_pre", 0,
-                       RK1108_CLKSEL_CON(29), 8, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(7), 3, GFLAGS),
-
-       INVERTER(0, "pclk_vip", "ext_vip",
-                       RK1108_CLKSEL_CON(31), 8, IFLAGS),
-       GATE(0, "pclk_isp_pre", "pclk_vip", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(7), 6, GFLAGS),
-       GATE(0, "pclk_isp", "pclk_isp_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(18), 10, GFLAGS),
-       GATE(0, "dclk_hdmiphy_src_gpll", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(6), 5, GFLAGS),
-       GATE(0, "dclk_hdmiphy_src_dpll", "dpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(6), 4, GFLAGS),
-       COMPOSITE_NOGATE(0, "dclk_hdmiphy", mux_dclk_hdmiphy_pre_p, 0,
-                       RK1108_CLKSEL_CON(32), 6, 2, MFLAGS, 8, 6, DFLAGS),
-
-       /*
-        * Clock-Architecture Diagram 5
-        */
-
-       FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
-
-       COMPOSITE(0, "i2s0_src", mux_pll_src_2plls_p, 0,
-                       RK1108_CLKSEL_CON(5), 8, 1, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(2), 0, GFLAGS),
-       COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(8), 0,
-                       RK1108_CLKGATE_CON(2), 1, GFLAGS,
-                       &rk1108_i2s0_fracmux),
-       GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT,
-                       RK1108_CLKGATE_CON(2), 2, GFLAGS),
-       COMPOSITE_NODIV(0, "i2s_out", mux_i2s_out_p, 0,
-                       RK1108_CLKSEL_CON(5), 15, 1, MFLAGS,
-                       RK1108_CLKGATE_CON(2), 3, GFLAGS),
-
-       COMPOSITE(0, "i2s1_src", mux_pll_src_2plls_p, 0,
-                       RK1108_CLKSEL_CON(6), 8, 1, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(2), 4, GFLAGS),
-       COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
-                       RK2928_CLKSEL_CON(9), 0,
-                       RK2928_CLKGATE_CON(2), 5, GFLAGS,
-                       &rk1108_i2s1_fracmux),
-       GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT,
-                       RK1108_CLKGATE_CON(2), 6, GFLAGS),
-
-       COMPOSITE(0, "i2s2_src", mux_pll_src_2plls_p, 0,
-                       RK1108_CLKSEL_CON(7), 8, 1, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 8, GFLAGS),
-       COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(10), 0,
-                       RK1108_CLKGATE_CON(2), 9, GFLAGS,
-                       &rk1108_i2s2_fracmux),
-       GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT,
-                       RK1108_CLKGATE_CON(2), 10, GFLAGS),
-
-       /* PD_BUS */
-       GATE(0, "aclk_bus_src_gpll", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 0, GFLAGS),
-       GATE(0, "aclk_bus_src_apll", "apll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 1, GFLAGS),
-       GATE(0, "aclk_bus_src_dpll", "dpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 2, GFLAGS),
-       COMPOSITE_NOGATE(ACLK_PRE, "aclk_bus_pre", mux_aclk_bus_src_p, 0,
-                       RK1108_CLKSEL_CON(2), 8, 2, MFLAGS, 0, 5, DFLAGS),
-       COMPOSITE_NOMUX(0, "hclk_bus_pre", "aclk_bus_2wrap_occ", 0,
-                       RK1108_CLKSEL_CON(3), 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(1), 4, GFLAGS),
-       COMPOSITE_NOMUX(0, "pclken_bus", "aclk_bus_2wrap_occ", 0,
-                       RK1108_CLKSEL_CON(3), 8, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(1), 5, GFLAGS),
-       GATE(0, "pclk_bus_pre", "pclken_bus", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 6, GFLAGS),
-       GATE(0, "pclk_top_pre", "pclken_bus", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 7, GFLAGS),
-       GATE(0, "pclk_ddr_pre", "pclken_bus", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 8, GFLAGS),
-       GATE(0, "clk_timer0", "mux_pll_p", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 9, GFLAGS),
-       GATE(0, "clk_timer1", "mux_pll_p", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(1), 10, GFLAGS),
-       GATE(0, "pclk_timer", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 4, GFLAGS),
-
-       COMPOSITE(0, "uart0_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(13), 12, 2, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 1, GFLAGS),
-       COMPOSITE(0, "uart1_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(14), 12, 2, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 3, GFLAGS),
-       COMPOSITE(0, "uart21_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(15), 12, 2, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 5, GFLAGS),
-
-       COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(16), 0,
-                       RK1108_CLKGATE_CON(3), 2, GFLAGS,
-                       &rk1108_uart0_fracmux),
-       COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(17), 0,
-                       RK1108_CLKGATE_CON(3), 4, GFLAGS,
-                       &rk1108_uart1_fracmux),
-       COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(18), 0,
-                       RK1108_CLKGATE_CON(3), 6, GFLAGS,
-                       &rk1108_uart2_fracmux),
-       GATE(PCLK_UART0, "pclk_uart0", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 10, GFLAGS),
-       GATE(PCLK_UART1, "pclk_uart1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 11, GFLAGS),
-       GATE(PCLK_UART2, "pclk_uart2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 12, GFLAGS),
-
-       COMPOSITE(0, "clk_i2c1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(19), 15, 2, MFLAGS, 8, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 7, GFLAGS),
-       COMPOSITE(0, "clk_i2c2", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(20), 7, 2, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 8, GFLAGS),
-       COMPOSITE(0, "clk_i2c3", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(20), 15, 2, MFLAGS, 8, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 9, GFLAGS),
-       GATE(0, "pclk_i2c1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 0, GFLAGS),
-       GATE(0, "pclk_i2c2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 1, GFLAGS),
-       GATE(0, "pclk_i2c3", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 2, GFLAGS),
-       COMPOSITE(0, "clk_pwm1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(12), 15, 2, MFLAGS, 8, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(3), 10, GFLAGS),
-       GATE(0, "pclk_pwm1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 6, GFLAGS),
-       GATE(0, "pclk_wdt", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 3, GFLAGS),
-       GATE(0, "pclk_gpio1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 7, GFLAGS),
-       GATE(0, "pclk_gpio2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 8, GFLAGS),
-       GATE(0, "pclk_gpio3", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(13), 9, GFLAGS),
-
-       GATE(0, "pclk_grf", "pclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(14), 0, GFLAGS),
-
-       GATE(ACLK_DMAC, "aclk_dmac", "aclk_bus_pre", 0,
-            RK1108_CLKGATE_CON(12), 2, GFLAGS),
-       GATE(0, "hclk_rom", "hclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(12), 3, GFLAGS),
-       GATE(0, "aclk_intmem", "aclk_bus_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(12), 1, GFLAGS),
-
-       /* PD_DDR */
-       GATE(0, "apll_ddr", "apll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 8, GFLAGS),
-       GATE(0, "dpll_ddr", "dpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 9, GFLAGS),
-       GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 10, GFLAGS),
-       COMPOSITE(0, "ddrphy4x", mux_ddrphy_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(4), 8, 2, MFLAGS, 0, 3,
-                       DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
-                       RK1108_CLKGATE_CON(10), 9, GFLAGS),
-       GATE(0, "ddrupctl", "ddrphy_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(12), 4, GFLAGS),
-       GATE(0, "ddrc", "ddrphy", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(12), 5, GFLAGS),
-       GATE(0, "ddrmon", "ddrphy_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(12), 6, GFLAGS),
-       GATE(0, "timer_clk", "xin24m", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(0), 11, GFLAGS),
-
-       /*
-        * Clock-Architecture Diagram 6
-        */
-
-       /* PD_PERI */
-       COMPOSITE_NOMUX(0, "pclk_periph_pre", "gpll", 0,
-                       RK1108_CLKSEL_CON(23), 10, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(4), 5, GFLAGS),
-       GATE(0, "pclk_periph", "pclk_periph_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(15), 13, GFLAGS),
-       COMPOSITE_NOMUX(0, "hclk_periph_pre", "gpll", 0,
-                       RK1108_CLKSEL_CON(23), 5, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(4), 4, GFLAGS),
-       GATE(0, "hclk_periph", "hclk_periph_pre", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(15), 12, GFLAGS),
-
-       GATE(0, "aclk_peri_src_dpll", "dpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(4), 1, GFLAGS),
-       GATE(0, "aclk_peri_src_gpll", "gpll", CLK_IGNORE_UNUSED,
-                       RK1108_CLKGATE_CON(4), 2, GFLAGS),
-       COMPOSITE(0, "aclk_periph", mux_aclk_peri_src_p, CLK_IGNORE_UNUSED,
-                       RK1108_CLKSEL_CON(23), 15, 2, MFLAGS, 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(15), 11, GFLAGS),
-
-       COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,
-                       RK1108_CLKSEL_CON(25), 8, 2, MFLAGS, 0, 8, DFLAGS,
-                       RK1108_CLKGATE_CON(5), 0, GFLAGS),
-
-       COMPOSITE_NODIV(0, "sclk_sdio_src", mux_mmc_src_p, 0,
-                       RK1108_CLKSEL_CON(25), 10, 2, MFLAGS,
-                       RK1108_CLKGATE_CON(5), 2, GFLAGS),
-       DIV(SCLK_SDIO, "sclk_sdio", "sclk_sdio_src", 0,
-                       RK1108_CLKSEL_CON(26), 0, 8, DFLAGS),
-
-       COMPOSITE_NODIV(0, "sclk_emmc_src", mux_mmc_src_p, 0,
-                       RK1108_CLKSEL_CON(25), 12, 2, MFLAGS,
-                       RK1108_CLKGATE_CON(5), 1, GFLAGS),
-       DIV(SCLK_EMMC, "sclk_emmc", "sclk_emmc_src", 0,
-                       RK2928_CLKSEL_CON(26), 8, 8, DFLAGS),
-       GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 0, GFLAGS),
-       GATE(HCLK_SDIO, "hclk_sdio", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 1, GFLAGS),
-       GATE(HCLK_EMMC, "hclk_emmc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 2, GFLAGS),
-
-       COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_2plls_p, 0,
-                       RK1108_CLKSEL_CON(27), 14, 2, MFLAGS, 8, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(5), 3, GFLAGS),
-       GATE(HCLK_NANDC, "hclk_nandc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 3, GFLAGS),
-
-       COMPOSITE(SCLK_SFC, "sclk_sfc", mux_pll_src_2plls_p, 0,
-                       RK1108_CLKSEL_CON(27), 7, 2, MFLAGS, 0, 7, DFLAGS,
-                       RK1108_CLKGATE_CON(5), 4, GFLAGS),
-       GATE(HCLK_SFC, "hclk_sfc", "hclk_periph", 0, RK1108_CLKGATE_CON(15), 10, GFLAGS),
-
-       COMPOSITE(0, "sclk_macphy_pre", mux_pll_src_apll_gpll_p, 0,
-                       RK1108_CLKSEL_CON(24), 12, 2, MFLAGS, 0, 5, DFLAGS,
-                       RK1108_CLKGATE_CON(4), 10, GFLAGS),
-       MUX(0, "sclk_macphy", mux_sclk_macphy_p, CLK_SET_RATE_PARENT,
-                       RK1108_CLKSEL_CON(24), 8, 2, MFLAGS),
-       GATE(0, "sclk_macphy_rx", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 8, GFLAGS),
-       GATE(0, "sclk_mac_ref", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 6, GFLAGS),
-       GATE(0, "sclk_mac_refout", "sclk_macphy", 0, RK1108_CLKGATE_CON(4), 7, GFLAGS),
-
-       MMC(SCLK_SDMMC_DRV,    "sdmmc_drv",    "sclk_sdmmc", RK1108_SDMMC_CON0, 1),
-       MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RK1108_SDMMC_CON1, 1),
-
-       MMC(SCLK_SDIO_DRV,     "sdio_drv",     "sclk_sdio",  RK1108_SDIO_CON0,  1),
-       MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RK1108_SDIO_CON1,  1),
-
-       MMC(SCLK_EMMC_DRV,     "emmc_drv",     "sclk_emmc",  RK1108_EMMC_CON0,  1),
-       MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RK1108_EMMC_CON1,  1),
-};
-
-static const char *const rk1108_critical_clocks[] __initconst = {
-       "aclk_core",
-       "aclk_bus_src_gpll",
-       "aclk_periph",
-       "hclk_periph",
-       "pclk_periph",
-};
-
-static void __init rk1108_clk_init(struct device_node *np)
-{
-       struct rockchip_clk_provider *ctx;
-       void __iomem *reg_base;
-
-       reg_base = of_iomap(np, 0);
-       if (!reg_base) {
-               pr_err("%s: could not map cru region\n", __func__);
-               return;
-       }
-
-       ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
-       if (IS_ERR(ctx)) {
-               pr_err("%s: rockchip clk init failed\n", __func__);
-               iounmap(reg_base);
-               return;
-       }
-
-       rockchip_clk_register_plls(ctx, rk1108_pll_clks,
-                                  ARRAY_SIZE(rk1108_pll_clks),
-                                  RK1108_GRF_SOC_STATUS0);
-       rockchip_clk_register_branches(ctx, rk1108_clk_branches,
-                                 ARRAY_SIZE(rk1108_clk_branches));
-       rockchip_clk_protect_critical(rk1108_critical_clocks,
-                                     ARRAY_SIZE(rk1108_critical_clocks));
-
-       rockchip_clk_register_armclk(ctx, ARMCLK, "armclk",
-                       mux_armclk_p, ARRAY_SIZE(mux_armclk_p),
-                       &rk1108_cpuclk_data, rk1108_cpuclk_rates,
-                       ARRAY_SIZE(rk1108_cpuclk_rates));
-
-       rockchip_register_softrst(np, 13, reg_base + RK1108_SOFTRST_CON(0),
-                                 ROCKCHIP_SOFTRST_HIWORD_MASK);
-
-       rockchip_register_restart_notifier(ctx, RK1108_GLB_SRST_FST, NULL);
-
-       rockchip_clk_of_add_provider(np, ctx);
-}
-CLK_OF_DECLARE(rk1108_cru, "rockchip,rk1108-cru", rk1108_clk_init);
diff --git a/drivers/clk/rockchip/clk-rv1108.c b/drivers/clk/rockchip/clk-rv1108.c
new file mode 100644 (file)
index 0000000..7c05ab3
--- /dev/null
@@ -0,0 +1,531 @@
+/*
+ * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Shawn Lin <shawn.lin@rock-chips.com>
+ *         Andy Yan <andy.yan@rock-chips.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/syscore_ops.h>
+#include <dt-bindings/clock/rv1108-cru.h>
+#include "clk.h"
+
+#define RV1108_GRF_SOC_STATUS0 0x480
+
+enum rv1108_plls {
+       apll, dpll, gpll,
+};
+
+static struct rockchip_pll_rate_table rv1108_pll_rates[] = {
+       /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd, _frac */
+       RK3036_PLL_RATE(1608000000, 1, 67, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1584000000, 1, 66, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1560000000, 1, 65, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1536000000, 1, 64, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1512000000, 1, 63, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1488000000, 1, 62, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1464000000, 1, 61, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1440000000, 1, 60, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1416000000, 1, 59, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1392000000, 1, 58, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1368000000, 1, 57, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1344000000, 1, 56, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1320000000, 1, 55, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1296000000, 1, 54, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1272000000, 1, 53, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1248000000, 1, 52, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1200000000, 1, 50, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1188000000, 2, 99, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1104000000, 1, 46, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1100000000, 12, 550, 1, 1, 1, 0),
+       RK3036_PLL_RATE(1008000000, 1, 84, 2, 1, 1, 0),
+       RK3036_PLL_RATE(1000000000, 6, 500, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 984000000, 1, 82, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 960000000, 1, 80, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 936000000, 1, 78, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 912000000, 1, 76, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 900000000, 4, 300, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 888000000, 1, 74, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 864000000, 1, 72, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 840000000, 1, 70, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 816000000, 1, 68, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 800000000, 6, 400, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 700000000, 6, 350, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 696000000, 1, 58, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 600000000, 1, 75, 3, 1, 1, 0),
+       RK3036_PLL_RATE( 594000000, 2, 99, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 504000000, 1, 63, 3, 1, 1, 0),
+       RK3036_PLL_RATE( 500000000, 6, 250, 2, 1, 1, 0),
+       RK3036_PLL_RATE( 408000000, 1, 68, 2, 2, 1, 0),
+       RK3036_PLL_RATE( 312000000, 1, 52, 2, 2, 1, 0),
+       RK3036_PLL_RATE( 216000000, 1, 72, 4, 2, 1, 0),
+       RK3036_PLL_RATE(  96000000, 1, 64, 4, 4, 1, 0),
+       { /* sentinel */ },
+};
+
+#define RV1108_DIV_CORE_MASK           0xf
+#define RV1108_DIV_CORE_SHIFT          4
+
+#define RV1108_CLKSEL0(_core_peri_div) \
+       {                               \
+               .reg = RV1108_CLKSEL_CON(1),    \
+               .val = HIWORD_UPDATE(_core_peri_div, RV1108_DIV_CORE_MASK,\
+                               RV1108_DIV_CORE_SHIFT)  \
+       }
+
+#define RV1108_CPUCLK_RATE(_prate, _core_peri_div)                     \
+       {                                                               \
+               .prate = _prate,                                        \
+               .divs = {                                               \
+                       RV1108_CLKSEL0(_core_peri_div),         \
+               },                                                      \
+       }
+
+static struct rockchip_cpuclk_rate_table rv1108_cpuclk_rates[] __initdata = {
+       RV1108_CPUCLK_RATE(816000000, 4),
+       RV1108_CPUCLK_RATE(600000000, 4),
+       RV1108_CPUCLK_RATE(312000000, 4),
+};
+
+static const struct rockchip_cpuclk_reg_data rv1108_cpuclk_data = {
+       .core_reg = RV1108_CLKSEL_CON(0),
+       .div_core_shift = 0,
+       .div_core_mask = 0x1f,
+       .mux_core_alt = 1,
+       .mux_core_main = 0,
+       .mux_core_shift = 8,
+       .mux_core_mask = 0x1,
+};
+
+PNAME(mux_pll_p)               = { "xin24m", "xin24m"};
+PNAME(mux_ddrphy_p)            = { "dpll_ddr", "gpll_ddr", "apll_ddr" };
+PNAME(mux_armclk_p)            = { "apll_core", "gpll_core", "dpll_core" };
+PNAME(mux_usb480m_pre_p)       = { "usbphy", "xin24m" };
+PNAME(mux_hdmiphy_phy_p)       = { "hdmiphy", "xin24m" };
+PNAME(mux_dclk_hdmiphy_pre_p)  = { "dclk_hdmiphy_src_gpll", "dclk_hdmiphy_src_dpll" };
+PNAME(mux_pll_src_4plls_p)     = { "dpll", "hdmiphy", "gpll", "usb480m" };
+PNAME(mux_pll_src_3plls_p)     = { "apll", "gpll", "dpll" };
+PNAME(mux_pll_src_2plls_p)     = { "dpll", "gpll" };
+PNAME(mux_pll_src_apll_gpll_p) = { "apll", "gpll" };
+PNAME(mux_aclk_peri_src_p)     = { "aclk_peri_src_dpll", "aclk_peri_src_gpll" };
+PNAME(mux_aclk_bus_src_p)      = { "aclk_bus_src_gpll", "aclk_bus_src_apll", "aclk_bus_src_dpll" };
+PNAME(mux_mmc_src_p)           = { "dpll", "gpll", "xin24m", "usb480m" };
+PNAME(mux_pll_src_dpll_gpll_usb480m_p) = { "dpll", "gpll", "usb480m" };
+PNAME(mux_uart0_p)             = { "uart0_src", "uart0_frac", "xin24m" };
+PNAME(mux_uart1_p)             = { "uart1_src", "uart1_frac", "xin24m" };
+PNAME(mux_uart2_p)             = { "uart2_src", "uart2_frac", "xin24m" };
+PNAME(mux_sclk_macphy_p)       = { "sclk_macphy_pre", "ext_gmac" };
+PNAME(mux_i2s0_pre_p)          = { "i2s0_src", "i2s0_frac", "ext_i2s", "xin12m" };
+PNAME(mux_i2s_out_p)           = { "i2s0_pre", "xin12m" };
+PNAME(mux_i2s1_p)              = { "i2s1_src", "i2s1_frac", "xin12m" };
+PNAME(mux_i2s2_p)              = { "i2s2_src", "i2s2_frac", "xin12m" };
+
+static struct rockchip_pll_clock rv1108_pll_clks[] __initdata = {
+       [apll] = PLL(pll_rk3399, PLL_APLL, "apll", mux_pll_p, 0, RV1108_PLL_CON(0),
+                    RV1108_PLL_CON(3), 8, 31, 0, rv1108_pll_rates),
+       [dpll] = PLL(pll_rk3399, PLL_DPLL, "dpll", mux_pll_p, 0, RV1108_PLL_CON(8),
+                    RV1108_PLL_CON(11), 8, 31, 0, NULL),
+       [gpll] = PLL(pll_rk3399, PLL_GPLL, "gpll", mux_pll_p, 0, RV1108_PLL_CON(16),
+                    RV1108_PLL_CON(19), 8, 31, ROCKCHIP_PLL_SYNC_RATE, rv1108_pll_rates),
+};
+
+#define MFLAGS CLK_MUX_HIWORD_MASK
+#define DFLAGS CLK_DIVIDER_HIWORD_MASK
+#define GFLAGS (CLK_GATE_HIWORD_MASK | CLK_GATE_SET_TO_DISABLE)
+#define IFLAGS ROCKCHIP_INVERTER_HIWORD_MASK
+
+static struct rockchip_clk_branch rv1108_uart0_fracmux __initdata =
+       MUX(SCLK_UART0, "sclk_uart0", mux_uart0_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(13), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_uart1_fracmux __initdata =
+       MUX(SCLK_UART1, "sclk_uart1", mux_uart1_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(14), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_uart2_fracmux __initdata =
+       MUX(SCLK_UART2, "sclk_uart2", mux_uart2_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(15), 8, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_i2s0_fracmux __initdata =
+       MUX(0, "i2s0_pre", mux_i2s0_pre_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(5), 12, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_i2s1_fracmux __initdata =
+       MUX(0, "i2s1_pre", mux_i2s1_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(6), 12, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_i2s2_fracmux __initdata =
+       MUX(0, "i2s2_pre", mux_i2s2_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(7), 12, 2, MFLAGS);
+
+static struct rockchip_clk_branch rv1108_clk_branches[] __initdata = {
+       MUX(0, "hdmi_phy", mux_hdmiphy_phy_p, CLK_SET_RATE_PARENT,
+                       RV1108_MISC_CON, 13, 2, MFLAGS),
+       MUX(0, "usb480m", mux_usb480m_pre_p, CLK_SET_RATE_PARENT,
+                       RV1108_MISC_CON, 15, 2, MFLAGS),
+       /*
+        * Clock-Architecture Diagram 2
+        */
+
+       /* PD_CORE */
+       GATE(0, "dpll_core", "dpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 1, GFLAGS),
+       GATE(0, "apll_core", "apll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 0, GFLAGS),
+       GATE(0, "gpll_core", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 2, GFLAGS),
+       COMPOSITE_NOMUX(0, "pclken_dbg", "armclk", CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(1), 4, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,
+                       RV1108_CLKGATE_CON(0), 5, GFLAGS),
+       COMPOSITE_NOMUX(ACLK_ENMCORE, "aclkenm_core", "armclk", CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(1), 0, 3, DFLAGS | CLK_DIVIDER_READ_ONLY,
+                       RV1108_CLKGATE_CON(0), 4, GFLAGS),
+       GATE(ACLK_CORE, "aclk_core", "aclkenm_core", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(11), 0, GFLAGS),
+       GATE(0, "pclk_dbg", "pclken_dbg", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(11), 1, GFLAGS),
+
+       /* PD_RKVENC */
+
+       /* PD_RKVDEC */
+
+       /* PD_PMU_wrapper */
+       COMPOSITE_NOMUX(0, "pmu_24m_ena", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(38), 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(8), 12, GFLAGS),
+       GATE(0, "pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 0, GFLAGS),
+       GATE(0, "intmem1", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 1, GFLAGS),
+       GATE(0, "gpio0_pmu", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 2, GFLAGS),
+       GATE(0, "pmugrf", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 3, GFLAGS),
+       GATE(0, "pmu_noc", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 4, GFLAGS),
+       GATE(0, "i2c0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 5, GFLAGS),
+       GATE(0, "pwm0_pmu_pclk", "pmu_24m_ena", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(10), 6, GFLAGS),
+       COMPOSITE(0, "pwm0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(12), 7, 1, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(8), 15, GFLAGS),
+       COMPOSITE(0, "i2c0_pmu_clk", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(19), 7, 1, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(8), 14, GFLAGS),
+       GATE(0, "pvtm_pmu", "xin24m", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(8), 13, GFLAGS),
+
+       /*
+        * Clock-Architecture Diagram 4
+        */
+       COMPOSITE(0, "aclk_vio0_2wrap_occ", mux_pll_src_4plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(6), 0, GFLAGS),
+       GATE(0, "aclk_vio0_pre", "aclk_vio0_2wrap_occ", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(17), 0, GFLAGS),
+       COMPOSITE_NOMUX(0, "hclk_vio_pre", "aclk_vio0_pre", 0,
+                       RV1108_CLKSEL_CON(29), 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(7), 2, GFLAGS),
+       COMPOSITE_NOMUX(0, "pclk_vio_pre", "aclk_vio0_pre", 0,
+                       RV1108_CLKSEL_CON(29), 8, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(7), 3, GFLAGS),
+
+       INVERTER(0, "pclk_vip", "ext_vip",
+                       RV1108_CLKSEL_CON(31), 8, IFLAGS),
+       GATE(0, "pclk_isp_pre", "pclk_vip", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(7), 6, GFLAGS),
+       GATE(0, "pclk_isp", "pclk_isp_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(18), 10, GFLAGS),
+       GATE(0, "dclk_hdmiphy_src_gpll", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(6), 5, GFLAGS),
+       GATE(0, "dclk_hdmiphy_src_dpll", "dpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(6), 4, GFLAGS),
+       COMPOSITE_NOGATE(0, "dclk_hdmiphy", mux_dclk_hdmiphy_pre_p, 0,
+                       RV1108_CLKSEL_CON(32), 6, 2, MFLAGS, 8, 6, DFLAGS),
+
+       /*
+        * Clock-Architecture Diagram 5
+        */
+
+       FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
+
+       COMPOSITE(0, "i2s0_src", mux_pll_src_2plls_p, 0,
+                       RV1108_CLKSEL_CON(5), 8, 1, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(2), 0, GFLAGS),
+       COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(8), 0,
+                       RV1108_CLKGATE_CON(2), 1, GFLAGS,
+                       &rv1108_i2s0_fracmux),
+       GATE(SCLK_I2S0, "sclk_i2s0", "i2s0_pre", CLK_SET_RATE_PARENT,
+                       RV1108_CLKGATE_CON(2), 2, GFLAGS),
+       COMPOSITE_NODIV(0, "i2s_out", mux_i2s_out_p, 0,
+                       RV1108_CLKSEL_CON(5), 15, 1, MFLAGS,
+                       RV1108_CLKGATE_CON(2), 3, GFLAGS),
+
+       COMPOSITE(0, "i2s1_src", mux_pll_src_2plls_p, 0,
+                       RV1108_CLKSEL_CON(6), 8, 1, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(2), 4, GFLAGS),
+       COMPOSITE_FRACMUX(0, "i2s1_frac", "i2s1_src", CLK_SET_RATE_PARENT,
+                       RK2928_CLKSEL_CON(9), 0,
+                       RK2928_CLKGATE_CON(2), 5, GFLAGS,
+                       &rv1108_i2s1_fracmux),
+       GATE(SCLK_I2S1, "sclk_i2s1", "i2s1_pre", CLK_SET_RATE_PARENT,
+                       RV1108_CLKGATE_CON(2), 6, GFLAGS),
+
+       COMPOSITE(0, "i2s2_src", mux_pll_src_2plls_p, 0,
+                       RV1108_CLKSEL_CON(7), 8, 1, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 8, GFLAGS),
+       COMPOSITE_FRACMUX(0, "i2s2_frac", "i2s2_src", CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(10), 0,
+                       RV1108_CLKGATE_CON(2), 9, GFLAGS,
+                       &rv1108_i2s2_fracmux),
+       GATE(SCLK_I2S2, "sclk_i2s2", "i2s2_pre", CLK_SET_RATE_PARENT,
+                       RV1108_CLKGATE_CON(2), 10, GFLAGS),
+
+       /* PD_BUS */
+       GATE(0, "aclk_bus_src_gpll", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 0, GFLAGS),
+       GATE(0, "aclk_bus_src_apll", "apll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 1, GFLAGS),
+       GATE(0, "aclk_bus_src_dpll", "dpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 2, GFLAGS),
+       COMPOSITE_NOGATE(ACLK_PRE, "aclk_bus_pre", mux_aclk_bus_src_p, 0,
+                       RV1108_CLKSEL_CON(2), 8, 2, MFLAGS, 0, 5, DFLAGS),
+       COMPOSITE_NOMUX(0, "hclk_bus_pre", "aclk_bus_2wrap_occ", 0,
+                       RV1108_CLKSEL_CON(3), 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(1), 4, GFLAGS),
+       COMPOSITE_NOMUX(0, "pclken_bus", "aclk_bus_2wrap_occ", 0,
+                       RV1108_CLKSEL_CON(3), 8, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(1), 5, GFLAGS),
+       GATE(0, "pclk_bus_pre", "pclken_bus", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 6, GFLAGS),
+       GATE(0, "pclk_top_pre", "pclken_bus", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 7, GFLAGS),
+       GATE(0, "pclk_ddr_pre", "pclken_bus", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 8, GFLAGS),
+       GATE(0, "clk_timer0", "mux_pll_p", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 9, GFLAGS),
+       GATE(0, "clk_timer1", "mux_pll_p", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(1), 10, GFLAGS),
+       GATE(0, "pclk_timer", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 4, GFLAGS),
+
+       COMPOSITE(0, "uart0_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(13), 12, 2, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 1, GFLAGS),
+       COMPOSITE(0, "uart1_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(14), 12, 2, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 3, GFLAGS),
+       COMPOSITE(0, "uart21_src", mux_pll_src_dpll_gpll_usb480m_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(15), 12, 2, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 5, GFLAGS),
+
+       COMPOSITE_FRACMUX(0, "uart0_frac", "uart0_src", CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(16), 0,
+                       RV1108_CLKGATE_CON(3), 2, GFLAGS,
+                       &rv1108_uart0_fracmux),
+       COMPOSITE_FRACMUX(0, "uart1_frac", "uart1_src", CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(17), 0,
+                       RV1108_CLKGATE_CON(3), 4, GFLAGS,
+                       &rv1108_uart1_fracmux),
+       COMPOSITE_FRACMUX(0, "uart2_frac", "uart2_src", CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(18), 0,
+                       RV1108_CLKGATE_CON(3), 6, GFLAGS,
+                       &rv1108_uart2_fracmux),
+       GATE(PCLK_UART0, "pclk_uart0", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 10, GFLAGS),
+       GATE(PCLK_UART1, "pclk_uart1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 11, GFLAGS),
+       GATE(PCLK_UART2, "pclk_uart2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 12, GFLAGS),
+
+       COMPOSITE(0, "clk_i2c1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(19), 15, 2, MFLAGS, 8, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 7, GFLAGS),
+       COMPOSITE(0, "clk_i2c2", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(20), 7, 2, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 8, GFLAGS),
+       COMPOSITE(0, "clk_i2c3", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(20), 15, 2, MFLAGS, 8, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 9, GFLAGS),
+       GATE(0, "pclk_i2c1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 0, GFLAGS),
+       GATE(0, "pclk_i2c2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 1, GFLAGS),
+       GATE(0, "pclk_i2c3", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 2, GFLAGS),
+       COMPOSITE(0, "clk_pwm1", mux_pll_src_2plls_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(12), 15, 2, MFLAGS, 8, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(3), 10, GFLAGS),
+       GATE(0, "pclk_pwm1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 6, GFLAGS),
+       GATE(0, "pclk_wdt", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 3, GFLAGS),
+       GATE(0, "pclk_gpio1", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 7, GFLAGS),
+       GATE(0, "pclk_gpio2", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 8, GFLAGS),
+       GATE(0, "pclk_gpio3", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(13), 9, GFLAGS),
+
+       GATE(0, "pclk_grf", "pclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(14), 0, GFLAGS),
+
+       GATE(ACLK_DMAC, "aclk_dmac", "aclk_bus_pre", 0,
+            RV1108_CLKGATE_CON(12), 2, GFLAGS),
+       GATE(0, "hclk_rom", "hclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(12), 3, GFLAGS),
+       GATE(0, "aclk_intmem", "aclk_bus_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(12), 1, GFLAGS),
+
+       /* PD_DDR */
+       GATE(0, "apll_ddr", "apll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 8, GFLAGS),
+       GATE(0, "dpll_ddr", "dpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 9, GFLAGS),
+       GATE(0, "gpll_ddr", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 10, GFLAGS),
+       COMPOSITE(0, "ddrphy4x", mux_ddrphy_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(4), 8, 2, MFLAGS, 0, 3,
+                       DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
+                       RV1108_CLKGATE_CON(10), 9, GFLAGS),
+       GATE(0, "ddrupctl", "ddrphy_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(12), 4, GFLAGS),
+       GATE(0, "ddrc", "ddrphy", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(12), 5, GFLAGS),
+       GATE(0, "ddrmon", "ddrphy_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(12), 6, GFLAGS),
+       GATE(0, "timer_clk", "xin24m", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(0), 11, GFLAGS),
+
+       /*
+        * Clock-Architecture Diagram 6
+        */
+
+       /* PD_PERI */
+       COMPOSITE_NOMUX(0, "pclk_periph_pre", "gpll", 0,
+                       RV1108_CLKSEL_CON(23), 10, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(4), 5, GFLAGS),
+       GATE(0, "pclk_periph", "pclk_periph_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(15), 13, GFLAGS),
+       COMPOSITE_NOMUX(0, "hclk_periph_pre", "gpll", 0,
+                       RV1108_CLKSEL_CON(23), 5, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(4), 4, GFLAGS),
+       GATE(0, "hclk_periph", "hclk_periph_pre", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(15), 12, GFLAGS),
+
+       GATE(0, "aclk_peri_src_dpll", "dpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(4), 1, GFLAGS),
+       GATE(0, "aclk_peri_src_gpll", "gpll", CLK_IGNORE_UNUSED,
+                       RV1108_CLKGATE_CON(4), 2, GFLAGS),
+       COMPOSITE(0, "aclk_periph", mux_aclk_peri_src_p, CLK_IGNORE_UNUSED,
+                       RV1108_CLKSEL_CON(23), 15, 2, MFLAGS, 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(15), 11, GFLAGS),
+
+       COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0,
+                       RV1108_CLKSEL_CON(25), 8, 2, MFLAGS, 0, 8, DFLAGS,
+                       RV1108_CLKGATE_CON(5), 0, GFLAGS),
+
+       COMPOSITE_NODIV(0, "sclk_sdio_src", mux_mmc_src_p, 0,
+                       RV1108_CLKSEL_CON(25), 10, 2, MFLAGS,
+                       RV1108_CLKGATE_CON(5), 2, GFLAGS),
+       DIV(SCLK_SDIO, "sclk_sdio", "sclk_sdio_src", 0,
+                       RV1108_CLKSEL_CON(26), 0, 8, DFLAGS),
+
+       COMPOSITE_NODIV(0, "sclk_emmc_src", mux_mmc_src_p, 0,
+                       RV1108_CLKSEL_CON(25), 12, 2, MFLAGS,
+                       RV1108_CLKGATE_CON(5), 1, GFLAGS),
+       DIV(SCLK_EMMC, "sclk_emmc", "sclk_emmc_src", 0,
+                       RK2928_CLKSEL_CON(26), 8, 8, DFLAGS),
+       GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_periph", 0, RV1108_CLKGATE_CON(15), 0, GFLAGS),
+       GATE(HCLK_SDIO, "hclk_sdio", "hclk_periph", 0, RV1108_CLKGATE_CON(15), 1, GFLAGS),
+       GATE(HCLK_EMMC, "hclk_emmc", "hclk_periph", 0, RV1108_CLKGATE_CON(15), 2, GFLAGS),
+
+       COMPOSITE(SCLK_NANDC, "sclk_nandc", mux_pll_src_2plls_p, 0,
+                       RV1108_CLKSEL_CON(27), 14, 2, MFLAGS, 8, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(5), 3, GFLAGS),
+       GATE(HCLK_NANDC, "hclk_nandc", "hclk_periph", 0, RV1108_CLKGATE_CON(15), 3, GFLAGS),
+
+       COMPOSITE(SCLK_SFC, "sclk_sfc", mux_pll_src_2plls_p, 0,
+                       RV1108_CLKSEL_CON(27), 7, 2, MFLAGS, 0, 7, DFLAGS,
+                       RV1108_CLKGATE_CON(5), 4, GFLAGS),
+       GATE(HCLK_SFC, "hclk_sfc", "hclk_periph", 0, RV1108_CLKGATE_CON(15), 10, GFLAGS),
+
+       COMPOSITE(0, "sclk_macphy_pre", mux_pll_src_apll_gpll_p, 0,
+                       RV1108_CLKSEL_CON(24), 12, 2, MFLAGS, 0, 5, DFLAGS,
+                       RV1108_CLKGATE_CON(4), 10, GFLAGS),
+       MUX(0, "sclk_macphy", mux_sclk_macphy_p, CLK_SET_RATE_PARENT,
+                       RV1108_CLKSEL_CON(24), 8, 2, MFLAGS),
+       GATE(0, "sclk_macphy_rx", "sclk_macphy", 0, RV1108_CLKGATE_CON(4), 8, GFLAGS),
+       GATE(0, "sclk_mac_ref", "sclk_macphy", 0, RV1108_CLKGATE_CON(4), 6, GFLAGS),
+       GATE(0, "sclk_mac_refout", "sclk_macphy", 0, RV1108_CLKGATE_CON(4), 7, GFLAGS),
+
+       MMC(SCLK_SDMMC_DRV,    "sdmmc_drv",    "sclk_sdmmc", RV1108_SDMMC_CON0, 1),
+       MMC(SCLK_SDMMC_SAMPLE, "sdmmc_sample", "sclk_sdmmc", RV1108_SDMMC_CON1, 1),
+
+       MMC(SCLK_SDIO_DRV,     "sdio_drv",     "sclk_sdio",  RV1108_SDIO_CON0,  1),
+       MMC(SCLK_SDIO_SAMPLE,  "sdio_sample",  "sclk_sdio",  RV1108_SDIO_CON1,  1),
+
+       MMC(SCLK_EMMC_DRV,     "emmc_drv",     "sclk_emmc",  RV1108_EMMC_CON0,  1),
+       MMC(SCLK_EMMC_SAMPLE,  "emmc_sample",  "sclk_emmc",  RV1108_EMMC_CON1,  1),
+};
+
+static const char *const rv1108_critical_clocks[] __initconst = {
+       "aclk_core",
+       "aclk_bus_src_gpll",
+       "aclk_periph",
+       "hclk_periph",
+       "pclk_periph",
+};
+
+static void __init rv1108_clk_init(struct device_node *np)
+{
+       struct rockchip_clk_provider *ctx;
+       void __iomem *reg_base;
+
+       reg_base = of_iomap(np, 0);
+       if (!reg_base) {
+               pr_err("%s: could not map cru region\n", __func__);
+               return;
+       }
+
+       ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
+       if (IS_ERR(ctx)) {
+               pr_err("%s: rockchip clk init failed\n", __func__);
+               iounmap(reg_base);
+               return;
+       }
+
+       rockchip_clk_register_plls(ctx, rv1108_pll_clks,
+                                  ARRAY_SIZE(rv1108_pll_clks),
+                                  RV1108_GRF_SOC_STATUS0);
+       rockchip_clk_register_branches(ctx, rv1108_clk_branches,
+                                 ARRAY_SIZE(rv1108_clk_branches));
+       rockchip_clk_protect_critical(rv1108_critical_clocks,
+                                     ARRAY_SIZE(rv1108_critical_clocks));
+
+       rockchip_clk_register_armclk(ctx, ARMCLK, "armclk",
+                       mux_armclk_p, ARRAY_SIZE(mux_armclk_p),
+                       &rv1108_cpuclk_data, rv1108_cpuclk_rates,
+                       ARRAY_SIZE(rv1108_cpuclk_rates));
+
+       rockchip_register_softrst(np, 13, reg_base + RV1108_SOFTRST_CON(0),
+                                 ROCKCHIP_SOFTRST_HIWORD_MASK);
+
+       rockchip_register_restart_notifier(ctx, RV1108_GLB_SRST_FST, NULL);
+
+       rockchip_clk_of_add_provider(np, ctx);
+}
+CLK_OF_DECLARE(rv1108_cru, "rockchip,rv1108-cru", rv1108_clk_init);
index 7c15473ea72b233070238201100bc10c8c2de240..ef601dded32c49c217b625e893c1ddac20d78cd1 100644 (file)
@@ -34,20 +34,20 @@ struct clk;
 #define HIWORD_UPDATE(val, mask, shift) \
                ((val) << (shift) | (mask) << ((shift) + 16))
 
-/* register positions shared by RK1108, RK2928, RK3036, RK3066, RK3188 and RK3228 */
-#define RK1108_PLL_CON(x)              ((x) * 0x4)
-#define RK1108_CLKSEL_CON(x)           ((x) * 0x4 + 0x60)
-#define RK1108_CLKGATE_CON(x)          ((x) * 0x4 + 0x120)
-#define RK1108_SOFTRST_CON(x)          ((x) * 0x4 + 0x180)
-#define RK1108_GLB_SRST_FST            0x1c0
-#define RK1108_GLB_SRST_SND            0x1c4
-#define RK1108_MISC_CON                        0x1cc
-#define RK1108_SDMMC_CON0              0x1d8
-#define RK1108_SDMMC_CON1              0x1dc
-#define RK1108_SDIO_CON0               0x1e0
-#define RK1108_SDIO_CON1               0x1e4
-#define RK1108_EMMC_CON0               0x1e8
-#define RK1108_EMMC_CON1               0x1ec
+/* register positions shared by RV1108, RK2928, RK3036, RK3066, RK3188 and RK3228 */
+#define RV1108_PLL_CON(x)              ((x) * 0x4)
+#define RV1108_CLKSEL_CON(x)           ((x) * 0x4 + 0x60)
+#define RV1108_CLKGATE_CON(x)          ((x) * 0x4 + 0x120)
+#define RV1108_SOFTRST_CON(x)          ((x) * 0x4 + 0x180)
+#define RV1108_GLB_SRST_FST            0x1c0
+#define RV1108_GLB_SRST_SND            0x1c4
+#define RV1108_MISC_CON                        0x1cc
+#define RV1108_SDMMC_CON0              0x1d8
+#define RV1108_SDMMC_CON1              0x1dc
+#define RV1108_SDIO_CON0               0x1e0
+#define RV1108_SDIO_CON1               0x1e4
+#define RV1108_EMMC_CON0               0x1e8
+#define RV1108_EMMC_CON1               0x1ec
 
 #define RK2928_PLL_CON(x)              ((x) * 0x4)
 #define RK2928_MODE_CON                0x40
diff --git a/include/dt-bindings/clock/rk1108-cru.h b/include/dt-bindings/clock/rk1108-cru.h
deleted file mode 100644 (file)
index 9350a55..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
- * Author: Shawn Lin <shawn.lin@rock-chips.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H
-#define _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H
-
-/* pll id */
-#define PLL_APLL                       0
-#define PLL_DPLL                       1
-#define PLL_GPLL                       2
-#define ARMCLK                         3
-
-/* sclk gates (special clocks) */
-#define SCLK_SPI0                      65
-#define SCLK_NANDC                     67
-#define SCLK_SDMMC                     68
-#define SCLK_SDIO                      69
-#define SCLK_EMMC                      71
-#define SCLK_UART0                     72
-#define SCLK_UART1                     73
-#define SCLK_UART2                     74
-#define SCLK_I2S0                      75
-#define SCLK_I2S1                      76
-#define SCLK_I2S2                      77
-#define SCLK_TIMER0                    78
-#define SCLK_TIMER1                    79
-#define SCLK_SFC                       80
-#define SCLK_SDMMC_DRV                 81
-#define SCLK_SDIO_DRV                  82
-#define SCLK_EMMC_DRV                  83
-#define SCLK_SDMMC_SAMPLE              84
-#define SCLK_SDIO_SAMPLE               85
-#define SCLK_EMMC_SAMPLE               86
-
-/* aclk gates */
-#define ACLK_DMAC                      192
-#define ACLK_PRE                       193
-#define ACLK_CORE                      194
-#define ACLK_ENMCORE                   195
-
-/* pclk gates */
-#define PCLK_GPIO1                     256
-#define PCLK_GPIO2                     257
-#define PCLK_GPIO3                     258
-#define PCLK_GRF                       259
-#define PCLK_I2C1                      260
-#define PCLK_I2C2                      261
-#define PCLK_I2C3                      262
-#define PCLK_SPI                       263
-#define PCLK_SFC                       264
-#define PCLK_UART0                     265
-#define PCLK_UART1                     266
-#define PCLK_UART2                     267
-#define PCLK_TSADC                     268
-#define PCLK_PWM                       269
-#define PCLK_TIMER                     270
-#define PCLK_PERI                      271
-
-/* hclk gates */
-#define HCLK_I2S0_8CH                  320
-#define HCLK_I2S1_8CH                  321
-#define HCLK_I2S2_2CH                  322
-#define HCLK_NANDC                     323
-#define HCLK_SDMMC                     324
-#define HCLK_SDIO                      325
-#define HCLK_EMMC                      326
-#define HCLK_PERI                      327
-#define HCLK_SFC                       328
-
-#define CLK_NR_CLKS                    (HCLK_SFC + 1)
-
-/* reset id */
-#define SRST_CORE_PO_AD                0
-#define SRST_CORE_AD                   1
-#define SRST_L2_AD                     2
-#define SRST_CPU_NIU_AD                3
-#define SRST_CORE_PO                   4
-#define SRST_CORE                      5
-#define SRST_L2                        6
-#define SRST_CORE_DBG                  8
-#define PRST_DBG                       9
-#define RST_DAP                        10
-#define PRST_DBG_NIU                   11
-#define ARST_STRC_SYS_AD               15
-
-#define SRST_DDRPHY_CLKDIV             16
-#define SRST_DDRPHY                    17
-#define PRST_DDRPHY                    18
-#define PRST_HDMIPHY                   19
-#define PRST_VDACPHY                   20
-#define PRST_VADCPHY                   21
-#define PRST_MIPI_CSI_PHY              22
-#define PRST_MIPI_DSI_PHY              23
-#define PRST_ACODEC                    24
-#define ARST_BUS_NIU                   25
-#define PRST_TOP_NIU                   26
-#define ARST_INTMEM                    27
-#define HRST_ROM                       28
-#define ARST_DMAC                      29
-#define SRST_MSCH_NIU                  30
-#define PRST_MSCH_NIU                  31
-
-#define PRST_DDRUPCTL                  32
-#define NRST_DDRUPCTL                  33
-#define PRST_DDRMON                    34
-#define HRST_I2S0_8CH                  35
-#define MRST_I2S0_8CH                  36
-#define HRST_I2S1_2CH                  37
-#define MRST_IS21_2CH                  38
-#define HRST_I2S2_2CH                  39
-#define MRST_I2S2_2CH                  40
-#define HRST_CRYPTO                    41
-#define SRST_CRYPTO                    42
-#define PRST_SPI                       43
-#define SRST_SPI                       44
-#define PRST_UART0                     45
-#define PRST_UART1                     46
-#define PRST_UART2                     47
-
-#define SRST_UART0                     48
-#define SRST_UART1                     49
-#define SRST_UART2                     50
-#define PRST_I2C1                      51
-#define PRST_I2C2                      52
-#define PRST_I2C3                      53
-#define SRST_I2C1                      54
-#define SRST_I2C2                      55
-#define SRST_I2C3                      56
-#define PRST_PWM1                      58
-#define SRST_PWM1                      60
-#define PRST_WDT                       61
-#define PRST_GPIO1                     62
-#define PRST_GPIO2                     63
-
-#define PRST_GPIO3                     64
-#define PRST_GRF                       65
-#define PRST_EFUSE                     66
-#define PRST_EFUSE512                  67
-#define PRST_TIMER0                    68
-#define SRST_TIMER0                    69
-#define SRST_TIMER1                    70
-#define PRST_TSADC                     71
-#define SRST_TSADC                     72
-#define PRST_SARADC                    73
-#define SRST_SARADC                    74
-#define HRST_SYSBUS                    75
-#define PRST_USBGRF                    76
-
-#define ARST_PERIPH_NIU                80
-#define HRST_PERIPH_NIU                81
-#define PRST_PERIPH_NIU                82
-#define HRST_PERIPH                    83
-#define HRST_SDMMC                     84
-#define HRST_SDIO                      85
-#define HRST_EMMC                      86
-#define HRST_NANDC                     87
-#define NRST_NANDC                     88
-#define HRST_SFC                       89
-#define SRST_SFC                       90
-#define ARST_GMAC                      91
-#define HRST_OTG                       92
-#define SRST_OTG                       93
-#define SRST_OTG_ADP                   94
-#define HRST_HOST0                     95
-
-#define HRST_HOST0_AUX                 96
-#define HRST_HOST0_ARB                 97
-#define SRST_HOST0_EHCIPHY             98
-#define SRST_HOST0_UTMI                99
-#define SRST_USBPOR                    100
-#define SRST_UTMI0                     101
-#define SRST_UTMI1                     102
-
-#define ARST_VIO0_NIU                  102
-#define ARST_VIO1_NIU                  103
-#define HRST_VIO_NIU                   104
-#define PRST_VIO_NIU                   105
-#define ARST_VOP                       106
-#define HRST_VOP                       107
-#define DRST_VOP                       108
-#define ARST_IEP                       109
-#define HRST_IEP                       110
-#define ARST_RGA                       111
-#define HRST_RGA                       112
-#define SRST_RGA                       113
-#define PRST_CVBS                      114
-#define PRST_HDMI                      115
-#define SRST_HDMI                      116
-#define PRST_MIPI_DSI                  117
-
-#define ARST_ISP_NIU                   118
-#define HRST_ISP_NIU                   119
-#define HRST_ISP                       120
-#define SRST_ISP                       121
-#define ARST_VIP0                      122
-#define HRST_VIP0                      123
-#define PRST_VIP0                      124
-#define ARST_VIP1                      125
-#define HRST_VIP1                      126
-#define PRST_VIP1                      127
-#define ARST_VIP2                      128
-#define HRST_VIP2                      129
-#define PRST_VIP2                      120
-#define ARST_VIP3                      121
-#define HRST_VIP3                      122
-#define PRST_VIP4                      123
-
-#define PRST_CIF1TO4                   124
-#define SRST_CVBS_CLK                  125
-#define HRST_CVBS                      126
-
-#define ARST_VPU_NIU                   140
-#define HRST_VPU_NIU                   141
-#define ARST_VPU                       142
-#define HRST_VPU                       143
-#define ARST_RKVDEC_NIU                144
-#define HRST_RKVDEC_NIU                145
-#define ARST_RKVDEC                    146
-#define HRST_RKVDEC                    147
-#define SRST_RKVDEC_CABAC              148
-#define SRST_RKVDEC_CORE               149
-#define ARST_RKVENC_NIU                150
-#define HRST_RKVENC_NIU                151
-#define ARST_RKVENC                    152
-#define HRST_RKVENC                    153
-#define SRST_RKVENC_CORE               154
-
-#define SRST_DSP_CORE                  156
-#define SRST_DSP_SYS                   157
-#define SRST_DSP_GLOBAL                158
-#define SRST_DSP_OECM                  159
-#define PRST_DSP_IOP_NIU               160
-#define ARST_DSP_EPP_NIU               161
-#define ARST_DSP_EDP_NIU               162
-#define PRST_DSP_DBG_NIU               163
-#define PRST_DSP_CFG_NIU               164
-#define PRST_DSP_GRF                   165
-#define PRST_DSP_MAILBOX               166
-#define PRST_DSP_INTC                  167
-#define PRST_DSP_PFM_MON               169
-#define SRST_DSP_PFM_MON               170
-#define ARST_DSP_EDAP_NIU              171
-
-#define SRST_PMU                       172
-#define SRST_PMU_I2C0                  173
-#define PRST_PMU_I2C0                  174
-#define PRST_PMU_GPIO0                 175
-#define PRST_PMU_INTMEM                176
-#define PRST_PMU_PWM0                  177
-#define SRST_PMU_PWM0                  178
-#define PRST_PMU_GRF                   179
-#define SRST_PMU_NIU                   180
-#define SRST_PMU_PVTM                  181
-#define ARST_DSP_EDP_PERF              184
-#define ARST_DSP_EPP_PERF              185
-
-#endif /* _DT_BINDINGS_CLK_ROCKCHIP_RK1108_H */
diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h
new file mode 100644 (file)
index 0000000..ae26f81
--- /dev/null
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2016 Rockchip Electronics Co. Ltd.
+ * Author: Shawn Lin <shawn.lin@rock-chips.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H
+#define _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H
+
+/* pll id */
+#define PLL_APLL                       0
+#define PLL_DPLL                       1
+#define PLL_GPLL                       2
+#define ARMCLK                         3
+
+/* sclk gates (special clocks) */
+#define SCLK_SPI0                      65
+#define SCLK_NANDC                     67
+#define SCLK_SDMMC                     68
+#define SCLK_SDIO                      69
+#define SCLK_EMMC                      71
+#define SCLK_UART0                     72
+#define SCLK_UART1                     73
+#define SCLK_UART2                     74
+#define SCLK_I2S0                      75
+#define SCLK_I2S1                      76
+#define SCLK_I2S2                      77
+#define SCLK_TIMER0                    78
+#define SCLK_TIMER1                    79
+#define SCLK_SFC                       80
+#define SCLK_SDMMC_DRV                 81
+#define SCLK_SDIO_DRV                  82
+#define SCLK_EMMC_DRV                  83
+#define SCLK_SDMMC_SAMPLE              84
+#define SCLK_SDIO_SAMPLE               85
+#define SCLK_EMMC_SAMPLE               86
+
+/* aclk gates */
+#define ACLK_DMAC                      192
+#define ACLK_PRE                       193
+#define ACLK_CORE                      194
+#define ACLK_ENMCORE                   195
+
+/* pclk gates */
+#define PCLK_GPIO1                     256
+#define PCLK_GPIO2                     257
+#define PCLK_GPIO3                     258
+#define PCLK_GRF                       259
+#define PCLK_I2C1                      260
+#define PCLK_I2C2                      261
+#define PCLK_I2C3                      262
+#define PCLK_SPI                       263
+#define PCLK_SFC                       264
+#define PCLK_UART0                     265
+#define PCLK_UART1                     266
+#define PCLK_UART2                     267
+#define PCLK_TSADC                     268
+#define PCLK_PWM                       269
+#define PCLK_TIMER                     270
+#define PCLK_PERI                      271
+
+/* hclk gates */
+#define HCLK_I2S0_8CH                  320
+#define HCLK_I2S1_8CH                  321
+#define HCLK_I2S2_2CH                  322
+#define HCLK_NANDC                     323
+#define HCLK_SDMMC                     324
+#define HCLK_SDIO                      325
+#define HCLK_EMMC                      326
+#define HCLK_PERI                      327
+#define HCLK_SFC                       328
+
+#define CLK_NR_CLKS                    (HCLK_SFC + 1)
+
+/* reset id */
+#define SRST_CORE_PO_AD                0
+#define SRST_CORE_AD                   1
+#define SRST_L2_AD                     2
+#define SRST_CPU_NIU_AD                3
+#define SRST_CORE_PO                   4
+#define SRST_CORE                      5
+#define SRST_L2                        6
+#define SRST_CORE_DBG                  8
+#define PRST_DBG                       9
+#define RST_DAP                        10
+#define PRST_DBG_NIU                   11
+#define ARST_STRC_SYS_AD               15
+
+#define SRST_DDRPHY_CLKDIV             16
+#define SRST_DDRPHY                    17
+#define PRST_DDRPHY                    18
+#define PRST_HDMIPHY                   19
+#define PRST_VDACPHY                   20
+#define PRST_VADCPHY                   21
+#define PRST_MIPI_CSI_PHY              22
+#define PRST_MIPI_DSI_PHY              23
+#define PRST_ACODEC                    24
+#define ARST_BUS_NIU                   25
+#define PRST_TOP_NIU                   26
+#define ARST_INTMEM                    27
+#define HRST_ROM                       28
+#define ARST_DMAC                      29
+#define SRST_MSCH_NIU                  30
+#define PRST_MSCH_NIU                  31
+
+#define PRST_DDRUPCTL                  32
+#define NRST_DDRUPCTL                  33
+#define PRST_DDRMON                    34
+#define HRST_I2S0_8CH                  35
+#define MRST_I2S0_8CH                  36
+#define HRST_I2S1_2CH                  37
+#define MRST_IS21_2CH                  38
+#define HRST_I2S2_2CH                  39
+#define MRST_I2S2_2CH                  40
+#define HRST_CRYPTO                    41
+#define SRST_CRYPTO                    42
+#define PRST_SPI                       43
+#define SRST_SPI                       44
+#define PRST_UART0                     45
+#define PRST_UART1                     46
+#define PRST_UART2                     47
+
+#define SRST_UART0                     48
+#define SRST_UART1                     49
+#define SRST_UART2                     50
+#define PRST_I2C1                      51
+#define PRST_I2C2                      52
+#define PRST_I2C3                      53
+#define SRST_I2C1                      54
+#define SRST_I2C2                      55
+#define SRST_I2C3                      56
+#define PRST_PWM1                      58
+#define SRST_PWM1                      60
+#define PRST_WDT                       61
+#define PRST_GPIO1                     62
+#define PRST_GPIO2                     63
+
+#define PRST_GPIO3                     64
+#define PRST_GRF                       65
+#define PRST_EFUSE                     66
+#define PRST_EFUSE512                  67
+#define PRST_TIMER0                    68
+#define SRST_TIMER0                    69
+#define SRST_TIMER1                    70
+#define PRST_TSADC                     71
+#define SRST_TSADC                     72
+#define PRST_SARADC                    73
+#define SRST_SARADC                    74
+#define HRST_SYSBUS                    75
+#define PRST_USBGRF                    76
+
+#define ARST_PERIPH_NIU                80
+#define HRST_PERIPH_NIU                81
+#define PRST_PERIPH_NIU                82
+#define HRST_PERIPH                    83
+#define HRST_SDMMC                     84
+#define HRST_SDIO                      85
+#define HRST_EMMC                      86
+#define HRST_NANDC                     87
+#define NRST_NANDC                     88
+#define HRST_SFC                       89
+#define SRST_SFC                       90
+#define ARST_GMAC                      91
+#define HRST_OTG                       92
+#define SRST_OTG                       93
+#define SRST_OTG_ADP                   94
+#define HRST_HOST0                     95
+
+#define HRST_HOST0_AUX                 96
+#define HRST_HOST0_ARB                 97
+#define SRST_HOST0_EHCIPHY             98
+#define SRST_HOST0_UTMI                99
+#define SRST_USBPOR                    100
+#define SRST_UTMI0                     101
+#define SRST_UTMI1                     102
+
+#define ARST_VIO0_NIU                  102
+#define ARST_VIO1_NIU                  103
+#define HRST_VIO_NIU                   104
+#define PRST_VIO_NIU                   105
+#define ARST_VOP                       106
+#define HRST_VOP                       107
+#define DRST_VOP                       108
+#define ARST_IEP                       109
+#define HRST_IEP                       110
+#define ARST_RGA                       111
+#define HRST_RGA                       112
+#define SRST_RGA                       113
+#define PRST_CVBS                      114
+#define PRST_HDMI                      115
+#define SRST_HDMI                      116
+#define PRST_MIPI_DSI                  117
+
+#define ARST_ISP_NIU                   118
+#define HRST_ISP_NIU                   119
+#define HRST_ISP                       120
+#define SRST_ISP                       121
+#define ARST_VIP0                      122
+#define HRST_VIP0                      123
+#define PRST_VIP0                      124
+#define ARST_VIP1                      125
+#define HRST_VIP1                      126
+#define PRST_VIP1                      127
+#define ARST_VIP2                      128
+#define HRST_VIP2                      129
+#define PRST_VIP2                      120
+#define ARST_VIP3                      121
+#define HRST_VIP3                      122
+#define PRST_VIP4                      123
+
+#define PRST_CIF1TO4                   124
+#define SRST_CVBS_CLK                  125
+#define HRST_CVBS                      126
+
+#define ARST_VPU_NIU                   140
+#define HRST_VPU_NIU                   141
+#define ARST_VPU                       142
+#define HRST_VPU                       143
+#define ARST_RKVDEC_NIU                144
+#define HRST_RKVDEC_NIU                145
+#define ARST_RKVDEC                    146
+#define HRST_RKVDEC                    147
+#define SRST_RKVDEC_CABAC              148
+#define SRST_RKVDEC_CORE               149
+#define ARST_RKVENC_NIU                150
+#define HRST_RKVENC_NIU                151
+#define ARST_RKVENC                    152
+#define HRST_RKVENC                    153
+#define SRST_RKVENC_CORE               154
+
+#define SRST_DSP_CORE                  156
+#define SRST_DSP_SYS                   157
+#define SRST_DSP_GLOBAL                158
+#define SRST_DSP_OECM                  159
+#define PRST_DSP_IOP_NIU               160
+#define ARST_DSP_EPP_NIU               161
+#define ARST_DSP_EDP_NIU               162
+#define PRST_DSP_DBG_NIU               163
+#define PRST_DSP_CFG_NIU               164
+#define PRST_DSP_GRF                   165
+#define PRST_DSP_MAILBOX               166
+#define PRST_DSP_INTC                  167
+#define PRST_DSP_PFM_MON               169
+#define SRST_DSP_PFM_MON               170
+#define ARST_DSP_EDAP_NIU              171
+
+#define SRST_PMU                       172
+#define SRST_PMU_I2C0                  173
+#define PRST_PMU_I2C0                  174
+#define PRST_PMU_GPIO0                 175
+#define PRST_PMU_INTMEM                176
+#define PRST_PMU_PWM0                  177
+#define SRST_PMU_PWM0                  178
+#define PRST_PMU_GRF                   179
+#define SRST_PMU_NIU                   180
+#define SRST_PMU_PVTM                  181
+#define ARST_DSP_EDP_PERF              184
+#define ARST_DSP_EPP_PERF              185
+
+#endif /* _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H */