public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Mark Brown <broonie@kernel•org>
To: "Andrew Morton" <akpm@linux-foundation•org>,
	"Heiko Stübner" <heiko@sntech•de>,
	"Mike Turquette" <mturquette@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the akpm-current tree with the  tree
Date: Wed, 3 Sep 2014 17:23:26 +0100	[thread overview]
Message-ID: <20140903172326.51b4b19f0cc7b901bcaaf218@kernel.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2173 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in drivers/clk/rockchip/clk.h and drivers/clk/rockchip/clk.c between commits like fe94f974e9c8b8 ("clk: rockchip: protect critical clocks from getting disabled") from the clk tree and "clk: rockchip: add restart handler" from the akpm-current tree.

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

diff --cc drivers/clk/rockchip/clk.c
index d9c6db2151ba,aa41433eb34f..000000000000
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@@ -297,15 -244,26 +298,39 @@@ void __init rockchip_clk_register_branc
  	}
  }
  
 +void __init rockchip_clk_protect_critical(const char *clocks[], int nclocks)
 +{
 +	int i;
 +
 +	/* Protect the clocks that needs to stay on */
 +	for (i = 0; i < nclocks; i++) {
 +		struct clk *clk = __clk_lookup(clocks[i]);
 +
 +		if (clk)
 +			clk_prepare_enable(clk);
 +	}
 +}
++
+ static unsigned int reg_restart;
+ static int rockchip_restart_notify(struct notifier_block *this,
+ 				   unsigned long mode, void *cmd)
+ {
+ 	writel(0xfdb9, reg_base + reg_restart);
+ 	return NOTIFY_DONE;
+ }
+ 
+ static struct notifier_block rockchip_restart_handler = {
+ 	.notifier_call = rockchip_restart_notify,
+ 	.priority = 128,
+ };
+ 
+ void __init rockchip_register_restart_notifier(unsigned int reg)
+ {
+ 	int ret;
+ 
+ 	reg_restart = reg;
+ 	ret = register_restart_handler(&rockchip_restart_handler);
+ 	if (ret)
+ 		pr_err("%s: cannot register restart handler, %d\n",
+ 		       __func__, ret);
+ }
diff --cc drivers/clk/rockchip/clk.h
index 2b0bca19db47,0b5eab5b521f..000000000000
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@@ -329,7 -329,7 +329,8 @@@ void rockchip_clk_register_branches(str
  				    unsigned int nr_clk);
  void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
  				unsigned int nr_pll, int grf_lock_offset);
 +void rockchip_clk_protect_critical(const char *clocks[], int nclocks);
+ void rockchip_register_restart_notifier(unsigned int reg);
  
  #define ROCKCHIP_SOFTRST_HIWORD_MASK	BIT(0)
  

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

next             reply	other threads:[~2014-09-03 16:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-03 16:23 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-12-03  0:23 linux-next: manual merge of the akpm-current tree with the tree Mark Brown
2015-01-21  7:14 Stephen Rothwell
2014-09-01 22:54 Mark Brown
2014-05-29  9:04 Stephen Rothwell
2013-02-22  3:46 Stephen Rothwell
2012-11-15  6:25 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140903172326.51b4b19f0cc7b901bcaaf218@kernel.org \
    --to=broonie@kernel$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=heiko@sntech$(echo .)de \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mturquette@linaro$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox