Commit 5bf3df3f authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: separate definitions from pxa-regs.h and remove it finally 



The remaining registers are separated into:

   - <mach/regs-ost.h>
   - <mach/regs-rtc.h>
   - <mach/regs-intc.h>

and then we can remove pxa-regs.h completely. Instead of #include this
file, let's:

1. include the specific <mach/regs-*.h> with care (if that's absolutely
   necessary)

2. define the registers in the driver, make cleanly defined API to expose
   the register access to external with sufficient reason

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent b74d1969

arch/arm/common/sharpsl_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
#include <mach/hardware.h>

#include <asm/irq.h>

#include <mach/pm.h>

#include <mach/pxa-regs.h>

#include <mach/pxa2xx-regs.h>

#include <mach/regs-rtc.h>

#include <mach/sharpsl.h>

#include <asm/hardware/sharpsl_pm.h>

arch/arm/mach-pxa/corgi_lcd.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/string.h>

#include <mach/corgi.h>

#include <mach/hardware.h>

#include <mach/pxa-regs.h>

#include <mach/sharpsl.h>

#include <mach/spitz.h>

#include <asm/hardware/scoop.h>

arch/arm/mach-pxa/corgi_ssp.c

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



#include <mach/ssp.h>

#include <mach/pxa-regs.h>

#include <mach/pxa2xx-gpio.h>

#include <mach/regs-ssp.h>

#include "sharpsl.h"

arch/arm/mach-pxa/include/mach/mtd-xip.h

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#ifndef __ARCH_PXA_MTD_XIP_H__

#define __ARCH_PXA_MTD_XIP_H__



#include <mach/hardware.h>

#include <mach/pxa-regs.h>

#include <mach/regs-ost.h>

#include <mach/regs-intc.h>



#define xip_irqpending()	(ICIP & ICMR)

arch/arm/mach-pxa/include/mach/pxa2xx-regs.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef __PXA2XX_REGS_H

#define __PXA2XX_REGS_H



#include <mach/pxa-regs.h>

#include <mach/hardware.h>



/*

 * PXA Chip selects

CRA Git | Maintained and supported by SUSTech CRA and CCSE