Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b0a9df6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: separate out power manager and clock registers 



The power manager and core clock registers aren't present in PXA3
CPUs.  Move them out of pxa-regs.h into pxa2xx-regs.h, and include
pxa2xx-regs.h where necessary.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bc3a5959

arch/arm/common/sharpsl_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/irq.h>

#include <asm/arch/pm.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/sharpsl.h>

#include <asm/hardware/sharpsl_pm.h>

arch/arm/mach-pxa/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-gpio.h>

#include <asm/hardware.h>

arch/arm/mach-pxa/corgi.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/mach/irq.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-gpio.h>

#include <asm/arch/irda.h>

#include <asm/arch/mmc.h>

arch/arm/mach-pxa/corgi_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/arch/sharpsl.h>

#include <asm/arch/corgi.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/pxa2xx-gpio.h>

#include "sharpsl.h"

arch/arm/mach-pxa/generic.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/mach/map.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h> /* for __pxa_set_cken */



#include "generic.h"