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

Commit 2c799cef authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 



This is needed to minimize io.h so the SoC specific io.h
for ARMs can removed.

Note that minimal driver changes for DSS and RNG are needed to
include cpu.h for SoC detection macros.

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ee0839c2

arch/arm/mach-omap1/clock.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/list.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/clk.h>

#include <linux/clkdev.h>
@@ -26,6 +27,8 @@ 
#include <plat/sram.h>

#include <plat/clkdev_omap.h>



#include <mach/hardware.h>



#include "iomap.h"

#include "clock.h"

#include "opp.h"

arch/arm/mach-omap1/clock_data.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/io.h>

#include <linux/clk.h>

#include <linux/cpufreq.h>

#include <linux/delay.h>
@@ -27,6 +28,8 @@ 
#include <plat/sram.h>	/* for omap_sram_reprogram_clock() */

#include <plat/usb.h>   /* for OTG_BASE */



#include <mach/hardware.h>



#include "iomap.h"

#include "clock.h"

arch/arm/mach-omap1/flash.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <plat/tc.h>

#include <plat/flash.h>



#include <mach/hardware.h>



void omap1_set_vpp(struct platform_device *pdev, int enable)

{

	static int count;

arch/arm/mach-omap1/id.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#include <plat/cpu.h>



#include <mach/hardware.h>



#define OMAP_DIE_ID_0		0xfffe1800

#define OMAP_DIE_ID_1		0xfffe1804

#define OMAP_PRODUCTION_ID_0	0xfffe2000

arch/arm/mach-omap1/include/mach/hardware.h

+36 −0
Original line number Diff line number Diff line
@@ -2,4 +2,40 @@ 
 * arch/arm/mach-omap1/include/mach/hardware.h

 */



#ifndef __MACH_HARDWARE_H

#define __MACH_HARDWARE_H



#ifndef __ASSEMBLER__

/*

 * NOTE: Please use ioremap + __raw_read/write where possible instead of these

 */

extern u8 omap_readb(u32 pa);

extern u16 omap_readw(u32 pa);

extern u32 omap_readl(u32 pa);

extern void omap_writeb(u8 v, u32 pa);

extern void omap_writew(u16 v, u32 pa);

extern void omap_writel(u32 v, u32 pa);



#include <plat/tc.h>



/* Almost all documentation for chip and board memory maps assumes

 * BM is clear.  Most devel boards have a switch to control booting

 * from NOR flash (using external chipselect 3) rather than mask ROM,

 * which uses BM to interchange the physical CS0 and CS3 addresses.

 */

static inline u32 omap_cs0m_phys(void)

{

	return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)

			?  OMAP_CS3_PHYS : 0;

}



static inline u32 omap_cs3_phys(void)

{

	return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM)

			? 0 : OMAP_CS3_PHYS;

}



#endif

#endif



#include <plat/hardware.h>