git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/cleanup' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-ep93xx
/
ts72xx.c
diff --git
a/arch/arm/mach-ep93xx/ts72xx.c
b/arch/arm/mach-ep93xx/ts72xx.c
index
7ee024d
..
aaf1371
100644
(file)
--- a/
arch/arm/mach-ep93xx/ts72xx.c
+++ b/
arch/arm/mach-ep93xx/ts72xx.c
@@
-112,13
+112,16
@@
static void __init ts72xx_map_io(void)
}
}
}
}
+/*************************************************************************
+ * NOR flash (TS-7200 only)
+ *************************************************************************/
static struct physmap_flash_data ts72xx_flash_data = {
static struct physmap_flash_data ts72xx_flash_data = {
- .width =
1
,
+ .width =
2
,
};
static struct resource ts72xx_flash_resource = {
};
static struct resource ts72xx_flash_resource = {
- .start =
TS72XX_NOR
_PHYS_BASE,
- .end =
TS72XX_NOR
_PHYS_BASE + SZ_16M - 1,
+ .start =
EP93XX_CS6
_PHYS_BASE,
+ .end =
EP93XX_CS6
_PHYS_BASE + SZ_16M - 1,
.flags = IORESOURCE_MEM,
};
.flags = IORESOURCE_MEM,
};
@@
-132,6
+135,12
@@
static struct platform_device ts72xx_flash = {
.resource = &ts72xx_flash_resource,
};
.resource = &ts72xx_flash_resource,
};
+static void __init ts72xx_register_flash(void)
+{
+ if (board_is_ts7200())
+ platform_device_register(&ts72xx_flash);
+}
+
static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
{
__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
{
__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
@@
-165,8
+174,7
@@
static struct ep93xx_eth_data ts72xx_eth_data = {
static void __init ts72xx_init_machine(void)
{
ep93xx_init_devices();
static void __init ts72xx_init_machine(void)
{
ep93xx_init_devices();
- if (board_is_ts7200())
- platform_device_register(&ts72xx_flash);
+ ts72xx_register_flash();
platform_device_register(&ts72xx_rtc_device);
ep93xx_register_eth(&ts72xx_eth_data, 1);
platform_device_register(&ts72xx_rtc_device);
ep93xx_register_eth(&ts72xx_eth_data, 1);