linux-next: manual merge of the clk tree with the arm-soc tree

From: Stephen Rothwell
Date: Mon Jun 17 2013 - 03:27:37 EST

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/tegra/clk-tegra114.c between commit 31972fd95527 ("clk:
tegra114: implement wait_for_reset and disable_clock for
tegra_cpu_car_ops") from the arm-soc tree and commit d53442e94db0 ("clk:
tegra: override bits for Tegra114 PLLM") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/clk/tegra/clk-tegra114.c
index 40d939d,7fe36ea..0000000
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@@ -250,9 -251,10 +251,13 @@@
#define CLK_SOURCE_EMC 0x19c

+/* Tegra CPU clock and reset control regs */
+ /* 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;

Attachment: pgp00000.pgp
Description: PGP signature