Rename common macros and functions that have da830 string in them to da8xx.
Signed-off-by: Sudhakar Rajashekhara <[email protected]> Signed-off-by: Sekhar Nori <[email protected]> --- arch/arm/mach-davinci/board-da830-evm.c | 14 +++++++------- arch/arm/mach-davinci/include/mach/debug-macro.S | 6 +++--- arch/arm/mach-davinci/include/mach/uncompress.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 09d01f4..0409eb6 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -22,7 +22,7 @@ #include <mach/common.h> #include <mach/irqs.h> #include <mach/cp_intc.h> -#include <mach/da830.h> +#include <mach/da8xx.h> #define DA830_EVM_PHY_MASK 0x0 #define DA830_EVM_MDIO_FREQUENCY 2200000 /* PHY bus frequency */ @@ -56,7 +56,7 @@ static __init void da830_evm_init(void) struct davinci_soc_info *soc_info = &davinci_soc_info; int ret; - ret = da830_register_edma(); + ret = da8xx_register_edma(); if (ret) pr_warning("da830_evm_init: edma registration failed: %d\n", ret); @@ -66,7 +66,7 @@ static __init void da830_evm_init(void) pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n", ret); - ret = da830_register_i2c(0, &da830_evm_i2c_0_pdata); + ret = da8xx_register_i2c(0, &da830_evm_i2c_0_pdata); if (ret) pr_warning("da830_evm_init: i2c0 registration failed: %d\n", ret); @@ -80,12 +80,12 @@ static __init void da830_evm_init(void) pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n", ret); - ret = da830_register_emac(); + ret = da8xx_register_emac(); if (ret) pr_warning("da830_evm_init: emac registration failed: %d\n", ret); - ret = da830_register_watchdog(); + ret = da8xx_register_watchdog(); if (ret) pr_warning("da830_evm_init: watchdog registration failed: %d\n", ret); @@ -107,7 +107,7 @@ static __init void da830_evm_irq_init(void) { struct davinci_soc_info *soc_info = &davinci_soc_info; - cp_intc_init((void __iomem *)DA830_CP_INTC_VIRT, DA830_N_CP_INTC_IRQ, + cp_intc_init((void __iomem *)DA8XX_CP_INTC_VIRT, DA830_N_CP_INTC_IRQ, soc_info->intc_irq_prios); } @@ -119,7 +119,7 @@ static void __init da830_evm_map_io(void) MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM") .phys_io = IO_PHYS, .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, - .boot_params = (DA830_DDR_BASE + 0x100), + .boot_params = (DA8XX_DDR_BASE + 0x100), .map_io = da830_evm_map_io, .init_irq = da830_evm_irq_init, .timer = &davinci_timer, diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 6cb21e0..69837a6 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S @@ -24,9 +24,9 @@ tst \rx, #1 @ MMU enabled? moveq \rx, #0x01000000 @ physical base address movne \rx, #0xfe000000 @ virtual base -#if defined(CONFIG_ARCH_DAVINCI_DA830) && defined(CONFIG_ARCH_DAVINCI_DMx) -#error Cannot enable DaVinci and DA830 platforms concurrently -#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM) +#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) +#error Cannot enable DaVinci and DA8XX platforms concurrently +#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) orr \rx, \rx, #0x00d00000 @ physical base address orr \rx, \rx, #0x0000d000 @ of UART 2 #else diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 860ed7a..0f1f12b 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -22,7 +22,7 @@ static u32 *uart; static u32 *get_uart_base(void) { if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) - return (u32 *)DA830_UART2_BASE; + return (u32 *)DA8XX_UART2_BASE; else return (u32 *)DAVINCI_UART0_BASE; } -- 1.5.6 _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
