diff options
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9302.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9302a.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9307.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9312.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9315.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb9315a.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 88 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 20 |
10 files changed, 83 insertions, 83 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 561db73ec1ae..aa72787cbdba 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data adssphere_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource adssphere_flash_resource = { | 30 | static struct resource adssphere_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x61ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -59,7 +59,7 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") | |||
59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0x00000100, | 62 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c index e4add5bdccfd..a478d8e5f26f 100644 --- a/arch/arm/mach-ep93xx/edb9302.c +++ b/arch/arm/mach-ep93xx/edb9302.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9302_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource edb9302_flash_resource = { | 30 | static struct resource edb9302_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x60ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -59,7 +59,7 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") | |||
59 | /* Maintainer: George Kashperko <george@chas.com.ua> */ | 59 | /* Maintainer: George Kashperko <george@chas.com.ua> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0x00000100, | 62 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c index 02c4405afed7..765164234760 100644 --- a/arch/arm/mach-ep93xx/edb9302a.c +++ b/arch/arm/mach-ep93xx/edb9302a.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9302a_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource edb9302a_flash_resource = { | 30 | static struct resource edb9302a_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x60ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -44,7 +44,7 @@ static struct platform_device edb9302a_flash = { | |||
44 | }; | 44 | }; |
45 | 45 | ||
46 | static struct ep93xx_eth_data edb9302a_eth_data = { | 46 | static struct ep93xx_eth_data edb9302a_eth_data = { |
47 | .phy_id = 1, | 47 | .phy_id = 1, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static void __init edb9302a_init_machine(void) | 50 | static void __init edb9302a_init_machine(void) |
@@ -59,7 +59,7 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") | |||
59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0xc0000100, | 62 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c index 040edbd2ea05..23f08fc02949 100644 --- a/arch/arm/mach-ep93xx/edb9307.c +++ b/arch/arm/mach-ep93xx/edb9307.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9307_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource edb9307_flash_resource = { | 30 | static struct resource edb9307_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x61ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -44,7 +44,7 @@ static struct platform_device edb9307_flash = { | |||
44 | }; | 44 | }; |
45 | 45 | ||
46 | static struct ep93xx_eth_data edb9307_eth_data = { | 46 | static struct ep93xx_eth_data edb9307_eth_data = { |
47 | .phy_id = 1, | 47 | .phy_id = 1, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static void __init edb9307_init_machine(void) | 50 | static void __init edb9307_init_machine(void) |
@@ -59,7 +59,7 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") | |||
59 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ | 59 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0x00000100, | 62 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c index 6853e302bc3a..55fca05a0e65 100644 --- a/arch/arm/mach-ep93xx/edb9312.c +++ b/arch/arm/mach-ep93xx/edb9312.c | |||
@@ -29,8 +29,8 @@ static struct physmap_flash_data edb9312_flash_data = { | |||
29 | }; | 29 | }; |
30 | 30 | ||
31 | static struct resource edb9312_flash_resource = { | 31 | static struct resource edb9312_flash_resource = { |
32 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
33 | .end = 0x61ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
34 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
35 | }; | 35 | }; |
36 | 36 | ||
@@ -45,7 +45,7 @@ static struct platform_device edb9312_flash = { | |||
45 | }; | 45 | }; |
46 | 46 | ||
47 | static struct ep93xx_eth_data edb9312_eth_data = { | 47 | static struct ep93xx_eth_data edb9312_eth_data = { |
48 | .phy_id = 1, | 48 | .phy_id = 1, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static void __init edb9312_init_machine(void) | 51 | static void __init edb9312_init_machine(void) |
@@ -60,7 +60,7 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") | |||
60 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ | 60 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ |
61 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
63 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
64 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
65 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
66 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c index 9469b350d253..330a24aa1e73 100644 --- a/arch/arm/mach-ep93xx/edb9315.c +++ b/arch/arm/mach-ep93xx/edb9315.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9315_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource edb9315_flash_resource = { | 30 | static struct resource edb9315_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x61ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -44,7 +44,7 @@ static struct platform_device edb9315_flash = { | |||
44 | }; | 44 | }; |
45 | 45 | ||
46 | static struct ep93xx_eth_data edb9315_eth_data = { | 46 | static struct ep93xx_eth_data edb9315_eth_data = { |
47 | .phy_id = 1, | 47 | .phy_id = 1, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static void __init edb9315_init_machine(void) | 50 | static void __init edb9315_init_machine(void) |
@@ -59,7 +59,7 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") | |||
59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0x00000100, | 62 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c index 584457ce7c80..389be4402af4 100644 --- a/arch/arm/mach-ep93xx/edb9315a.c +++ b/arch/arm/mach-ep93xx/edb9315a.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9315a_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource edb9315a_flash_resource = { | 30 | static struct resource edb9315a_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x60ffffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -44,7 +44,7 @@ static struct platform_device edb9315a_flash = { | |||
44 | }; | 44 | }; |
45 | 45 | ||
46 | static struct ep93xx_eth_data edb9315a_eth_data = { | 46 | static struct ep93xx_eth_data edb9315a_eth_data = { |
47 | .phy_id = 1, | 47 | .phy_id = 1, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static void __init edb9315a_init_machine(void) | 50 | static void __init edb9315a_init_machine(void) |
@@ -59,7 +59,7 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") | |||
59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0xc0000100, | 62 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 035b24e31b64..55260c884ea4 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
@@ -28,8 +28,8 @@ static struct physmap_flash_data gesbc9312_flash_data = { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | static struct resource gesbc9312_flash_resource = { | 30 | static struct resource gesbc9312_flash_resource = { |
31 | .start = 0x60000000, | 31 | .start = EP93XX_CS6_PHYS_BASE, |
32 | .end = 0x607fffff, | 32 | .end = EP93XX_CS6_PHYS_BASE + SZ_8M - 1, |
33 | .flags = IORESOURCE_MEM, | 33 | .flags = IORESOURCE_MEM, |
34 | }; | 34 | }; |
35 | 35 | ||
@@ -59,7 +59,7 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | |||
59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
60 | .phys_io = EP93XX_APB_PHYS_BASE, | 60 | .phys_io = EP93XX_APB_PHYS_BASE, |
61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
62 | .boot_params = 0x00000100, | 62 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
63 | .map_io = ep93xx_map_io, | 63 | .map_io = ep93xx_map_io, |
64 | .init_irq = ep93xx_init_irq, | 64 | .init_irq = ep93xx_init_irq, |
65 | .timer = &ep93xx_timer, | 65 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index c2197236b632..6c79caa5f33d 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
26 | 26 | ||
27 | static struct ep93xx_eth_data micro9_eth_data = { | 27 | static struct ep93xx_eth_data micro9_eth_data = { |
28 | .phy_id = 0x1f, | 28 | .phy_id = 0x1f, |
29 | }; | 29 | }; |
30 | 30 | ||
31 | static void __init micro9_init(void) | 31 | static void __init micro9_init(void) |
@@ -38,46 +38,46 @@ static void __init micro9_init(void) | |||
38 | */ | 38 | */ |
39 | #ifdef CONFIG_MACH_MICRO9H | 39 | #ifdef CONFIG_MACH_MICRO9H |
40 | static struct physmap_flash_data micro9h_flash_data = { | 40 | static struct physmap_flash_data micro9h_flash_data = { |
41 | .width = 4, | 41 | .width = 4, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static struct resource micro9h_flash_resource = { | 44 | static struct resource micro9h_flash_resource = { |
45 | .start = 0x10000000, | 45 | .start = EP93XX_CS1_PHYS_BASE, |
46 | .end = 0x13ffffff, | 46 | .end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1, |
47 | .flags = IORESOURCE_MEM, | 47 | .flags = IORESOURCE_MEM, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static struct platform_device micro9h_flash = { | 50 | static struct platform_device micro9h_flash = { |
51 | .name = "physmap-flash", | 51 | .name = "physmap-flash", |
52 | .id = 0, | 52 | .id = 0, |
53 | .dev = { | 53 | .dev = { |
54 | .platform_data = µ9h_flash_data, | 54 | .platform_data = µ9h_flash_data, |
55 | }, | 55 | }, |
56 | .num_resources = 1, | 56 | .num_resources = 1, |
57 | .resource = µ9h_flash_resource, | 57 | .resource = µ9h_flash_resource, |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void __init micro9h_init(void) | 60 | static void __init micro9h_init(void) |
61 | { | 61 | { |
62 | platform_device_register(µ9h_flash); | 62 | platform_device_register(µ9h_flash); |
63 | } | 63 | } |
64 | 64 | ||
65 | static void __init micro9h_init_machine(void) | 65 | static void __init micro9h_init_machine(void) |
66 | { | 66 | { |
67 | ep93xx_init_devices(); | 67 | ep93xx_init_devices(); |
68 | micro9_init(); | 68 | micro9_init(); |
69 | micro9h_init(); | 69 | micro9h_init(); |
70 | } | 70 | } |
71 | 71 | ||
72 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") | 72 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") |
73 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 73 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
74 | .phys_io = EP93XX_APB_PHYS_BASE, | 74 | .phys_io = EP93XX_APB_PHYS_BASE, |
75 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 75 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
76 | .boot_params = 0x00000100, | 76 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
77 | .map_io = ep93xx_map_io, | 77 | .map_io = ep93xx_map_io, |
78 | .init_irq = ep93xx_init_irq, | 78 | .init_irq = ep93xx_init_irq, |
79 | .timer = &ep93xx_timer, | 79 | .timer = &ep93xx_timer, |
80 | .init_machine = micro9h_init_machine, | 80 | .init_machine = micro9h_init_machine, |
81 | MACHINE_END | 81 | MACHINE_END |
82 | #endif | 82 | #endif |
83 | 83 | ||
@@ -87,19 +87,19 @@ MACHINE_END | |||
87 | #ifdef CONFIG_MACH_MICRO9M | 87 | #ifdef CONFIG_MACH_MICRO9M |
88 | static void __init micro9m_init_machine(void) | 88 | static void __init micro9m_init_machine(void) |
89 | { | 89 | { |
90 | ep93xx_init_devices(); | 90 | ep93xx_init_devices(); |
91 | micro9_init(); | 91 | micro9_init(); |
92 | } | 92 | } |
93 | 93 | ||
94 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") | 94 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") |
95 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 95 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
96 | .phys_io = EP93XX_APB_PHYS_BASE, | 96 | .phys_io = EP93XX_APB_PHYS_BASE, |
97 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 97 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
98 | .boot_params = 0x00000100, | 98 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
99 | .map_io = ep93xx_map_io, | 99 | .map_io = ep93xx_map_io, |
100 | .init_irq = ep93xx_init_irq, | 100 | .init_irq = ep93xx_init_irq, |
101 | .timer = &ep93xx_timer, | 101 | .timer = &ep93xx_timer, |
102 | .init_machine = micro9m_init_machine, | 102 | .init_machine = micro9m_init_machine, |
103 | MACHINE_END | 103 | MACHINE_END |
104 | #endif | 104 | #endif |
105 | 105 | ||
@@ -109,19 +109,19 @@ MACHINE_END | |||
109 | #ifdef CONFIG_MACH_MICRO9L | 109 | #ifdef CONFIG_MACH_MICRO9L |
110 | static void __init micro9l_init_machine(void) | 110 | static void __init micro9l_init_machine(void) |
111 | { | 111 | { |
112 | ep93xx_init_devices(); | 112 | ep93xx_init_devices(); |
113 | micro9_init(); | 113 | micro9_init(); |
114 | } | 114 | } |
115 | 115 | ||
116 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") | 116 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") |
117 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 117 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
118 | .phys_io = EP93XX_APB_PHYS_BASE, | 118 | .phys_io = EP93XX_APB_PHYS_BASE, |
119 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 119 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
120 | .boot_params = 0x00000100, | 120 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
121 | .map_io = ep93xx_map_io, | 121 | .map_io = ep93xx_map_io, |
122 | .init_irq = ep93xx_init_irq, | 122 | .init_irq = ep93xx_init_irq, |
123 | .timer = &ep93xx_timer, | 123 | .timer = &ep93xx_timer, |
124 | .init_machine = micro9l_init_machine, | 124 | .init_machine = micro9l_init_machine, |
125 | MACHINE_END | 125 | MACHINE_END |
126 | #endif | 126 | #endif |
127 | 127 | ||
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index b4aa4c054276..9de48dfb52a0 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -117,7 +117,7 @@ static struct physmap_flash_data ts72xx_flash_data = { | |||
117 | 117 | ||
118 | static struct resource ts72xx_flash_resource = { | 118 | static struct resource ts72xx_flash_resource = { |
119 | .start = TS72XX_NOR_PHYS_BASE, | 119 | .start = TS72XX_NOR_PHYS_BASE, |
120 | .end = TS72XX_NOR_PHYS_BASE + 0x00ffffff, | 120 | .end = TS72XX_NOR_PHYS_BASE + SZ_16M - 1, |
121 | .flags = IORESOURCE_MEM, | 121 | .flags = IORESOURCE_MEM, |
122 | }; | 122 | }; |
123 | 123 | ||
@@ -144,21 +144,21 @@ static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | static struct m48t86_ops ts72xx_rtc_ops = { | 146 | static struct m48t86_ops ts72xx_rtc_ops = { |
147 | .readbyte = ts72xx_rtc_readbyte, | 147 | .readbyte = ts72xx_rtc_readbyte, |
148 | .writebyte = ts72xx_rtc_writebyte, | 148 | .writebyte = ts72xx_rtc_writebyte, |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static struct platform_device ts72xx_rtc_device = { | 151 | static struct platform_device ts72xx_rtc_device = { |
152 | .name = "rtc-m48t86", | 152 | .name = "rtc-m48t86", |
153 | .id = -1, | 153 | .id = -1, |
154 | .dev = { | 154 | .dev = { |
155 | .platform_data = &ts72xx_rtc_ops, | 155 | .platform_data = &ts72xx_rtc_ops, |
156 | }, | 156 | }, |
157 | .num_resources = 0, | 157 | .num_resources = 0, |
158 | }; | 158 | }; |
159 | 159 | ||
160 | static struct ep93xx_eth_data ts72xx_eth_data = { | 160 | static struct ep93xx_eth_data ts72xx_eth_data = { |
161 | .phy_id = 1, | 161 | .phy_id = 1, |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static void __init ts72xx_init_machine(void) | 164 | static void __init ts72xx_init_machine(void) |
@@ -175,7 +175,7 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | |||
175 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 175 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
176 | .phys_io = EP93XX_APB_PHYS_BASE, | 176 | .phys_io = EP93XX_APB_PHYS_BASE, |
177 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 177 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
178 | .boot_params = 0x00000100, | 178 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
179 | .map_io = ts72xx_map_io, | 179 | .map_io = ts72xx_map_io, |
180 | .init_irq = ep93xx_init_irq, | 180 | .init_irq = ep93xx_init_irq, |
181 | .timer = &ep93xx_timer, | 181 | .timer = &ep93xx_timer, |