"Matt" == Matt Porter mporter@ti.com writes:
Matt> Eliminate AM33xx specific names to prepare for TI814x support Matt> within AM33xx-land.
Matt> Signed-off-by: Matt Porter mporter@ti.com Matt> Reviewed-by: Tom Rini trini@ti.com
Acked-by: Peter Korsgaard jacmet@sunsite.dk
Matt> --- Matt> v2: no changes Matt> --- Matt> arch/arm/cpu/armv7/am33xx/board.c | 4 ++-- Matt> arch/arm/include/asm/arch-am33xx/hardware.h | 10 +++++----- Matt> board/ti/am335x/board.c | 6 +++--- Matt> 3 files changed, 10 insertions(+), 10 deletions(-)
Matt> diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c Matt> index ab31326..b186b32 100644 Matt> --- a/arch/arm/cpu/armv7/am33xx/board.c Matt> +++ b/arch/arm/cpu/armv7/am33xx/board.c Matt> @@ -141,11 +141,11 @@ int arch_misc_init(void) Matt> { Matt> #ifdef CONFIG_AM335X_USB0 Matt> musb_register(&otg0_plat, &otg0_board_data, Matt> - (void *)AM335X_USB0_OTG_BASE); Matt> + (void *)USB0_OTG_BASE); Matt> #endif Matt> #ifdef CONFIG_AM335X_USB1 Matt> musb_register(&otg1_plat, &otg1_board_data, Matt> - (void *)AM335X_USB1_OTG_BASE); Matt> + (void *)USB1_OTG_BASE); Matt> #endif Matt> return 0; Matt> } Matt> diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h Matt> index 6dd3296..7016e25 100644 Matt> --- a/arch/arm/include/asm/arch-am33xx/hardware.h Matt> +++ b/arch/arm/include/asm/arch-am33xx/hardware.h Matt> @@ -84,14 +84,14 @@ Matt> #define GPMC_BASE 0x50000000
Matt> /* CPSW Config space */ Matt> -#define AM335X_CPSW_BASE 0x4A100000 Matt> -#define AM335X_CPSW_MDIO_BASE 0x4A101000 Matt> +#define CPSW_BASE 0x4A100000 Matt> +#define CPSW_MDIO_BASE 0x4A101000
Matt> /* RTC base address */ Matt> -#define AM335X_RTC_BASE 0x44E3E000 Matt> +#define RTC_BASE 0x44E3E000
Matt> /* OTG */ Matt> -#define AM335X_USB0_OTG_BASE 0x47401000 Matt> -#define AM335X_USB1_OTG_BASE 0x47401800 Matt> +#define USB0_OTG_BASE 0x47401000 Matt> +#define USB1_OTG_BASE 0x47401800
Matt> #endif /* __AM33XX_HARDWARE_H */ Matt> diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c Matt> index 48e6896..0948889 100644 Matt> --- a/board/ti/am335x/board.c Matt> +++ b/board/ti/am335x/board.c Matt> @@ -134,7 +134,7 @@ static int read_eeprom(void)
Matt> static void rtc32k_enable(void) Matt> { Matt> - struct rtc_regs *rtc = (struct rtc_regs *)AM335X_RTC_BASE; Matt> + struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE;
Matt> /* Matt> * Unlock the RTC's registers. For more details please see the Matt> @@ -411,8 +411,8 @@ static struct cpsw_slave_data cpsw_slaves[] = { Matt> };
Matt> static struct cpsw_platform_data cpsw_data = { Matt> - .mdio_base = AM335X_CPSW_MDIO_BASE, Matt> - .cpsw_base = AM335X_CPSW_BASE, Matt> + .mdio_base = CPSW_MDIO_BASE, Matt> + .cpsw_base = CPSW_BASE, Matt> .mdio_div = 0xff, Matt> .channels = 8, Matt> .cpdma_reg_ofs = 0x800, Matt> -- Matt> 1.7.9.5