Skip to content

L
linux-davinci
Commit 0d50bd83 authored by andrzej zaborowski's avatar andrzej zaborowski Committed by Tony Lindgren
Browse files
Options

[PATCH] ARM: OMAP: Replace selected omap1510 with omap15xx for OMAP310 

Replace selected omap1510 with omap15xx for OMAP310.
parent 04731009
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
arch/arm/mach-omap1/board-generic.c
View file @ 0d50bd83
...@@ -88,7 +88,7 @@ static struct omap_board_config_kernel generic_config[] = { ...@@ -88,7 +88,7 @@ static struct omap_board_config_kernel generic_config[] = {
static void __init omap_generic_init(void) static void __init omap_generic_init(void)
{ {
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
generic_config[0].data = &generic1510_usb_config; generic_config[0].data = &generic1510_usb_config;
} }
#endif #endif
......
arch/arm/mach-omap1/io.c
View file @ 0d50bd83
...@@ -110,7 +110,7 @@ void __init omap1_map_common_io(void) ...@@ -110,7 +110,7 @@ void __init omap1_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc)); iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
} }
#endif #endif
......
arch/arm/mach-omap1/pm.c
View file @ 0d50bd83
...@@ -165,7 +165,7 @@ void omap_pm_idle(void) ...@@ -165,7 +165,7 @@ void omap_pm_idle(void)
if ((use_idlect1 != ~0) || !do_sleep) { if ((use_idlect1 != ~0) || !do_sleep) {
__u32 saved_idlect1 = omap_readl(ARM_IDLECT1); __u32 saved_idlect1 = omap_readl(ARM_IDLECT1);
if (cpu_is_omap1510()) if (cpu_is_omap15xx())
use_idlect1 &= OMAP1510_BIG_SLEEP_REQUEST; use_idlect1 &= OMAP1510_BIG_SLEEP_REQUEST;
else else
use_idlect1 &= OMAP1610_IDLECT1_SLEEP_VAL; use_idlect1 &= OMAP1610_IDLECT1_SLEEP_VAL;
...@@ -204,7 +204,7 @@ static void omap_pm_wakeup_setup(void) ...@@ -204,7 +204,7 @@ static void omap_pm_wakeup_setup(void)
if (cpu_is_omap730()) if (cpu_is_omap730())
level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) | level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |
OMAP_IRQ_BIT(INT_730_IH2_IRQ); OMAP_IRQ_BIT(INT_730_IH2_IRQ);
else if (cpu_is_omap1510()) else if (cpu_is_omap15xx())
level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) | level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
OMAP_IRQ_BIT(INT_1510_IH2_IRQ); OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
else if (cpu_is_omap16xx()) else if (cpu_is_omap16xx())
...@@ -218,7 +218,7 @@ static void omap_pm_wakeup_setup(void) ...@@ -218,7 +218,7 @@ static void omap_pm_wakeup_setup(void)
omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) | omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)), OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),
OMAP_IH2_1_MIR); OMAP_IH2_1_MIR);
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD); level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
omap_writel(~level2_wake, OMAP_IH2_MIR); omap_writel(~level2_wake, OMAP_IH2_MIR);
} else if (cpu_is_omap16xx()) { } else if (cpu_is_omap16xx()) {
...@@ -284,7 +284,7 @@ void omap_pm_suspend(void) ...@@ -284,7 +284,7 @@ void omap_pm_suspend(void)
MPUI730_SAVE(EMIFS_CONFIG); MPUI730_SAVE(EMIFS_CONFIG);
MPUI730_SAVE(EMIFF_SDRAM_CONFIG); MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
MPUI1510_SAVE(OMAP_IH1_MIR); MPUI1510_SAVE(OMAP_IH1_MIR);
MPUI1510_SAVE(OMAP_IH2_MIR); MPUI1510_SAVE(OMAP_IH2_MIR);
MPUI1510_SAVE(MPUI_CTRL); MPUI1510_SAVE(MPUI_CTRL);
...@@ -308,7 +308,7 @@ void omap_pm_suspend(void) ...@@ -308,7 +308,7 @@ void omap_pm_suspend(void)
ARM_SAVE(ARM_CKCTL); ARM_SAVE(ARM_CKCTL);
ARM_SAVE(ARM_IDLECT1); ARM_SAVE(ARM_IDLECT1);
ARM_SAVE(ARM_IDLECT2); ARM_SAVE(ARM_IDLECT2);
if (!(cpu_is_omap1510())) if (!(cpu_is_omap15xx()))
ARM_SAVE(ARM_IDLECT3); ARM_SAVE(ARM_IDLECT3);
ARM_SAVE(ARM_EWUPCT); ARM_SAVE(ARM_EWUPCT);
ARM_SAVE(ARM_RSTCT1); ARM_SAVE(ARM_RSTCT1);
...@@ -393,7 +393,7 @@ void omap_pm_suspend(void) ...@@ -393,7 +393,7 @@ void omap_pm_suspend(void)
* Restore ARM state, except ARM_IDLECT1/2 which omap_cpu_suspend did * Restore ARM state, except ARM_IDLECT1/2 which omap_cpu_suspend did
*/ */
if (!(cpu_is_omap1510())) if (!(cpu_is_omap15xx()))
ARM_RESTORE(ARM_IDLECT3); ARM_RESTORE(ARM_IDLECT3);
ARM_RESTORE(ARM_CKCTL); ARM_RESTORE(ARM_CKCTL);
ARM_RESTORE(ARM_EWUPCT); ARM_RESTORE(ARM_EWUPCT);
...@@ -409,7 +409,7 @@ void omap_pm_suspend(void) ...@@ -409,7 +409,7 @@ void omap_pm_suspend(void)
MPUI730_RESTORE(OMAP_IH1_MIR); MPUI730_RESTORE(OMAP_IH1_MIR);
MPUI730_RESTORE(OMAP_IH2_0_MIR); MPUI730_RESTORE(OMAP_IH2_0_MIR);
MPUI730_RESTORE(OMAP_IH2_1_MIR); MPUI730_RESTORE(OMAP_IH2_1_MIR);
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
MPUI1510_RESTORE(MPUI_CTRL); MPUI1510_RESTORE(MPUI_CTRL);
MPUI1510_RESTORE(MPUI_DSP_BOOT_CONFIG); MPUI1510_RESTORE(MPUI_DSP_BOOT_CONFIG);
MPUI1510_RESTORE(MPUI_DSP_API_CONFIG); MPUI1510_RESTORE(MPUI_DSP_API_CONFIG);
...@@ -470,7 +470,7 @@ static int omap_pm_read_proc( ...@@ -470,7 +470,7 @@ static int omap_pm_read_proc(
ARM_SAVE(ARM_CKCTL); ARM_SAVE(ARM_CKCTL);
ARM_SAVE(ARM_IDLECT1); ARM_SAVE(ARM_IDLECT1);
ARM_SAVE(ARM_IDLECT2); ARM_SAVE(ARM_IDLECT2);
if (!(cpu_is_omap1510())) if (!(cpu_is_omap15xx()))
ARM_SAVE(ARM_IDLECT3); ARM_SAVE(ARM_IDLECT3);
ARM_SAVE(ARM_EWUPCT); ARM_SAVE(ARM_EWUPCT);
ARM_SAVE(ARM_RSTCT1); ARM_SAVE(ARM_RSTCT1);
...@@ -491,7 +491,7 @@ static int omap_pm_read_proc( ...@@ -491,7 +491,7 @@ static int omap_pm_read_proc(
MPUI730_SAVE(MPUI_DSP_API_CONFIG); MPUI730_SAVE(MPUI_DSP_API_CONFIG);
MPUI730_SAVE(EMIFF_SDRAM_CONFIG); MPUI730_SAVE(EMIFF_SDRAM_CONFIG);
MPUI730_SAVE(EMIFS_CONFIG); MPUI730_SAVE(EMIFS_CONFIG);
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
MPUI1510_SAVE(MPUI_CTRL); MPUI1510_SAVE(MPUI_CTRL);
MPUI1510_SAVE(MPUI_DSP_STATUS); MPUI1510_SAVE(MPUI_DSP_STATUS);
MPUI1510_SAVE(MPUI_DSP_BOOT_CONFIG); MPUI1510_SAVE(MPUI_DSP_BOOT_CONFIG);
...@@ -554,7 +554,7 @@ static int omap_pm_read_proc( ...@@ -554,7 +554,7 @@ static int omap_pm_read_proc(
MPUI730_SHOW(MPUI_DSP_API_CONFIG), MPUI730_SHOW(MPUI_DSP_API_CONFIG),
MPUI730_SHOW(EMIFF_SDRAM_CONFIG), MPUI730_SHOW(EMIFF_SDRAM_CONFIG),
MPUI730_SHOW(EMIFS_CONFIG)); MPUI730_SHOW(EMIFS_CONFIG));
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
my_buffer_offset += sprintf(my_base + my_buffer_offset, my_buffer_offset += sprintf(my_base + my_buffer_offset,
"MPUI1510_CTRL_REG 0x%-8x \n" "MPUI1510_CTRL_REG 0x%-8x \n"
"MPUI1510_DSP_STATUS_REG: 0x%-8x \n" "MPUI1510_DSP_STATUS_REG: 0x%-8x \n"
...@@ -714,7 +714,7 @@ static int __init omap_pm_init(void) ...@@ -714,7 +714,7 @@ static int __init omap_pm_init(void)
omap730_idle_loop_suspend_sz); omap730_idle_loop_suspend_sz);
omap_sram_suspend = omap_sram_push(omap730_cpu_suspend, omap_sram_suspend = omap_sram_push(omap730_cpu_suspend,
omap730_cpu_suspend_sz); omap730_cpu_suspend_sz);
} else if (cpu_is_omap1510()) { } else if (cpu_is_omap15xx()) {
omap_sram_idle = omap_sram_push(omap1510_idle_loop_suspend, omap_sram_idle = omap_sram_push(omap1510_idle_loop_suspend,
omap1510_idle_loop_suspend_sz); omap1510_idle_loop_suspend_sz);
omap_sram_suspend = omap_sram_push(omap1510_cpu_suspend, omap_sram_suspend = omap_sram_push(omap1510_cpu_suspend,
......
arch/arm/plat-omap/gpio.c
View file @ 0d50bd83
...@@ -174,7 +174,7 @@ static int gpio_bank_count; ...@@ -174,7 +174,7 @@ static int gpio_bank_count;
static inline struct gpio_bank *get_gpio_bank(int gpio) static inline struct gpio_bank *get_gpio_bank(int gpio)
{ {
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
if (OMAP_GPIO_IS_MPUIO(gpio)) if (OMAP_GPIO_IS_MPUIO(gpio))
return &gpio_bank[0]; return &gpio_bank[0];
return &gpio_bank[1]; return &gpio_bank[1];
...@@ -223,7 +223,7 @@ static inline int gpio_valid(int gpio) ...@@ -223,7 +223,7 @@ static inline int gpio_valid(int gpio)
return 0; return 0;
} }
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510() && gpio < 16) if (cpu_is_omap15xx() && gpio < 16)
return 0; return 0;
#endif #endif
#if defined(CONFIG_ARCH_OMAP16XX) #if defined(CONFIG_ARCH_OMAP16XX)
...@@ -886,7 +886,7 @@ static int __init _omap_gpio_init(void) ...@@ -886,7 +886,7 @@ static int __init _omap_gpio_init(void)
initialized = 1; initialized = 1;
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
gpio_ick = clk_get(NULL, "arm_gpio_ck"); gpio_ick = clk_get(NULL, "arm_gpio_ck");
if (IS_ERR(gpio_ick)) if (IS_ERR(gpio_ick))
printk("Could not get arm_gpio_ck\n"); printk("Could not get arm_gpio_ck\n");
...@@ -907,7 +907,7 @@ static int __init _omap_gpio_init(void) ...@@ -907,7 +907,7 @@ static int __init _omap_gpio_init(void)
} }
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
printk(KERN_INFO "OMAP1510 GPIO hardware\n"); printk(KERN_INFO "OMAP1510 GPIO hardware\n");
gpio_bank_count = 2; gpio_bank_count = 2;
gpio_bank = gpio_bank_1510; gpio_bank = gpio_bank_1510;
......
arch/arm/plat-omap/mcbsp.c
View file @ 0d50bd83
...@@ -183,7 +183,7 @@ static int omap_mcbsp_check(unsigned int id) ...@@ -183,7 +183,7 @@ static int omap_mcbsp_check(unsigned int id)
return 0; return 0;
} }
if (cpu_is_omap1510() || cpu_is_omap16xx() || cpu_is_omap24xx()) { if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) {
if (id > OMAP_MAX_MCBSP_COUNT) { if (id > OMAP_MAX_MCBSP_COUNT) {
printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1); printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1);
return -1; return -1;
...@@ -197,7 +197,7 @@ static int omap_mcbsp_check(unsigned int id) ...@@ -197,7 +197,7 @@ static int omap_mcbsp_check(unsigned int id)
#ifdef CONFIG_ARCH_OMAP1 #ifdef CONFIG_ARCH_OMAP1
static void omap_mcbsp_dsp_request(void) static void omap_mcbsp_dsp_request(void)
{ {
if (cpu_is_omap1510() || cpu_is_omap16xx()) { if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
omap_dsp_request_mem(); omap_dsp_request_mem();
clk_enable(mcbsp_dsp_ck); clk_enable(mcbsp_dsp_ck);
clk_enable(mcbsp_api_ck); clk_enable(mcbsp_api_ck);
...@@ -216,7 +216,7 @@ static void omap_mcbsp_dsp_request(void) ...@@ -216,7 +216,7 @@ static void omap_mcbsp_dsp_request(void)
static void omap_mcbsp_dsp_free(void) static void omap_mcbsp_dsp_free(void)
{ {
if (cpu_is_omap1510() || cpu_is_omap16xx()) { if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
omap_dsp_release_mem(); omap_dsp_release_mem();
clk_disable(mcbsp_dspxor_ck); clk_disable(mcbsp_dspxor_ck);
clk_disable(mcbsp_dsp_ck); clk_disable(mcbsp_dsp_ck);
...@@ -832,7 +832,7 @@ static int __init omap_mcbsp_init(void) ...@@ -832,7 +832,7 @@ static int __init omap_mcbsp_init(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) { if (cpu_is_omap15xx()) {
mcbsp_info = mcbsp_1510; mcbsp_info = mcbsp_1510;
mcbsp_count = ARRAY_SIZE(mcbsp_1510); mcbsp_count = ARRAY_SIZE(mcbsp_1510);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment