From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Feb 2016 03:53:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20160210~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7bd73acf42137374387418155311041403408a42;p=karo-tx-linux.git

Merge remote-tracking branch 'clk/clk-next'
---

7bd73acf42137374387418155311041403408a42
diff --cc drivers/clk/rockchip/clk-rk3036.c
index 5759d75780cf,bc7fbac83ab7..0703c8f08ef8
--- a/drivers/clk/rockchip/clk-rk3036.c
+++ b/drivers/clk/rockchip/clk-rk3036.c
@@@ -354,9 -349,8 +354,9 @@@ static struct rockchip_clk_branch rk303
  			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),
 +	FACTOR(0, "sclk_macref_out", "hclk_peri_src", 0, 1, 2),
  
  	MUX(SCLK_HDMI, "dclk_hdmi", mux_dclk_p, 0,
  			RK2928_CLKSEL_CON(31), 0, 1, MFLAGS),