aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhengxing <zhengxing@rock-chips.com>2016-01-07 20:17:35 +0800
committerKees Cook <keescook@chromium.org>2016-01-11 15:16:35 -0800
commit424e0c4390df489d6f87b0cbb154a0ab11b2f139 (patch)
tree9ae467fa4a4e2e471b8c63e0dd054364ac7e40a9
parent53f501cfc7614781bc16b85a03714ef26784c4f0 (diff)
downloadv4.1-424e0c4390df489d6f87b0cbb154a0ab11b2f139.tar.gz
FROMLIST: clk: rockchip: rk3036: fix the div offset for emac clock
Due to reference to old version TRM, there are incorrect emac clock node. The SEL_21_9 is used for the parent div, the SEL_21_4 is used for the child div. Signed-off-by: Xing Zheng <zhengxing@rock-chips.com> Bug: 25923642 Patchset: emac clock patch[3/5]. (am from https://patchwork.kernel.org/patch/7976531/) Signed-off-by: Caesar Wang <wxt@rock-chips.com> Change-Id: I97dc858272da72f217c8620d95b3f0f310861bcc
-rw-r--r--drivers/clk/rockchip/clk-rk3036.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c
index f8893e0a0d5..78010104e99 100644
--- a/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@ -329,12 +329,12 @@ static struct rockchip_clk_branch rk3036_clk_branches[] __initdata = {
RK2928_CLKGATE_CON(10), 5, GFLAGS),
COMPOSITE_NOGATE(0, "mac_pll_src", mux_pll_src_3plls_p, 0,
- RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 4, 5, DFLAGS),
+ RK2928_CLKSEL_CON(21), 0, 2, MFLAGS, 9, 5, DFLAGS),
MUX(SCLK_MACREF, "mac_clk_ref", mux_mac_p, CLK_SET_RATE_PARENT,
RK2928_CLKSEL_CON(21), 3, 1, MFLAGS),
COMPOSITE_NOMUX(SCLK_MAC, "mac_clk", "mac_clk_ref", 0,
- RK2928_CLKSEL_CON(21), 9, 5, DFLAGS,
+ RK2928_CLKSEL_CON(21), 4, 5, DFLAGS,
RK2928_CLKGATE_CON(2), 6, GFLAGS),
MUX(SCLK_HDMI, "dclk_hdmi", mux_dclk_p, 0,