Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187031
b: refs/heads/master
c: 12926dc
h: refs/heads/master
i:
  187029: 30be0cd
  187027: 122fcba
  187023: 20ffd96
v: v3
  • Loading branch information
Mika Westerberg authored and Wim Van Sebroeck committed Mar 6, 2010
1 parent dd46506 commit 131bc31
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c90bf2aa94c08a0f48874f64ebdeb5fe973cf02e
refs/heads/master: 12926dc4167a9af460476a0df17f055398c8b871
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-ep93xx/include/mach/ts72xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
#define TS72XX_RTC_DATA_PHYS_BASE 0x11700000
#define TS72XX_RTC_DATA_SIZE 0x00001000

#define TS72XX_WDT_CONTROL_PHYS_BASE 0x23800000
#define TS72XX_WDT_FEED_PHYS_BASE 0x23c00000

#ifndef __ASSEMBLY__

Expand Down
21 changes: 21 additions & 0 deletions trunk/arch/arm/mach-ep93xx/ts72xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,26 @@ static struct platform_device ts72xx_rtc_device = {
.num_resources = 0,
};

static struct resource ts72xx_wdt_resources[] = {
{
.start = TS72XX_WDT_CONTROL_PHYS_BASE,
.end = TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
{
.start = TS72XX_WDT_FEED_PHYS_BASE,
.end = TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
};

static struct platform_device ts72xx_wdt_device = {
.name = "ts72xx-wdt",
.id = -1,
.num_resources = ARRAY_SIZE(ts72xx_wdt_resources),
.resource = ts72xx_wdt_resources,
};

static struct ep93xx_eth_data ts72xx_eth_data = {
.phy_id = 1,
};
Expand All @@ -175,6 +195,7 @@ static void __init ts72xx_init_machine(void)
ep93xx_init_devices();
ts72xx_register_flash();
platform_device_register(&ts72xx_rtc_device);
platform_device_register(&ts72xx_wdt_device);

ep93xx_register_eth(&ts72xx_eth_data, 1);
}
Expand Down

0 comments on commit 131bc31

Please sign in to comment.