[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <54744E6F.9060901@rock-chips.com>
Date: Tue, 25 Nov 2014 17:39:59 +0800
From: Kever Yang <kever.yang@...k-chips.com>
To: Roger Chen <roger.chen@...k-chips.com>, heiko@...ech.de
CC: peppe.cavallaro@...com, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-rockchip@...ts.infradead.org,
mark.yao@...k-chips.com, eddie.cai@...k-chips.com
Subject: Re: [PATCH 2/4] GMAC: modify CRU config for Rockchip RK3288 SoCs
integrated GMAC
Hi Roger,
This patch should be split into two patch, one for clock ID definition,
one for mac related clocks update.
The Subject for clk-rk3288.c should use below prefix:
clk: rockchip: modify clock for mac ...
On 11/25/2014 05:08 PM, Roger Chen wrote:
> modify CRU config for GMAC driver
Could you detail the reason for this patch in commit message?
> Signed-off-by: Roger Chen <roger.chen@...k-chips.com>
> ---
> drivers/clk/rockchip/clk-rk3288.c | 14 +++++++-------
> include/dt-bindings/clock/rk3288-cru.h | 4 ++++
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
> index 2327829..60237dc 100644
> --- a/drivers/clk/rockchip/clk-rk3288.c
> +++ b/drivers/clk/rockchip/clk-rk3288.c
> @@ -187,7 +187,7 @@ PNAME(mux_uart2_p) = { "uart2_src", "uart2_frac", "xin24m" };
> PNAME(mux_uart3_p) = { "uart3_src", "uart3_frac", "xin24m" };
> PNAME(mux_uart4_p) = { "uart4_src", "uart4_frac", "xin24m" };
> PNAME(mux_cif_out_p) = { "cif_src", "xin24m" };
> -PNAME(mux_macref_p) = { "mac_src", "ext_gmac" };
> +PNAME(mux_mac_p) = { "mac_pll_src", "ext_gmac" };
> PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };
> PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" };
> PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" };
> @@ -560,18 +560,18 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
> MUX(SCLK_UART4, "sclk_uart4", mux_uart4_p, 0,
> RK3288_CLKSEL_CON(3), 8, 2, MFLAGS),
>
> - COMPOSITE(0, "mac_src", mux_pll_src_npll_cpll_gpll_p, 0,
> + COMPOSITE(SCLK_MAC_PLL, "mac_pll_src", mux_pll_src_npll_cpll_gpll_p, 0,
> RK3288_CLKSEL_CON(21), 0, 2, MFLAGS, 8, 5, DFLAGS,
> RK3288_CLKGATE_CON(2), 5, GFLAGS),
> - MUX(0, "macref", mux_macref_p, 0,
> + MUX(SCLK_MAC, "mac_clk", mux_mac_p, 0,
> RK3288_CLKSEL_CON(21), 4, 1, MFLAGS),
> - GATE(0, "sclk_macref_out", "macref", 0,
> + GATE(SCLK_MACREF_OUT, "sclk_macref_out", "mac_clk", 0,
> RK3288_CLKGATE_CON(5), 3, GFLAGS),
> - GATE(SCLK_MACREF, "sclk_macref", "macref", 0,
> + GATE(SCLK_MACREF, "sclk_macref", "mac_clk", 0,
> RK3288_CLKGATE_CON(5), 2, GFLAGS),
> - GATE(SCLK_MAC_RX, "sclk_mac_rx", "macref", 0,
> + GATE(SCLK_MAC_RX, "sclk_mac_rx", "mac_clk", 0,
> RK3288_CLKGATE_CON(5), 0, GFLAGS),
> - GATE(SCLK_MAC_TX, "sclk_mac_tx", "macref", 0,
> + GATE(SCLK_MAC_TX, "sclk_mac_tx", "mac_clk", 0,
> RK3288_CLKGATE_CON(5), 1, GFLAGS),
>
> COMPOSITE(0, "hsadc_src", mux_pll_src_cpll_gpll_p, 0,
> diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
> index 100a08c..f9496f5 100644
> --- a/include/dt-bindings/clock/rk3288-cru.h
> +++ b/include/dt-bindings/clock/rk3288-cru.h
> @@ -72,6 +72,10 @@
> #define SCLK_HEVC_CABAC 111
> #define SCLK_HEVC_CORE 112
>
> +#define SCLK_MAC_PLL 150
> +#define SCLK_MAC 151
> +#define SCLK_MACREF_OUT 152
> +
> #define DCLK_VOP0 190
> #define DCLK_VOP1 191
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists