From: Matt Porter <mporter@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/10] am33xx: convert defines from am33xx-specific to generic names
Date: Wed, 13 Feb 2013 09:43:55 -0500 [thread overview]
Message-ID: <1360766644-9901-2-git-send-email-mporter@ti.com> (raw)
In-Reply-To: <1360766644-9901-1-git-send-email-mporter@ti.com>
Eliminate AM33xx specific names to prepare for TI814x support
within AM33xx-land.
Signed-off-by: Matt Porter <mporter@ti.com>
---
arch/arm/cpu/armv7/am33xx/board.c | 4 ++--
arch/arm/include/asm/arch-am33xx/hardware.h | 10 +++++-----
board/ti/am335x/board.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index ab31326..b186b32 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -141,11 +141,11 @@ int arch_misc_init(void)
{
#ifdef CONFIG_AM335X_USB0
musb_register(&otg0_plat, &otg0_board_data,
- (void *)AM335X_USB0_OTG_BASE);
+ (void *)USB0_OTG_BASE);
#endif
#ifdef CONFIG_AM335X_USB1
musb_register(&otg1_plat, &otg1_board_data,
- (void *)AM335X_USB1_OTG_BASE);
+ (void *)USB1_OTG_BASE);
#endif
return 0;
}
diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h
index 6dd3296..7016e25 100644
--- a/arch/arm/include/asm/arch-am33xx/hardware.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware.h
@@ -84,14 +84,14 @@
#define GPMC_BASE 0x50000000
/* CPSW Config space */
-#define AM335X_CPSW_BASE 0x4A100000
-#define AM335X_CPSW_MDIO_BASE 0x4A101000
+#define CPSW_BASE 0x4A100000
+#define CPSW_MDIO_BASE 0x4A101000
/* RTC base address */
-#define AM335X_RTC_BASE 0x44E3E000
+#define RTC_BASE 0x44E3E000
/* OTG */
-#define AM335X_USB0_OTG_BASE 0x47401000
-#define AM335X_USB1_OTG_BASE 0x47401800
+#define USB0_OTG_BASE 0x47401000
+#define USB1_OTG_BASE 0x47401800
#endif /* __AM33XX_HARDWARE_H */
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index ed4229e..1e698df 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -123,7 +123,7 @@ static int read_eeprom(void)
static void rtc32k_enable(void)
{
- struct rtc_regs *rtc = (struct rtc_regs *)AM335X_RTC_BASE;
+ struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE;
/*
* Unlock the RTC's registers. For more details please see the
@@ -365,8 +365,8 @@ static struct cpsw_slave_data cpsw_slaves[] = {
};
static struct cpsw_platform_data cpsw_data = {
- .mdio_base = AM335X_CPSW_MDIO_BASE,
- .cpsw_base = AM335X_CPSW_BASE,
+ .mdio_base = CPSW_MDIO_BASE,
+ .cpsw_base = CPSW_BASE,
.mdio_div = 0xff,
.channels = 8,
.cpdma_reg_ofs = 0x800,
--
1.7.9.5
next prev parent reply other threads:[~2013-02-13 14:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 14:43 [U-Boot] [PATCH 00/10] Add TI814x EVM Support Matt Porter
2013-02-13 14:43 ` Matt Porter [this message]
2013-02-15 16:36 ` [U-Boot] [PATCH 01/10] am33xx: convert defines from am33xx-specific to generic names Tom Rini
2013-02-13 14:43 ` [U-Boot] [PATCH 02/10] am33xx: refactor emif4/ddr to support multiple EMIF instances Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-13 14:43 ` [U-Boot] [PATCH 03/10] am33xx: refactor am33xx clocks and add ti814x support Matt Porter
2013-02-15 16:37 ` Tom Rini
[not found] ` <2cc71ab85c654e688082a434442f08d8@DLEE74.ent.ti.com>
2013-02-15 21:16 ` Matt Porter
2013-02-17 20:17 ` Peter Korsgaard
2013-02-25 14:31 ` Matt Porter
2013-02-13 14:43 ` [U-Boot] [PATCH 04/10] am33xx: refactor am33xx mux support " Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-17 20:18 ` Peter Korsgaard
[not found] ` <463068779ea9433098998cd260b4c550@DFLE73.ent.ti.com>
2013-02-25 14:32 ` Matt Porter
2013-02-13 14:43 ` [U-Boot] [PATCH 05/10] am33xx: add ti814x specific register definitions Matt Porter
2013-02-15 16:37 ` Tom Rini
2013-02-17 20:28 ` Peter Korsgaard
2013-02-18 15:18 ` Tom Rini
2013-02-18 15:21 ` Peter Korsgaard
2013-02-21 22:08 ` Brian Hutchinson
2013-02-22 15:37 ` Peter Korsgaard
2013-02-22 15:51 ` Tom Rini
2013-02-22 16:34 ` Peter Korsgaard
[not found] ` <bc703446ae2c4dc79a6097dc28327030@DLEE74.ent.ti.com>
2013-02-25 14:46 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 06/10] am33xx: add dmm support to emif4 library Matt Porter
2013-02-15 16:38 ` Tom Rini
2013-02-13 14:44 ` [U-Boot] [PATCH 07/10] ti814x_evm: add ti814x evm board support Matt Porter
2013-02-15 16:38 ` Tom Rini
[not found] ` <e0c6e2fe1afd4a5887b85c5b7d1877ce@DLEE74.ent.ti.com>
2013-02-15 21:19 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 08/10] ns16550: enable quirks for ti814x Matt Porter
2013-02-15 16:38 ` Tom Rini
2013-02-13 14:44 ` [U-Boot] [PATCH 09/10] ti814x_evm: enable ti814x evm build Matt Porter
2013-02-15 16:39 ` Tom Rini
2013-02-15 21:20 ` Matt Porter
2013-02-13 14:44 ` [U-Boot] [PATCH 10/10] MAINTAINERS: add ti814x_evm maintainer Matt Porter
2013-02-15 16:39 ` Tom Rini
2013-02-15 21:21 ` Matt Porter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360766644-9901-2-git-send-email-mporter@ti.com \
--to=mporter@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox