From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 06:50:24 +0000 (+1000)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20130619~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85bdc6b26e53f2727610d9b8d277d8a59cf46fb8;p=karo-tx-linux.git

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

Conflicts:
	drivers/clk/tegra/clk-tegra114.c
---

85bdc6b26e53f2727610d9b8d277d8a59cf46fb8
diff --cc drivers/clk/tegra/clk-tegra114.c
index 40d939d091bf,7fe36eaa993b..dbd04283158e
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@@ -250,9 -251,10 +251,13 @@@
  #define CLK_SOURCE_XUSB_DEV_SRC 0x60c
  #define CLK_SOURCE_EMC 0x19c
  
 +/* Tegra CPU clock and reset control regs */
 +#define CLK_RST_CONTROLLER_CPU_CMPLX_STATUS	0x470
 +
+ /* PLLM override registers */
+ #define PMC_PLLM_WB0_OVERRIDE 0x1dc
+ #define PMC_PLLM_WB0_OVERRIDE_2 0x2b0
+ 
  static int periph_clk_enb_refcnt[CLK_OUT_ENB_NUM * 32];
  
  static void __iomem *clk_base;