From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] clk: rockchip: use the clock id for nodes init
Date: Wed, 24 Sep 2014 16:13:38 +0200 [thread overview]
Message-ID: <2851535.OK273GeIKc@phil> (raw)
In-Reply-To: <1411565795-26966-3-git-send-email-kever.yang@rock-chips.com>
Am Mittwoch, 24. September 2014, 21:36:35 schrieb Kever Yang:
> This patch use the new defined clock ID to initial the clock nodes.
>
> This patch also add the clock nodes in PD_VIDEO.
Commit messages like this [two things the patch does, connected by
"and"/"also"] are normally a good indicator that it should be split into two
patches.
>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
apart from one style-nit below
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
>
> drivers/clk/rockchip/clk-rk3288.c | 79
> ++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+),
> 34 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3288.c
> b/drivers/clk/rockchip/clk-rk3288.c index 8ea885b..9268818 100644
> --- a/drivers/clk/rockchip/clk-rk3288.c
> +++ b/drivers/clk/rockchip/clk-rk3288.c
> @@ -219,12 +219,12 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(1), 15, 1, MFLAGS,
> 3, 5, DFLAGS),
> DIV(0, "aclk_cpu_pre", "aclk_cpu_src", 0,
> RK3288_CLKSEL_CON(1), 0, 3, DFLAGS),
> - GATE(0, "aclk_cpu", "aclk_cpu_pre", 0,
> + GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKGATE_CON(0), 3, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_cpu", "aclk_cpu_pre", 0,
> + COMPOSITE_NOMUX(PCLK_CPU, "pclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKSEL_CON(1), 12, 3, DFLAGS,
> RK3288_CLKGATE_CON(0), 5, GFLAGS),
> - COMPOSITE_NOMUX_DIVTBL(0, "hclk_cpu", "aclk_cpu_pre", 0,
> + COMPOSITE_NOMUX_DIVTBL(HCLK_CPU, "hclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKSEL_CON(1), 8, 2, DFLAGS, div_hclk_cpu_t,
> RK3288_CLKGATE_CON(0), 4, GFLAGS),
> GATE(0, "c2c_host", "aclk_cpu_src", 0,
> @@ -296,6 +296,17 @@ static struct rockchip_clk_branch rk3288_clk_branches[]
> __initdata = { COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb480m_p,
> 0,
> RK3288_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 11, GFLAGS),
> + /*
> + * We use aclk_vdpu by default GRF_SOC_CON0[7] setting in system,
> + * so we ignore the mux and make clocks nodes as following,
> + * NOTE THAT hclk_vcodec is fix div by 4 from aclk_vcodec_pre.
> + * */
comment ending is off, i.e. "* */" should be simple "*/" instead
> + GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vdpu", 0,
> + RK3288_CLKGATE_CON(9), 0, GFLAGS),
> + GATE(0, "hclk_vcodec_pre", "aclk_vdpu", 0,
> + RK3288_CLKGATE_CON(3), 10, GFLAGS),
> + GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0,
> + RK3288_CLKGATE_CON(9), 1, GFLAGS),
>
> COMPOSITE(0, "aclk_vio0", mux_pll_src_cpll_gpll_usb480m_p, 0,
> RK3288_CLKSEL_CON(31), 6, 2, MFLAGS, 0, 5, DFLAGS,
> @@ -309,7 +320,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[]
> __initdata = { COMPOSITE(0, "aclk_rga_pre",
> mux_pll_src_cpll_gpll_usb480m_p, 0, RK3288_CLKSEL_CON(30), 6, 2, MFLAGS, 0,
> 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 5, GFLAGS),
> - COMPOSITE(0, "sclk_rga", mux_pll_src_cpll_gpll_usb480m_p, 0,
> + COMPOSITE(SCLK_RGA, "sclk_rga", mux_pll_src_cpll_gpll_usb480m_p, 0,
> RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 4, GFLAGS),
>
> @@ -320,35 +331,35 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(29), 6, 2, MFLAGS,
> 8, 8, DFLAGS,
> RK3288_CLKGATE_CON(3), 3, GFLAGS),
>
> - COMPOSITE_NODIV(0, "sclk_edp_24m", mux_edp_24m_p, 0,
> + COMPOSITE_NODIV(SCLK_EDP_24M, "sclk_edp_24m", mux_edp_24m_p, 0,
> RK3288_CLKSEL_CON(28), 15, 1, MFLAGS,
> RK3288_CLKGATE_CON(3), 12, GFLAGS),
> - COMPOSITE(0, "sclk_edp", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_EDP, "sclk_edp", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 13, GFLAGS),
>
> - COMPOSITE(0, "sclk_isp", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_ISP, "sclk_isp", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(6), 6, 2, MFLAGS, 0, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 14, GFLAGS),
> - COMPOSITE(0, "sclk_isp_jpe", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_ISP_JPE, "sclk_isp_jpe", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(6), 14, 2, MFLAGS, 8, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 15, GFLAGS),
>
> - GATE(0, "sclk_hdmi_hdcp", "xin24m", 0,
> + GATE(SCLK_HDMI_HDCP, "sclk_hdmi_hdcp", "xin24m", 0,
> RK3288_CLKGATE_CON(5), 12, GFLAGS),
> - GATE(0, "sclk_hdmi_cec", "xin32k", 0,
> + GATE(SCLK_HDMI_CEC, "sclk_hdmi_cec", "xin32k", 0,
> RK3288_CLKGATE_CON(5), 11, GFLAGS),
>
> - COMPOSITE(0, "aclk_hevc", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(39), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(13), 13, GFLAGS),
> - DIV(0, "hclk_hevc", "aclk_hevc", 0,
> + DIV(HCLK_HEVC, "hclk_hevc", "aclk_hevc", 0,
> RK3288_CLKSEL_CON(40), 12, 2, DFLAGS),
>
> - COMPOSITE(0, "sclk_hevc_cabac", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_HEVC_CABAC, "sclk_hevc_cabac",
> mux_pll_src_cpll_gpll_npll_p, 0, RK3288_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5,
> DFLAGS,
> RK3288_CLKGATE_CON(13), 14, GFLAGS),
> - COMPOSITE(0, "sclk_hevc_core", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_HEVC_CORE, "sclk_hevc_core", mux_pll_src_cpll_gpll_npll_p,
> 0, RK3288_CLKSEL_CON(42), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(13), 15, GFLAGS),
>
> @@ -371,13 +382,13 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { COMPOSITE(0, "aclk_peri_src",
> mux_pll_src_cpll_gpll_p, 0,
> RK3288_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 5, DFLAGS,
> RK3288_CLKGATE_CON(2), 0, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_peri", "aclk_peri_src", 0,
> + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0,
> RK3288_CLKSEL_CON(10), 12, 2, DFLAGS |
CLK_DIVIDER_POWER_OF_TWO,
> RK3288_CLKGATE_CON(2), 3, GFLAGS),
> - COMPOSITE_NOMUX(0, "hclk_peri", "aclk_peri_src", 0,
> + COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_src", 0,
> RK3288_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
> RK3288_CLKGATE_CON(2), 2, GFLAGS),
> - GATE(0, "aclk_peri", "aclk_peri_src", 0,
> + GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", 0,
> RK3288_CLKGATE_CON(2), 1, GFLAGS),
>
> /*
> @@ -643,34 +654,34 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { GATE(HCLK_RGA, "hclk_rga", "hclk_vio",
> 0, RK3288_CLKGATE_CON(15), 1, GFLAGS), GATE(HCLK_VOP0, "hclk_vop0",
> "hclk_vio", 0, RK3288_CLKGATE_CON(15), 6, GFLAGS), GATE(HCLK_VOP1,
> "hclk_vop1", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 8, GFLAGS), - GATE(0,
> "hclk_vio_ahb_arbi", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 9, GFLAGS),
> - GATE(0, "hclk_vio_niu", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 10,
> GFLAGS), - GATE(0, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15,
> GFLAGS), + GATE(HCLK_VIO_AHB_ARBI, "hclk_vio_ahb_arbi", "hclk_vio", 0,
> RK3288_CLKGATE_CON(15), 9, GFLAGS), + GATE(HCLK_VIO_NIU, "hclk_vio_niu",
> "hclk_vio", 0, RK3288_CLKGATE_CON(15), 10, GFLAGS), + GATE(HCLK_VIP,
> "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS),
> GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3,
> GFLAGS), GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16),
> 1, GFLAGS), - GATE(0, "hclk_vio2_h2p", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 10, GFLAGS), - GATE(0, "pclk_mipi_dsi0",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 4, GFLAGS), - GATE(0,
> "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
> - GATE(0, "pclk_mipi_csi", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 6,
> GFLAGS), - GATE(0, "pclk_lvds_phy", "hclk_vio", 0, RK3288_CLKGATE_CON(16),
> 7, GFLAGS), - GATE(0, "pclk_edp_ctrl", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 8, GFLAGS), - GATE(0, "pclk_hdmi_ctrl",
"hclk_vio",
> 0, RK3288_CLKGATE_CON(16), 9, GFLAGS), - GATE(0, "pclk_vio2_h2p",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS), + GATE(HCLK_VIO2_H2P,
> "hclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 10, GFLAGS),
> + GATE(PCLK_MIPI_DSI0, "pclk_mipi_dsi0", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 4, GFLAGS), + GATE(PCLK_MIPI_DSI1,
> "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
> + GATE(PCLK_MIPI_CSI, "pclk_mipi_csi", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 6, GFLAGS), + GATE(PCLK_LVDS_PHY, "pclk_lvds_phy",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 7, GFLAGS), + GATE(PCLK_EDP_CTRL,
> "pclk_edp_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 8, GFLAGS),
> + GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 9, GFLAGS), + GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS),
>
> /* aclk_vio0 gates */
> GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5,
> GFLAGS), - GATE(0, "aclk_iep", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 2,
> GFLAGS), - GATE(0, "aclk_vio0_niu", "aclk_vio0", 0,
RK3288_CLKGATE_CON(15),
> 11, GFLAGS), - GATE(0, "aclk_vip", "aclk_vio0", 0,
RK3288_CLKGATE_CON(15),
> 14, GFLAGS), + GATE(ACLK_IEP, "aclk_iep", "aclk_vio0", 0,
> RK3288_CLKGATE_CON(15), 2, GFLAGS), + GATE(ACLK_VIO0_NIU, "aclk_vio0_niu",
> "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 11, GFLAGS), + GATE(ACLK_VIP,
> "aclk_vip", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 14, GFLAGS),
>
> /* aclk_vio1 gates */
> GATE(ACLK_VOP1, "aclk_vop1", "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 7,
> GFLAGS), - GATE(0, "aclk_isp", "aclk_vio1", 0, RK3288_CLKGATE_CON(16), 2,
> GFLAGS), - GATE(0, "aclk_vio1_niu", "aclk_vio1", 0,
RK3288_CLKGATE_CON(15),
> 12, GFLAGS), + GATE(ACLK_ISP, "aclk_isp", "aclk_vio1", 0,
> RK3288_CLKGATE_CON(16), 2, GFLAGS), + GATE(ACLK_VIO1_NIU, "aclk_vio1_niu",
> "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 12, GFLAGS),
>
> /* aclk_rga_pre gates */
> GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 0,
> GFLAGS), - GATE(0, "aclk_rga_niu", "aclk_rga_pre", 0,
> RK3288_CLKGATE_CON(15), 13, GFLAGS), + GATE(ACLK_RGA_NIU, "aclk_rga_niu",
> "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 13, GFLAGS),
>
> /*
> * Other ungrouped clocks.
WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: Kever Yang <kever.yang@rock-chips.com>
Cc: Mike Turquette <mturquette@linaro.org>,
dianders@chromium.org, sonnyrao@chromium.org,
addy.ke@rock-chips.com, cf@rock-chips.com, xjq@rock-chips.com,
hj@rock-chips.com, huangtao@rock-chips.com,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] clk: rockchip: use the clock id for nodes init
Date: Wed, 24 Sep 2014 16:13:38 +0200 [thread overview]
Message-ID: <2851535.OK273GeIKc@phil> (raw)
In-Reply-To: <1411565795-26966-3-git-send-email-kever.yang@rock-chips.com>
Am Mittwoch, 24. September 2014, 21:36:35 schrieb Kever Yang:
> This patch use the new defined clock ID to initial the clock nodes.
>
> This patch also add the clock nodes in PD_VIDEO.
Commit messages like this [two things the patch does, connected by
"and"/"also"] are normally a good indicator that it should be split into two
patches.
>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
apart from one style-nit below
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
>
> drivers/clk/rockchip/clk-rk3288.c | 79
> ++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+),
> 34 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3288.c
> b/drivers/clk/rockchip/clk-rk3288.c index 8ea885b..9268818 100644
> --- a/drivers/clk/rockchip/clk-rk3288.c
> +++ b/drivers/clk/rockchip/clk-rk3288.c
> @@ -219,12 +219,12 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(1), 15, 1, MFLAGS,
> 3, 5, DFLAGS),
> DIV(0, "aclk_cpu_pre", "aclk_cpu_src", 0,
> RK3288_CLKSEL_CON(1), 0, 3, DFLAGS),
> - GATE(0, "aclk_cpu", "aclk_cpu_pre", 0,
> + GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKGATE_CON(0), 3, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_cpu", "aclk_cpu_pre", 0,
> + COMPOSITE_NOMUX(PCLK_CPU, "pclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKSEL_CON(1), 12, 3, DFLAGS,
> RK3288_CLKGATE_CON(0), 5, GFLAGS),
> - COMPOSITE_NOMUX_DIVTBL(0, "hclk_cpu", "aclk_cpu_pre", 0,
> + COMPOSITE_NOMUX_DIVTBL(HCLK_CPU, "hclk_cpu", "aclk_cpu_pre", 0,
> RK3288_CLKSEL_CON(1), 8, 2, DFLAGS, div_hclk_cpu_t,
> RK3288_CLKGATE_CON(0), 4, GFLAGS),
> GATE(0, "c2c_host", "aclk_cpu_src", 0,
> @@ -296,6 +296,17 @@ static struct rockchip_clk_branch rk3288_clk_branches[]
> __initdata = { COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb480m_p,
> 0,
> RK3288_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 11, GFLAGS),
> + /*
> + * We use aclk_vdpu by default GRF_SOC_CON0[7] setting in system,
> + * so we ignore the mux and make clocks nodes as following,
> + * NOTE THAT hclk_vcodec is fix div by 4 from aclk_vcodec_pre.
> + * */
comment ending is off, i.e. "* */" should be simple "*/" instead
> + GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vdpu", 0,
> + RK3288_CLKGATE_CON(9), 0, GFLAGS),
> + GATE(0, "hclk_vcodec_pre", "aclk_vdpu", 0,
> + RK3288_CLKGATE_CON(3), 10, GFLAGS),
> + GATE(HCLK_VCODEC, "hclk_vcodec", "hclk_vcodec_pre", 0,
> + RK3288_CLKGATE_CON(9), 1, GFLAGS),
>
> COMPOSITE(0, "aclk_vio0", mux_pll_src_cpll_gpll_usb480m_p, 0,
> RK3288_CLKSEL_CON(31), 6, 2, MFLAGS, 0, 5, DFLAGS,
> @@ -309,7 +320,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[]
> __initdata = { COMPOSITE(0, "aclk_rga_pre",
> mux_pll_src_cpll_gpll_usb480m_p, 0, RK3288_CLKSEL_CON(30), 6, 2, MFLAGS, 0,
> 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 5, GFLAGS),
> - COMPOSITE(0, "sclk_rga", mux_pll_src_cpll_gpll_usb480m_p, 0,
> + COMPOSITE(SCLK_RGA, "sclk_rga", mux_pll_src_cpll_gpll_usb480m_p, 0,
> RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(3), 4, GFLAGS),
>
> @@ -320,35 +331,35 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(29), 6, 2, MFLAGS,
> 8, 8, DFLAGS,
> RK3288_CLKGATE_CON(3), 3, GFLAGS),
>
> - COMPOSITE_NODIV(0, "sclk_edp_24m", mux_edp_24m_p, 0,
> + COMPOSITE_NODIV(SCLK_EDP_24M, "sclk_edp_24m", mux_edp_24m_p, 0,
> RK3288_CLKSEL_CON(28), 15, 1, MFLAGS,
> RK3288_CLKGATE_CON(3), 12, GFLAGS),
> - COMPOSITE(0, "sclk_edp", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_EDP, "sclk_edp", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(28), 6, 2, MFLAGS, 0, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 13, GFLAGS),
>
> - COMPOSITE(0, "sclk_isp", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_ISP, "sclk_isp", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(6), 6, 2, MFLAGS, 0, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 14, GFLAGS),
> - COMPOSITE(0, "sclk_isp_jpe", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_ISP_JPE, "sclk_isp_jpe", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(6), 14, 2, MFLAGS, 8, 6, DFLAGS,
> RK3288_CLKGATE_CON(3), 15, GFLAGS),
>
> - GATE(0, "sclk_hdmi_hdcp", "xin24m", 0,
> + GATE(SCLK_HDMI_HDCP, "sclk_hdmi_hdcp", "xin24m", 0,
> RK3288_CLKGATE_CON(5), 12, GFLAGS),
> - GATE(0, "sclk_hdmi_cec", "xin32k", 0,
> + GATE(SCLK_HDMI_CEC, "sclk_hdmi_cec", "xin32k", 0,
> RK3288_CLKGATE_CON(5), 11, GFLAGS),
>
> - COMPOSITE(0, "aclk_hevc", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(ACLK_HEVC, "aclk_hevc", mux_pll_src_cpll_gpll_npll_p, 0,
> RK3288_CLKSEL_CON(39), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(13), 13, GFLAGS),
> - DIV(0, "hclk_hevc", "aclk_hevc", 0,
> + DIV(HCLK_HEVC, "hclk_hevc", "aclk_hevc", 0,
> RK3288_CLKSEL_CON(40), 12, 2, DFLAGS),
>
> - COMPOSITE(0, "sclk_hevc_cabac", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_HEVC_CABAC, "sclk_hevc_cabac",
> mux_pll_src_cpll_gpll_npll_p, 0, RK3288_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5,
> DFLAGS,
> RK3288_CLKGATE_CON(13), 14, GFLAGS),
> - COMPOSITE(0, "sclk_hevc_core", mux_pll_src_cpll_gpll_npll_p, 0,
> + COMPOSITE(SCLK_HEVC_CORE, "sclk_hevc_core", mux_pll_src_cpll_gpll_npll_p,
> 0, RK3288_CLKSEL_CON(42), 14, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(13), 15, GFLAGS),
>
> @@ -371,13 +382,13 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { COMPOSITE(0, "aclk_peri_src",
> mux_pll_src_cpll_gpll_p, 0,
> RK3288_CLKSEL_CON(10), 15, 1, MFLAGS, 0, 5, DFLAGS,
> RK3288_CLKGATE_CON(2), 0, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_peri", "aclk_peri_src", 0,
> + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0,
> RK3288_CLKSEL_CON(10), 12, 2, DFLAGS |
CLK_DIVIDER_POWER_OF_TWO,
> RK3288_CLKGATE_CON(2), 3, GFLAGS),
> - COMPOSITE_NOMUX(0, "hclk_peri", "aclk_peri_src", 0,
> + COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_src", 0,
> RK3288_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO,
> RK3288_CLKGATE_CON(2), 2, GFLAGS),
> - GATE(0, "aclk_peri", "aclk_peri_src", 0,
> + GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", 0,
> RK3288_CLKGATE_CON(2), 1, GFLAGS),
>
> /*
> @@ -643,34 +654,34 @@ static struct rockchip_clk_branch
> rk3288_clk_branches[] __initdata = { GATE(HCLK_RGA, "hclk_rga", "hclk_vio",
> 0, RK3288_CLKGATE_CON(15), 1, GFLAGS), GATE(HCLK_VOP0, "hclk_vop0",
> "hclk_vio", 0, RK3288_CLKGATE_CON(15), 6, GFLAGS), GATE(HCLK_VOP1,
> "hclk_vop1", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 8, GFLAGS), - GATE(0,
> "hclk_vio_ahb_arbi", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 9, GFLAGS),
> - GATE(0, "hclk_vio_niu", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 10,
> GFLAGS), - GATE(0, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15,
> GFLAGS), + GATE(HCLK_VIO_AHB_ARBI, "hclk_vio_ahb_arbi", "hclk_vio", 0,
> RK3288_CLKGATE_CON(15), 9, GFLAGS), + GATE(HCLK_VIO_NIU, "hclk_vio_niu",
> "hclk_vio", 0, RK3288_CLKGATE_CON(15), 10, GFLAGS), + GATE(HCLK_VIP,
> "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS),
> GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3,
> GFLAGS), GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16),
> 1, GFLAGS), - GATE(0, "hclk_vio2_h2p", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 10, GFLAGS), - GATE(0, "pclk_mipi_dsi0",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 4, GFLAGS), - GATE(0,
> "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
> - GATE(0, "pclk_mipi_csi", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 6,
> GFLAGS), - GATE(0, "pclk_lvds_phy", "hclk_vio", 0, RK3288_CLKGATE_CON(16),
> 7, GFLAGS), - GATE(0, "pclk_edp_ctrl", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 8, GFLAGS), - GATE(0, "pclk_hdmi_ctrl",
"hclk_vio",
> 0, RK3288_CLKGATE_CON(16), 9, GFLAGS), - GATE(0, "pclk_vio2_h2p",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS), + GATE(HCLK_VIO2_H2P,
> "hclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 10, GFLAGS),
> + GATE(PCLK_MIPI_DSI0, "pclk_mipi_dsi0", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 4, GFLAGS), + GATE(PCLK_MIPI_DSI1,
> "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS),
> + GATE(PCLK_MIPI_CSI, "pclk_mipi_csi", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 6, GFLAGS), + GATE(PCLK_LVDS_PHY, "pclk_lvds_phy",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 7, GFLAGS), + GATE(PCLK_EDP_CTRL,
> "pclk_edp_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 8, GFLAGS),
> + GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio", 0,
> RK3288_CLKGATE_CON(16), 9, GFLAGS), + GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p",
> "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS),
>
> /* aclk_vio0 gates */
> GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5,
> GFLAGS), - GATE(0, "aclk_iep", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 2,
> GFLAGS), - GATE(0, "aclk_vio0_niu", "aclk_vio0", 0,
RK3288_CLKGATE_CON(15),
> 11, GFLAGS), - GATE(0, "aclk_vip", "aclk_vio0", 0,
RK3288_CLKGATE_CON(15),
> 14, GFLAGS), + GATE(ACLK_IEP, "aclk_iep", "aclk_vio0", 0,
> RK3288_CLKGATE_CON(15), 2, GFLAGS), + GATE(ACLK_VIO0_NIU, "aclk_vio0_niu",
> "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 11, GFLAGS), + GATE(ACLK_VIP,
> "aclk_vip", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 14, GFLAGS),
>
> /* aclk_vio1 gates */
> GATE(ACLK_VOP1, "aclk_vop1", "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 7,
> GFLAGS), - GATE(0, "aclk_isp", "aclk_vio1", 0, RK3288_CLKGATE_CON(16), 2,
> GFLAGS), - GATE(0, "aclk_vio1_niu", "aclk_vio1", 0,
RK3288_CLKGATE_CON(15),
> 12, GFLAGS), + GATE(ACLK_ISP, "aclk_isp", "aclk_vio1", 0,
> RK3288_CLKGATE_CON(16), 2, GFLAGS), + GATE(ACLK_VIO1_NIU, "aclk_vio1_niu",
> "aclk_vio1", 0, RK3288_CLKGATE_CON(15), 12, GFLAGS),
>
> /* aclk_rga_pre gates */
> GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 0,
> GFLAGS), - GATE(0, "aclk_rga_niu", "aclk_rga_pre", 0,
> RK3288_CLKGATE_CON(15), 13, GFLAGS), + GATE(ACLK_RGA_NIU, "aclk_rga_niu",
> "aclk_rga_pre", 0, RK3288_CLKGATE_CON(15), 13, GFLAGS),
>
> /*
> * Other ungrouped clocks.
next prev parent reply other threads:[~2014-09-24 14:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 13:36 [PATCH 0/2] Add clock binding id for rk3288 Kever Yang
2014-09-24 13:36 ` Kever Yang
[not found] ` <1411565795-26966-1-git-send-email-kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2014-09-24 13:36 ` [PATCH 1/2] clk: rockchip: add some needed " Kever Yang
2014-09-24 13:36 ` Kever Yang
2014-09-24 14:06 ` Heiko Stübner
2014-09-24 13:36 ` [PATCH 2/2] clk: rockchip: use the clock id for nodes init Kever Yang
2014-09-24 13:36 ` Kever Yang
2014-09-24 14:13 ` Heiko Stübner [this message]
2014-09-24 14:13 ` Heiko Stübner
2014-09-25 22:01 ` [PATCH 0/2] Add clock binding id for rk3288 Mike Turquette
2014-09-25 22:01 ` Mike Turquette
2014-09-25 22:01 ` Mike Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2851535.OK273GeIKc@phil \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.