Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1346349 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-01 05:00 +0100
    Re: linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-01 05:10 +0100
      Re: linux-next: manual merge of the clk tree with the arm-soc tree Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-03-01 09:40 +0100

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

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/at91/clk-main.c

between commit:

  99a81706526f ("clk: at91: remove IRQ handling and use polling")

from the arm-soc tree and commit:

  8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")

from the clk tree.

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

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clk/at91/clk-main.c
index 4bfc94d6c26e,b85f43529396..000000000000
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@@ -572,12 -611,12 +572,12 @@@ static void __init of_at91sam9x5_clk_ma
  {
  	struct clk *clk;
  	const char *parent_names[2];
- 	int num_parents;
+ 	unsigned int num_parents;
 -	unsigned int irq;
  	const char *name = np->name;
 +	struct regmap *regmap;
  
  	num_parents = of_clk_get_parent_count(np);
- 	if (num_parents <= 0 || num_parents > 2)
+ 	if (num_parents == 0 || num_parents > 2)
  		return;
  
  	of_clk_parent_fill(np, parent_names, num_parents);

[toc] | [next] | [standalone]

#1346351

Hi all,

On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the clk tree got a conflict in:
> 
>   drivers/clk/at91/clk-main.c
> 
> between commit:
> 
>   99a81706526f ("clk: at91: remove IRQ handling and use polling")
> 
> from the arm-soc tree and commit:
> 
>   8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
> 
> from the clk tree.

And the same for drivers/clk/at91/clk-master.c

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clk/at91/clk-master.c
index 7d4a1864ea7c,016fe110b5ba..000000000000
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@@ -199,14 -221,14 +199,14 @@@ of_at91_clk_master_setup(struct device_
  			 const struct clk_master_layout *layout)
  {
  	struct clk *clk;
- 	int num_parents;
+ 	unsigned int num_parents;
 -	unsigned int irq;
  	const char *parent_names[MASTER_SOURCE_MAX];
  	const char *name = np->name;
  	struct clk_master_characteristics *characteristics;
 +	struct regmap *regmap;
  
  	num_parents = of_clk_get_parent_count(np);
- 	if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX)
+ 	if (num_parents == 0 || num_parents > MASTER_SOURCE_MAX)
  		return;
  
  	of_clk_parent_fill(np, parent_names, num_parents);

[toc] | [prev] | [next] | [standalone]

#1346449

Le 01/03/2016 05:00, Stephen Rothwell a écrit :
> Hi all,
> 
> On Tue, 1 Mar 2016 14:57:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the clk tree got a conflict in:
>>
>>   drivers/clk/at91/clk-main.c
>>
>> between commit:
>>
>>   99a81706526f ("clk: at91: remove IRQ handling and use polling")
>>
>> from the arm-soc tree and commit:
>>
>>   8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")
>>
>> from the clk tree.
> 
> And the same for drivers/clk/at91/clk-master.c

Stephen,

Both fixes seem good. Thanks!

Bye,
-- 
Nicolas Ferre

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web