aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-at91/at91cap9_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9261_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c8
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9rl_devices.c4
-rw-r--r--arch/arm/mach-at91/include/mach/at91cap9.h2
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9260.h2
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9261.h2
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9263.h4
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9g45.h2
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9rl.h2
12 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index fb525f4e6fab..3262a7edc9c7 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -670,8 +670,8 @@ static void __init at91_add_device_tc(void) { }
670 670
671static struct resource rtt_resources[] = { 671static struct resource rtt_resources[] = {
672 { 672 {
673 .start = AT91_BASE_SYS + AT91_RTT, 673 .start = AT91CAP9_BASE_RTT,
674 .end = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1, 674 .end = AT91CAP9_BASE_RTT + SZ_16 - 1,
675 .flags = IORESOURCE_MEM, 675 .flags = IORESOURCE_MEM,
676 } 676 }
677}; 677};
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 067c1685fdaa..63cbfb887fbf 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -714,8 +714,8 @@ static void __init at91_add_device_tc(void) { }
714 714
715static struct resource rtt_resources[] = { 715static struct resource rtt_resources[] = {
716 { 716 {
717 .start = AT91_BASE_SYS + AT91_RTT, 717 .start = AT91SAM9260_BASE_RTT,
718 .end = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1, 718 .end = AT91SAM9260_BASE_RTT + SZ_16 - 1,
719 .flags = IORESOURCE_MEM, 719 .flags = IORESOURCE_MEM,
720 } 720 }
721}; 721};
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index ae78f4d03b73..d5bd1e704421 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -600,8 +600,8 @@ static void __init at91_add_device_tc(void) { }
600 600
601static struct resource rtt_resources[] = { 601static struct resource rtt_resources[] = {
602 { 602 {
603 .start = AT91_BASE_SYS + AT91_RTT, 603 .start = AT91SAM9261_BASE_RTT,
604 .end = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1, 604 .end = AT91SAM9261_BASE_RTT + SZ_16 - 1,
605 .flags = IORESOURCE_MEM, 605 .flags = IORESOURCE_MEM,
606 } 606 }
607}; 607};
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 0b1a28e47f48..5d2b061fcc64 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -956,8 +956,8 @@ static void __init at91_add_device_tc(void) { }
956 956
957static struct resource rtt0_resources[] = { 957static struct resource rtt0_resources[] = {
958 { 958 {
959 .start = AT91_BASE_SYS + AT91_RTT0, 959 .start = AT91SAM9263_BASE_RTT0,
960 .end = AT91_BASE_SYS + AT91_RTT0 + SZ_16 - 1, 960 .end = AT91SAM9263_BASE_RTT0 + SZ_16 - 1,
961 .flags = IORESOURCE_MEM, 961 .flags = IORESOURCE_MEM,
962 } 962 }
963}; 963};
@@ -971,8 +971,8 @@ static struct platform_device at91sam9263_rtt0_device = {
971 971
972static struct resource rtt1_resources[] = { 972static struct resource rtt1_resources[] = {
973 { 973 {
974 .start = AT91_BASE_SYS + AT91_RTT1, 974 .start = AT91SAM9263_BASE_RTT1,
975 .end = AT91_BASE_SYS + AT91_RTT1 + SZ_16 - 1, 975 .end = AT91SAM9263_BASE_RTT1 + SZ_16 - 1,
976 .flags = IORESOURCE_MEM, 976 .flags = IORESOURCE_MEM,
977 } 977 }
978}; 978};
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 42bf77049541..bb2ba0c1d0ee 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -1081,8 +1081,8 @@ void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}
1081 1081
1082static struct resource rtt_resources[] = { 1082static struct resource rtt_resources[] = {
1083 { 1083 {
1084 .start = AT91_BASE_SYS + AT91_RTT, 1084 .start = AT91SAM9G45_BASE_RTT,
1085 .end = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1, 1085 .end = AT91SAM9G45_BASE_RTT + SZ_16 - 1,
1086 .flags = IORESOURCE_MEM, 1086 .flags = IORESOURCE_MEM,
1087 } 1087 }
1088}; 1088};
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 34fe5dd78194..f9b423b7d7ae 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -685,8 +685,8 @@ static void __init at91_add_device_rtc(void) {}
685 685
686static struct resource rtt_resources[] = { 686static struct resource rtt_resources[] = {
687 { 687 {
688 .start = AT91_BASE_SYS + AT91_RTT, 688 .start = AT91SAM9RL_BASE_RTT,
689 .end = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1, 689 .end = AT91SAM9RL_BASE_RTT + SZ_16 - 1,
690 .flags = IORESOURCE_MEM, 690 .flags = IORESOURCE_MEM,
691 } 691 }
692}; 692};
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h
index a2eccb9ad3f5..1cb42a63c822 100644
--- a/arch/arm/mach-at91/include/mach/at91cap9.h
+++ b/arch/arm/mach-at91/include/mach/at91cap9.h
@@ -89,7 +89,6 @@
89#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 89#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
90#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 90#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
91#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 91#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
92#define AT91_RTT (0xfffffd20 - AT91_BASE_SYS)
93#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 92#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
94#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 93#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
95#define AT91_GPBR (cpu_is_at91cap9_revB() ? \ 94#define AT91_GPBR (cpu_is_at91cap9_revB() ? \
@@ -102,6 +101,7 @@
102#define AT91CAP9_BASE_PIOB 0xfffff400 101#define AT91CAP9_BASE_PIOB 0xfffff400
103#define AT91CAP9_BASE_PIOC 0xfffff600 102#define AT91CAP9_BASE_PIOC 0xfffff600
104#define AT91CAP9_BASE_PIOD 0xfffff800 103#define AT91CAP9_BASE_PIOD 0xfffff800
104#define AT91CAP9_BASE_RTT 0xfffffd20
105 105
106#define AT91_USART0 AT91CAP9_BASE_US0 106#define AT91_USART0 AT91CAP9_BASE_US0
107#define AT91_USART1 AT91CAP9_BASE_US1 107#define AT91_USART1 AT91CAP9_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 697465660955..6aa7ca979e4d 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -89,7 +89,6 @@
89#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 89#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
90#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 90#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
91#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 91#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
92#define AT91_RTT (0xfffffd20 - AT91_BASE_SYS)
93#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 92#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
94#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 93#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
95#define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) 94#define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS)
@@ -98,6 +97,7 @@
98#define AT91SAM9260_BASE_PIOA 0xfffff400 97#define AT91SAM9260_BASE_PIOA 0xfffff400
99#define AT91SAM9260_BASE_PIOB 0xfffff600 98#define AT91SAM9260_BASE_PIOB 0xfffff600
100#define AT91SAM9260_BASE_PIOC 0xfffff800 99#define AT91SAM9260_BASE_PIOC 0xfffff800
100#define AT91SAM9260_BASE_RTT 0xfffffd20
101 101
102#define AT91_USART0 AT91SAM9260_BASE_US0 102#define AT91_USART0 AT91SAM9260_BASE_US0
103#define AT91_USART1 AT91SAM9260_BASE_US1 103#define AT91_USART1 AT91SAM9260_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index 17ae9c73be5e..f84b7132cb79 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -73,7 +73,6 @@
73#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 73#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
74#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 74#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
75#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 75#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
76#define AT91_RTT (0xfffffd20 - AT91_BASE_SYS)
77#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 76#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
78#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 77#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
79#define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) 78#define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS)
@@ -81,6 +80,7 @@
81#define AT91SAM9261_BASE_PIOA 0xfffff400 80#define AT91SAM9261_BASE_PIOA 0xfffff400
82#define AT91SAM9261_BASE_PIOB 0xfffff600 81#define AT91SAM9261_BASE_PIOB 0xfffff600
83#define AT91SAM9261_BASE_PIOC 0xfffff800 82#define AT91SAM9261_BASE_PIOC 0xfffff800
83#define AT91SAM9261_BASE_RTT 0xfffffd20
84 84
85#define AT91_USART0 AT91SAM9261_BASE_US0 85#define AT91_USART0 AT91SAM9261_BASE_US0
86#define AT91_USART1 AT91SAM9261_BASE_US1 86#define AT91_USART1 AT91SAM9261_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index a668538340b9..938965ebe775 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -85,10 +85,8 @@
85#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 85#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
86#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 86#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
87#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 87#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
88#define AT91_RTT0 (0xfffffd20 - AT91_BASE_SYS)
89#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 88#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
90#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 89#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
91#define AT91_RTT1 (0xfffffd50 - AT91_BASE_SYS)
92#define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) 90#define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS)
93 91
94#define AT91SAM9263_BASE_ECC0 0xffffe000 92#define AT91SAM9263_BASE_ECC0 0xffffe000
@@ -98,6 +96,8 @@
98#define AT91SAM9263_BASE_PIOC 0xfffff600 96#define AT91SAM9263_BASE_PIOC 0xfffff600
99#define AT91SAM9263_BASE_PIOD 0xfffff800 97#define AT91SAM9263_BASE_PIOD 0xfffff800
100#define AT91SAM9263_BASE_PIOE 0xfffffa00 98#define AT91SAM9263_BASE_PIOE 0xfffffa00
99#define AT91SAM9263_BASE_RTT0 0xfffffd20
100#define AT91SAM9263_BASE_RTT1 0xfffffd50
101 101
102#define AT91_USART0 AT91SAM9263_BASE_US0 102#define AT91_USART0 AT91SAM9263_BASE_US0
103#define AT91_USART1 AT91SAM9263_BASE_US1 103#define AT91_USART1 AT91SAM9263_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index 29e577f13c06..00638c6a65fd 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -95,7 +95,6 @@
95#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 95#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
96#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 96#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
97#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 97#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
98#define AT91_RTT (0xfffffd20 - AT91_BASE_SYS)
99#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 98#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
100#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 99#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
101#define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) 100#define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS)
@@ -108,6 +107,7 @@
108#define AT91SAM9G45_BASE_PIOC 0xfffff600 107#define AT91SAM9G45_BASE_PIOC 0xfffff600
109#define AT91SAM9G45_BASE_PIOD 0xfffff800 108#define AT91SAM9G45_BASE_PIOD 0xfffff800
110#define AT91SAM9G45_BASE_PIOE 0xfffffa00 109#define AT91SAM9G45_BASE_PIOE 0xfffffa00
110#define AT91SAM9G45_BASE_RTT 0xfffffd20
111 111
112#define AT91_USART0 AT91SAM9G45_BASE_US0 112#define AT91_USART0 AT91SAM9G45_BASE_US0
113#define AT91_USART1 AT91SAM9G45_BASE_US1 113#define AT91_USART1 AT91SAM9G45_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index e56465037253..099cefc20bf0 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h
@@ -78,7 +78,6 @@
78#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) 78#define AT91_PMC (0xfffffc00 - AT91_BASE_SYS)
79#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) 79#define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS)
80#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS) 80#define AT91_SHDWC (0xfffffd10 - AT91_BASE_SYS)
81#define AT91_RTT (0xfffffd20 - AT91_BASE_SYS)
82#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) 81#define AT91_PIT (0xfffffd30 - AT91_BASE_SYS)
83#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) 82#define AT91_WDT (0xfffffd40 - AT91_BASE_SYS)
84#define AT91_SCKCR (0xfffffd50 - AT91_BASE_SYS) 83#define AT91_SCKCR (0xfffffd50 - AT91_BASE_SYS)
@@ -91,6 +90,7 @@
91#define AT91SAM9RL_BASE_PIOB 0xfffff600 90#define AT91SAM9RL_BASE_PIOB 0xfffff600
92#define AT91SAM9RL_BASE_PIOC 0xfffff800 91#define AT91SAM9RL_BASE_PIOC 0xfffff800
93#define AT91SAM9RL_BASE_PIOD 0xfffffa00 92#define AT91SAM9RL_BASE_PIOD 0xfffffa00
93#define AT91SAM9RL_BASE_RTT 0xfffffd20
94 94
95#define AT91_USART0 AT91SAM9RL_BASE_US0 95#define AT91_USART0 AT91SAM9RL_BASE_US0
96#define AT91_USART1 AT91SAM9RL_BASE_US1 96#define AT91_USART1 AT91SAM9RL_BASE_US1
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-13 03:27:43 -0500