summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-11-05 11:20:25 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-11-06 09:39:18 +0100
commitc67ac51bfad78c99478da00811c763ab646b8135 (patch)
tree7221cf7ab73c1d640c64673e5729d931f419aace /arch/arm/mach-at91
parenteaa7fcf934826d519f532227c304c09a62cfe685 (diff)
downloadbarebox-c67ac51bfad78c99478da00811c763ab646b8135.tar.gz
barebox-c67ac51bfad78c99478da00811c763ab646b8135.tar.xz
ARM: at91: Use SoC specific base addresses where appropriate
Replace AT91_ base addresses with their SoC specific variants where possible. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/at91rm9200_devices.c2
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c6
-rw-r--r--arch/arm/mach-at91/at91sam9261_devices.c2
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c6
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c6
-rw-r--r--arch/arm/mach-at91/at91sam9n12_devices.c10
-rw-r--r--arch/arm/mach-at91/at91sam9x5_devices.c10
-rw-r--r--arch/arm/mach-at91/include/mach/at91sam9x5.h2
8 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index a110ee3e3c..b4d7cb1e24 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -253,7 +253,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PA30, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PA31, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91RM9200_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index c5323e2cb2..9b8654f400 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -132,8 +132,8 @@ static struct resource nand_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = AT91_BASE_SYS + AT91_ECC,
- .end = AT91_BASE_SYS + AT91_ECC + 512 - 1,
+ .start = AT91SAM9260_BASE_ECC,
+ .end = AT91SAM9260_BASE_ECC + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
@@ -266,7 +266,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PB14, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PB15, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9260_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 9b7703ee97..3b869f923c 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -270,7 +270,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PA9, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PA10, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9261_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index ab3968eae2..877acc0df7 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -126,8 +126,8 @@ static struct resource nand_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = AT91_BASE_SYS + AT91_ECC0,
- .end = AT91_BASE_SYS + AT91_ECC0 + 512 - 1,
+ .start = AT91SAM9263_BASE_ECC0,
+ .end = AT91SAM9263_BASE_ECC0 + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
@@ -301,7 +301,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PC30, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PC31, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9263_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index b44273a0de..ae4bd50c4b 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -128,8 +128,8 @@ static struct resource nand_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = AT91_BASE_SYS + AT91_ECC,
- .end = AT91_BASE_SYS + AT91_ECC + 512 - 1,
+ .start = AT91SAM9G45_BASE_ECC,
+ .end = AT91SAM9G45_BASE_ECC + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
@@ -218,7 +218,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PB12, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PB13, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9G45_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9n12_devices.c b/arch/arm/mach-at91/at91sam9n12_devices.c
index e38fc77363..3c606d5a4d 100644
--- a/arch/arm/mach-at91/at91sam9n12_devices.c
+++ b/arch/arm/mach-at91/at91sam9n12_devices.c
@@ -133,13 +133,13 @@ static struct resource nand_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = AT91_BASE_SYS + AT91_PMECC,
- .end = AT91_BASE_SYS + AT91_PMECC + 0x600 - 1,
+ .start = AT91SAM9N12_BASE_PMECC,
+ .end = AT91SAM9N12_BASE_PMECC + 0x600 - 1,
.flags = IORESOURCE_MEM,
},
[2] = {
- .start = AT91_BASE_SYS + AT91_PMERRLOC,
- .end = AT91_BASE_SYS + AT91_PMERRLOC + 0x200 - 1,
+ .start = AT91SAM9N12_BASE_PMERRLOC,
+ .end = AT91SAM9N12_BASE_PMERRLOC + 0x200 - 1,
.flags = IORESOURCE_MEM,
},
[3] = {
@@ -373,7 +373,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PA9, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PA10, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9N12_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c
index e21bd598c9..b8035c1acf 100644
--- a/arch/arm/mach-at91/at91sam9x5_devices.c
+++ b/arch/arm/mach-at91/at91sam9x5_devices.c
@@ -225,13 +225,13 @@ static struct resource nand_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = AT91_BASE_SYS + AT91_PMECC,
- .end = AT91_BASE_SYS + AT91_PMECC + 0x600 - 1,
+ .start = AT91SAM9X5_BASE_PMECC,
+ .end = AT91SAM9X5_BASE_PMECC + 0x600 - 1,
.flags = IORESOURCE_MEM,
},
[2] = {
- .start = AT91_BASE_SYS + AT91_PMERRLOC,
- .end = AT91_BASE_SYS + AT91_PMERRLOC + 0x200 - 1,
+ .start = AT91SAM9X5_BASE_PMERRLOC,
+ .end = AT91SAM9X5_BASE_PMERRLOC + 0x200 - 1,
.flags = IORESOURCE_MEM,
},
[3] = {
@@ -457,7 +457,7 @@ resource_size_t __init at91_configure_dbgu(void)
at91_set_A_periph(AT91_PIN_PA9, 1); /* DRXD */
at91_set_A_periph(AT91_PIN_PA10, 0); /* DTXD */
- return AT91_BASE_SYS + AT91_DBGU;
+ return AT91SAM9X5_BASE_DBGU;
}
resource_size_t __init at91_configure_usart0(unsigned pins)
diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h
index 3ea2501b4c..54544968f5 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9x5.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h
@@ -90,7 +90,7 @@
* System Peripherals
*/
#define AT91SAM9X5_BASE_MATRIX 0xffffde00
-#define AT9SAM9X5_BASE1_PMECC 0xffffe000
+#define AT91SAM9X5_BASE_PMECC 0xffffe000
#define AT91SAM9X5_BASE_PMERRLOC 0xffffe600
#define AT91SAM9X5_BASE_DDRSDRC0 0xffffe800
#define AT91SAM9X5_BASE_SMC 0xffffea00