]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
update queue-3.18/clk-rockchip-fix-rk3066-pll-lock-bit-location.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jan 2015 19:25:34 +0000 (03:25 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jan 2015 19:25:34 +0000 (03:25 +0800)
queue-3.18/clk-rockchip-fix-rk3066-pll-lock-bit-location.patch

index 7319a5c778acd60d0d0004ff1d1471580fa35edc..d04675de763fcdc142292188e8b142fc9dbc4140 100644 (file)
@@ -24,6 +24,7 @@ Fixes: 2c14736c75db ("clk: rockchip: add clock driver for rk3188 and rk3066 cloc
 Tested-by: FUKAUMI Naoki <naobsd@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
+
 ---
  drivers/clk/rockchip/clk-rk3188.c |   15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
@@ -36,13 +37,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 +static struct rockchip_pll_clock rk3066_pll_clks[] __initdata = {
 +      [apll] = PLL(pll_rk3066, PLL_APLL, "apll", mux_pll_p, 0, RK2928_PLL_CON(0),
-+                   RK2928_MODE_CON, 0, 5, 0, rk3188_pll_rates),
++                   RK2928_MODE_CON, 0, 5, rk3188_pll_rates),
 +      [dpll] = PLL(pll_rk3066, PLL_DPLL, "dpll", mux_pll_p, 0, RK2928_PLL_CON(4),
-+                   RK2928_MODE_CON, 4, 4, 0, NULL),
++                   RK2928_MODE_CON, 4, 4, NULL),
 +      [cpll] = PLL(pll_rk3066, PLL_CPLL, "cpll", mux_pll_p, 0, RK2928_PLL_CON(8),
-+                   RK2928_MODE_CON, 8, 6, ROCKCHIP_PLL_SYNC_RATE, rk3188_pll_rates),
++                   RK2928_MODE_CON, 8, 6, rk3188_pll_rates),
 +      [gpll] = PLL(pll_rk3066, PLL_GPLL, "gpll", mux_pll_p, 0, RK2928_PLL_CON(12),
-+                   RK2928_MODE_CON, 12, 7, ROCKCHIP_PLL_SYNC_RATE, rk3188_pll_rates),
++                   RK2928_MODE_CON, 12, 7, rk3188_pll_rates),
 +};
 +
  static struct rockchip_pll_clock rk3188_pll_clks[] __initdata = {