diff mbox

[10/16] ARM: OMAP: Make omap_device local to mach-omap2

Message ID alpine.DEB.2.00.1210260124360.11251@utopia.booyaka.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paul Walmsley Oct. 26, 2012, 1:27 a.m. UTC
Hi Tony

On Thu, 4 Oct 2012, Tony Lindgren wrote:

> Let's make omap_device local to mach-omap2 for
> ARM common zImage support.
> 
> Signed-off-by: Tony Lindgren <tony@atomide.com>

This one breaks a 5912-only build:

arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_init':
arch/arm/mach-omap1/pm_bus.c:69:2: error: implicit declaration of function 
'cpu_class_is_omap1'
make[1]: *** [arch/arm/mach-omap1/pm_bus.o] Error 1

Fixed by the usual change; it's below.


- Paul

---
 arch/arm/mach-omap1/pm_bus.c |    2 ++
 1 file changed, 2 insertions(+)

Comments

Tony Lindgren Oct. 26, 2012, 4:39 p.m. UTC | #1
* Paul Walmsley <paul@pwsan.com> [121025 18:28]:
> Hi Tony
> 
> On Thu, 4 Oct 2012, Tony Lindgren wrote:
> 
> > Let's make omap_device local to mach-omap2 for
> > ARM common zImage support.
> > 
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> 
> This one breaks a 5912-only build:
> 
> arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_init':
> arch/arm/mach-omap1/pm_bus.c:69:2: error: implicit declaration of function 
> 'cpu_class_is_omap1'
> make[1]: *** [arch/arm/mach-omap1/pm_bus.o] Error 1
> 
> Fixed by the usual change; it's below.

Thanks. I've ran randonfigs on the omap-for-v3.8/cleanup-headers,
but have not seen these.

Can you do a branch on top of omap-for-v3.8/cleanup-headers
with all these fixes that I can pull in?

Regards,

Tony
 
>  arch/arm/mach-omap1/pm_bus.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
> index 16bf2f9..3f2d396 100644
> --- a/arch/arm/mach-omap1/pm_bus.c
> +++ b/arch/arm/mach-omap1/pm_bus.c
> @@ -19,6 +19,8 @@
>  #include <linux/clk.h>
>  #include <linux/err.h>
>  
> +#include "soc.h"
> +
>  #ifdef CONFIG_PM_RUNTIME
>  static int omap1_pm_runtime_suspend(struct device *dev)
>  {
> -- 
> 1.7.10.4
>
Paul Walmsley Oct. 26, 2012, 5:02 p.m. UTC | #2
On Fri, 26 Oct 2012, Tony Lindgren wrote:

> Can you do a branch on top of omap-for-v3.8/cleanup-headers
> with all these fixes that I can pull in?

Yes, will do that today.


- Paul
Tony Lindgren Oct. 26, 2012, 5:10 p.m. UTC | #3
* Paul Walmsley <paul@pwsan.com> [121026 10:03]:
> On Fri, 26 Oct 2012, Tony Lindgren wrote:
> 
> > Can you do a branch on top of omap-for-v3.8/cleanup-headers
> > with all these fixes that I can pull in?
> 
> Yes, will do that today.

OK thanks!

Tony
Paul Walmsley Oct. 26, 2012, 8:18 p.m. UTC | #4
On Fri, 26 Oct 2012, Tony Lindgren wrote:

> * Paul Walmsley <paul@pwsan.com> [121026 10:03]:
> > On Fri, 26 Oct 2012, Tony Lindgren wrote:
> > 
> > > Can you do a branch on top of omap-for-v3.8/cleanup-headers
> > > with all these fixes that I can pull in?
> > 
> > Yes, will do that today.
> 
> OK thanks!

Just sent the pull request.  Are you planning to rebuild cleanup-prcm also 
when you pull those cleanup-headers fixes in?  Am planning to send another 
PRCM cleanup pull request next week...


- Paul
Tony Lindgren Oct. 26, 2012, 8:37 p.m. UTC | #5
* Paul Walmsley <paul@pwsan.com> [121026 13:20]:
> On Fri, 26 Oct 2012, Tony Lindgren wrote:
> 
> > * Paul Walmsley <paul@pwsan.com> [121026 10:03]:
> > > On Fri, 26 Oct 2012, Tony Lindgren wrote:
> > > 
> > > > Can you do a branch on top of omap-for-v3.8/cleanup-headers
> > > > with all these fixes that I can pull in?
> > > 
> > > Yes, will do that today.
> > 
> > OK thanks!
> 
> Just sent the pull request.  Are you planning to rebuild cleanup-prcm also 
> when you pull those cleanup-headers fixes in?  Am planning to send another 
> PRCM cleanup pull request next week...

I've merged omap-for-v3.8/cleanup-headers into omap-for-v3.8/cleanup-prcm
too now, so you should be able to use commit 7fc54fd3 as the base for
further PRCM changes.

Regards,

Tony
Paul Walmsley Oct. 26, 2012, 8:45 p.m. UTC | #6
On Fri, 26 Oct 2012, Tony Lindgren wrote:

> I've merged omap-for-v3.8/cleanup-headers into omap-for-v3.8/cleanup-prcm
> too now, so you should be able to use commit 7fc54fd3 as the base for
> further PRCM changes.

OK thanks, will do.


- Paul
diff mbox

Patch

diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 16bf2f9..3f2d396 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -19,6 +19,8 @@ 
 #include <linux/clk.h>
 #include <linux/err.h>
 
+#include "soc.h"
+
 #ifdef CONFIG_PM_RUNTIME
 static int omap1_pm_runtime_suspend(struct device *dev)
 {