Skip to contentSkip to conversation

ARM: orion5x: fix mvebu_mbus_dt_init call

PATCH New Arnd Bergmann 3 participants 4 messages Jun 4, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Marvell Dove/MV78xx0/Orion SoC support
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ARM: orion5x: fix mvebu_mbus_dt_init call

The prototype for mvebu_mbus_dt_init() changed around the same time as a new caller was added to orion5x. This adds the missing argument to make orion5x behave correctly to avoid this build error:

mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
BUG_ON(mvebu_mbus_dt_init());
^
In file included from mach-orion5x/board-dt.c:18:0:
include/linux/mbus.h:76:5: note: declared here

 int mvebu_mbus_dt_init(bool is_coherent);
     ^
Signed-off-by Arnd Bergmann <[email protected]>

---
Thomas, I assume you were aware of this problem since you wrote the two patches that clashed, but for some reason we screwed it up when merging them into arm-soc. Should we apply this directly as a bug fix to arm-soc or did you already have another solution planned?

arch/arm/mach-orion5x/board-dt.c +1 -1
index 35d418f..79f033b 100644
@@ -45,7 +45,7 @@ static void __init orion5x_dt_init(void)
 	orion5x_id(&dev, &rev, &dev_name);
 	printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
 
-	BUG_ON(mvebu_mbus_dt_init());
+	BUG_ON(mvebu_mbus_dt_init(false));
 
 	/*
 	 * Setup Orion address map
#1 lore raw

PATCH 1/1 ARM: orion5x: fix mvebu_mbus_dt_init call

Dear Arnd Bergmann,

Quoted 10 lines · Arnd Bergmann

The prototype for mvebu_mbus_dt_init() changed around the same time as a new caller was added to orion5x. This adds the missing argument to make orion5x behave correctly to avoid this build error:

mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
BUG_ON(mvebu_mbus_dt_init());
^
In file included from mach-orion5x/board-dt.c:18:0:
include/linux/mbus.h:76:5: note: declared here

Quoted 4 lines
 int mvebu_mbus_dt_init(bool is_coherent);
     ^
Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Thomas Petazzoni <[email protected]>
Quoted 5 lines

Thomas, I assume you were aware of this problem since you wrote the two patches that clashed, but for some reason we screwed it up when merging them into arm-soc. Should we apply this directly as a bug fix to arm-soc or did you already have another solution planned?

Yes, I am indeed aware of this change. I think I did a patch to fix it at some point, but maybe it got lost in the merging process, or simply I don't remember correctly what happened. It's indeed caused by an interaction between changes in the mvebu-mbus driver and the conversion of mach-orion5x to DT. Your patch is the correct solution.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 ARM: orion5x: fix mvebu_mbus_dt_init call

Quoted 15 lines · On Wednesday 04 June 2014 11:40:06 Thomas Petazzoni wrote:
Quoted 13 lines · Arnd Bergmann

The prototype for mvebu_mbus_dt_init() changed around the same time as a new caller was added to orion5x. This adds the missing argument to make orion5x behave correctly to avoid this build error:

mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
BUG_ON(mvebu_mbus_dt_init());
^
In file included from mach-orion5x/board-dt.c:18:0:
include/linux/mbus.h:76:5: note: declared here

 int mvebu_mbus_dt_init(bool is_coherent);
     ^
Quoted 4 lines
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Thomas Petazzoni <[email protected]>

Ok, thanks!

I've added my patch to the next/soc2 branch now, which already contains both branches that introduce the problem when combined.

This saves us creating a fixes branch on top of the mid-merge window state of torvalds/next.

Arnd

#3 lore raw

PATCH 1/1 ARM: orion5x: fix mvebu_mbus_dt_init call

Quoted 21 lines · Arnd Bergmann
Quoted 15 lines · On Wednesday 04 June 2014 11:40:06 Thomas Petazzoni wrote:
Quoted 13 lines · Arnd Bergmann

The prototype for mvebu_mbus_dt_init() changed around the same time as a new caller was added to orion5x. This adds the missing argument to make orion5x behave correctly to avoid this build error:

mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
BUG_ON(mvebu_mbus_dt_init());
^
In file included from mach-orion5x/board-dt.c:18:0:
include/linux/mbus.h:76:5: note: declared here

 int mvebu_mbus_dt_init(bool is_coherent);
     ^
Quoted 4 lines
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
Acked-by Thomas Petazzoni <[email protected]>
Quoted 7 lines

Ok, thanks!

I've added my patch to the next/soc2 branch now, which already contains both branches that introduce the problem when combined.

This saves us creating a fixes branch on top of the mid-merge window state of torvalds/next.

Thanks, Arnd. That was most likely my fault. I also don't recall what happened, but your fix is the correct one. Thanks for catching that.

thx,

Jason.