Skip to content

L
linux
Commit a8eb7ca0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 

Replace ARCH_OMAP34XX with ARCH_OMAP3
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 088ef950
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 96 deletions
arch/arm/mach-omap2/Kconfig
View file @ a8eb7ca0
...@@ -11,14 +11,9 @@ config ARCH_OMAP2430 ...@@ -11,14 +11,9 @@ config ARCH_OMAP2430
bool "OMAP2430 support" bool "OMAP2430 support"
depends on ARCH_OMAP2 depends on ARCH_OMAP2
config ARCH_OMAP34XX
bool "OMAP34xx Based System"
depends on ARCH_OMAP3
select USB_ARCH_HAS_EHCI
config ARCH_OMAP3430 config ARCH_OMAP3430
bool "OMAP3430 support" bool "OMAP3430 support"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
config OMAP_PACKAGE_CBC config OMAP_PACKAGE_CBC
...@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP ...@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP
config MACH_OMAP3_BEAGLE config MACH_OMAP3_BEAGLE
bool "OMAP3 BEAGLE board" bool "OMAP3 BEAGLE board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP_LDP config MACH_OMAP_LDP
bool "OMAP3 LDP board" bool "OMAP3 LDP board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OVERO config MACH_OVERO
bool "Gumstix Overo board" bool "Gumstix Overo board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP3EVM config MACH_OMAP3EVM
bool "OMAP 3530 EVM board" bool "OMAP 3530 EVM board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP3517EVM config MACH_OMAP3517EVM
bool "OMAP3517/ AM3517 EVM board" bool "OMAP3517/ AM3517 EVM board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP3_PANDORA config MACH_OMAP3_PANDORA
bool "OMAP3 Pandora" bool "OMAP3 Pandora"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP3_TOUCHBOOK config MACH_OMAP3_TOUCHBOOK
bool "OMAP3 Touch Book" bool "OMAP3 Touch Book"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
config MACH_OMAP_3430SDP config MACH_OMAP_3430SDP
bool "OMAP 3430 SDP board" bool "OMAP 3430 SDP board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_NOKIA_N800 config MACH_NOKIA_N800
...@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0 ...@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0
config MACH_NOKIA_RX51 config MACH_NOKIA_RX51
bool "Nokia RX-51 board" bool "Nokia RX-51 board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP_ZOOM2 config MACH_OMAP_ZOOM2
bool "OMAP3 Zoom2 board" bool "OMAP3 Zoom2 board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP_ZOOM3 config MACH_OMAP_ZOOM3
bool "OMAP3630 Zoom3 board" bool "OMAP3630 Zoom3 board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBP select OMAP_PACKAGE_CBP
config MACH_CM_T35 config MACH_CM_T35
bool "CompuLab CM-T35 module" bool "CompuLab CM-T35 module"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CUS select OMAP_PACKAGE_CUS
select OMAP_MUX select OMAP_MUX
config MACH_IGEP0020 config MACH_IGEP0020
bool "IGEP0020" bool "IGEP0020"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
config MACH_OMAP_3630SDP config MACH_OMAP_3630SDP
bool "OMAP3630 SDP board" bool "OMAP3630 SDP board"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
select OMAP_PACKAGE_CBP select OMAP_PACKAGE_CBP
config MACH_OMAP_4430SDP config MACH_OMAP_4430SDP
...@@ -158,7 +153,7 @@ config OMAP3_EMU ...@@ -158,7 +153,7 @@ config OMAP3_EMU
config OMAP3_SDRC_AC_TIMING config OMAP3_SDRC_AC_TIMING
bool "Enable SDRC AC timing register changes" bool "Enable SDRC AC timing register changes"
depends on ARCH_OMAP3 && ARCH_OMAP34XX depends on ARCH_OMAP3
default n default n
help help
If you know that none of your system initiators will attempt to If you know that none of your system initiators will attempt to
......
arch/arm/mach-omap2/io.c
View file @ a8eb7ca0
...@@ -125,7 +125,7 @@ static struct map_desc omap243x_io_desc[] __initdata = { ...@@ -125,7 +125,7 @@ static struct map_desc omap243x_io_desc[] __initdata = {
#endif #endif
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
static struct map_desc omap34xx_io_desc[] __initdata = { static struct map_desc omap34xx_io_desc[] __initdata = {
{ {
.virtual = L3_34XX_VIRT, .virtual = L3_34XX_VIRT,
...@@ -269,7 +269,7 @@ void __init omap243x_map_common_io() ...@@ -269,7 +269,7 @@ void __init omap243x_map_common_io()
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
void __init omap34xx_map_common_io() void __init omap34xx_map_common_io()
{ {
iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc)); iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
......
arch/arm/mach-omap2/mcbsp.c
View file @ a8eb7ca0
...@@ -119,7 +119,7 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { ...@@ -119,7 +119,7 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
#define OMAP2430_MCBSP_PDATA_SZ 0 #define OMAP2430_MCBSP_PDATA_SZ 0
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
{ {
.phys_base = OMAP34XX_MCBSP1_BASE, .phys_base = OMAP34XX_MCBSP1_BASE,
......
arch/arm/mach-omap2/mux.c
View file @ a8eb7ca0
...@@ -369,7 +369,7 @@ int __init omap2_mux_init(void) ...@@ -369,7 +369,7 @@ int __init omap2_mux_init(void)
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
static LIST_HEAD(muxmodes); static LIST_HEAD(muxmodes);
static DEFINE_MUTEX(muxmode_mutex); static DEFINE_MUTEX(muxmode_mutex);
...@@ -1018,5 +1018,5 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size, ...@@ -1018,5 +1018,5 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
return 0; return 0;
} }
#endif /* CONFIG_ARCH_OMAP34XX */ #endif /* CONFIG_ARCH_OMAP3 */
arch/arm/mach-omap2/mux.h
View file @ a8eb7ca0
...@@ -102,7 +102,7 @@ struct omap_board_mux { ...@@ -102,7 +102,7 @@ struct omap_board_mux {
u16 value; u16 value;
}; };
#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3)
/** /**
* omap_mux_init_gpio - initialize a signal based on the GPIO number * omap_mux_init_gpio - initialize a signal based on the GPIO number
......
arch/arm/mach-omap2/omap_hwmod_34xx.h
View file @ a8eb7ca0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H #define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
#include <plat/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include <mach/irqs.h> #include <mach/irqs.h>
......
arch/arm/plat-omap/Kconfig
View file @ a8eb7ca0
...@@ -30,6 +30,7 @@ config ARCH_OMAP3 ...@@ -30,6 +30,7 @@ config ARCH_OMAP3
bool "TI OMAP3" bool "TI OMAP3"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
select CPU_V7 select CPU_V7
select USB_ARCH_HAS_EHCI
config ARCH_OMAP4 config ARCH_OMAP4
bool "TI OMAP4" bool "TI OMAP4"
...@@ -124,7 +125,7 @@ config OMAP_MPU_TIMER ...@@ -124,7 +125,7 @@ config OMAP_MPU_TIMER
config OMAP_32K_TIMER config OMAP_32K_TIMER
bool "Use 32KHz timer" bool "Use 32KHz timer"
depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
help help
Select this option if you want to enable the OMAP 32KHz timer. Select this option if you want to enable the OMAP 32KHz timer.
This timer saves power compared to the OMAP_MPU_TIMER, and has This timer saves power compared to the OMAP_MPU_TIMER, and has
...@@ -145,7 +146,7 @@ config OMAP_32K_TIMER_HZ ...@@ -145,7 +146,7 @@ config OMAP_32K_TIMER_HZ
config OMAP_DM_TIMER config OMAP_DM_TIMER
bool "Use dual-mode timer" bool "Use dual-mode timer"
depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
help help
Select this option if you want to use OMAP Dual-Mode timers. Select this option if you want to use OMAP Dual-Mode timers.
......
arch/arm/plat-omap/common.c
View file @ a8eb7ca0
...@@ -127,7 +127,7 @@ static cycle_t omap2430_32k_read(struct clocksource *cs) ...@@ -127,7 +127,7 @@ static cycle_t omap2430_32k_read(struct clocksource *cs)
#define omap2430_32k_read NULL #define omap2430_32k_read NULL
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
static cycle_t omap34xx_32k_read(struct clocksource *cs) static cycle_t omap34xx_32k_read(struct clocksource *cs)
{ {
return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10); return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10);
......
arch/arm/plat-omap/gpio.c
View file @ a8eb7ca0
...@@ -178,11 +178,11 @@ struct gpio_bank { ...@@ -178,11 +178,11 @@ struct gpio_bank {
u16 virtual_irq_start; u16 virtual_irq_start;
int method; int method;
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
u32 suspend_wakeup; u32 suspend_wakeup;
u32 saved_wakeup; u32 saved_wakeup;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
u32 non_wakeup_gpios; u32 non_wakeup_gpios;
u32 enabled_non_wakeup_gpios; u32 enabled_non_wakeup_gpios;
...@@ -276,7 +276,7 @@ static struct gpio_bank gpio_bank_243x[5] = { ...@@ -276,7 +276,7 @@ static struct gpio_bank gpio_bank_243x[5] = {
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
static struct gpio_bank gpio_bank_34xx[6] = { static struct gpio_bank gpio_bank_34xx[6] = {
{ OMAP34XX_GPIO1_BASE, NULL, INT_34XX_GPIO_BANK1, IH_GPIO_BASE, { OMAP34XX_GPIO1_BASE, NULL, INT_34XX_GPIO_BANK1, IH_GPIO_BASE,
METHOD_GPIO_24XX }, METHOD_GPIO_24XX },
...@@ -426,7 +426,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) ...@@ -426,7 +426,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
reg += OMAP7XX_GPIO_DIR_CONTROL; reg += OMAP7XX_GPIO_DIR_CONTROL;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_OE; reg += OMAP24XX_GPIO_OE;
break; break;
...@@ -493,7 +493,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -493,7 +493,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
l &= ~(1 << gpio); l &= ~(1 << gpio);
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
if (enable) if (enable)
reg += OMAP24XX_GPIO_SETDATAOUT; reg += OMAP24XX_GPIO_SETDATAOUT;
...@@ -546,7 +546,7 @@ static int _get_gpio_datain(struct gpio_bank *bank, int gpio) ...@@ -546,7 +546,7 @@ static int _get_gpio_datain(struct gpio_bank *bank, int gpio)
reg += OMAP7XX_GPIO_DATA_INPUT; reg += OMAP7XX_GPIO_DATA_INPUT;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_DATAIN; reg += OMAP24XX_GPIO_DATAIN;
break; break;
...@@ -592,7 +592,7 @@ static int _get_gpio_dataout(struct gpio_bank *bank, int gpio) ...@@ -592,7 +592,7 @@ static int _get_gpio_dataout(struct gpio_bank *bank, int gpio)
reg += OMAP7XX_GPIO_DATA_OUTPUT; reg += OMAP7XX_GPIO_DATA_OUTPUT;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_DATAOUT; reg += OMAP24XX_GPIO_DATAOUT;
...@@ -684,7 +684,7 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time) ...@@ -684,7 +684,7 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time)
} }
EXPORT_SYMBOL(omap_set_gpio_debounce_time); EXPORT_SYMBOL(omap_set_gpio_debounce_time);
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
int trigger) int trigger)
...@@ -856,7 +856,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -856,7 +856,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
goto bad; goto bad;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
set_24xx_gpio_triggering(bank, gpio, trigger); set_24xx_gpio_triggering(bank, gpio, trigger);
...@@ -937,7 +937,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) ...@@ -937,7 +937,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
reg += OMAP7XX_GPIO_INT_STATUS; reg += OMAP7XX_GPIO_INT_STATUS;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_IRQSTATUS1; reg += OMAP24XX_GPIO_IRQSTATUS1;
break; break;
...@@ -954,7 +954,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) ...@@ -954,7 +954,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
__raw_writel(gpio_mask, reg); __raw_writel(gpio_mask, reg);
/* Workaround for clearing DSP GPIO interrupts to allow retention */ /* Workaround for clearing DSP GPIO interrupts to allow retention */
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2; reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2;
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
...@@ -1008,7 +1008,7 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) ...@@ -1008,7 +1008,7 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
inv = 1; inv = 1;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_IRQENABLE1; reg += OMAP24XX_GPIO_IRQENABLE1;
mask = 0xffffffff; mask = 0xffffffff;
...@@ -1077,7 +1077,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -1077,7 +1077,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
l |= gpio_mask; l |= gpio_mask;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
if (enable) if (enable)
reg += OMAP24XX_GPIO_SETIRQENABLE1; reg += OMAP24XX_GPIO_SETIRQENABLE1;
...@@ -1131,7 +1131,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) ...@@ -1131,7 +1131,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
spin_unlock_irqrestore(&bank->lock, flags); spin_unlock_irqrestore(&bank->lock, flags);
return 0; return 0;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
if (bank->non_wakeup_gpios & (1 << gpio)) { if (bank->non_wakeup_gpios & (1 << gpio)) {
...@@ -1227,7 +1227,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) ...@@ -1227,7 +1227,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
__raw_writel(1 << offset, reg); __raw_writel(1 << offset, reg);
} }
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
if (bank->method == METHOD_GPIO_24XX) { if (bank->method == METHOD_GPIO_24XX) {
/* Disable wake-up during idle for dynamic tick */ /* Disable wake-up during idle for dynamic tick */
...@@ -1286,7 +1286,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -1286,7 +1286,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
if (bank->method == METHOD_GPIO_7XX) if (bank->method == METHOD_GPIO_7XX)
isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS; isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
if (bank->method == METHOD_GPIO_24XX) if (bank->method == METHOD_GPIO_24XX)
isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1; isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
#endif #endif
...@@ -1766,7 +1766,7 @@ static int __init _omap_gpio_init(void) ...@@ -1766,7 +1766,7 @@ static int __init _omap_gpio_init(void)
gpio_bank = gpio_bank_243x; gpio_bank = gpio_bank_243x;
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
if (cpu_is_omap34xx()) { if (cpu_is_omap34xx()) {
gpio_bank_count = OMAP34XX_NR_GPIOS; gpio_bank_count = OMAP34XX_NR_GPIOS;
gpio_bank = gpio_bank_34xx; gpio_bank = gpio_bank_34xx;
...@@ -1809,7 +1809,7 @@ static int __init _omap_gpio_init(void) ...@@ -1809,7 +1809,7 @@ static int __init _omap_gpio_init(void)
gpio_count = 32; /* 7xx has 32-bit GPIOs */ gpio_count = 32; /* 7xx has 32-bit GPIOs */
} }
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
if (bank->method == METHOD_GPIO_24XX) { if (bank->method == METHOD_GPIO_24XX) {
static const u32 non_wakeup_gpios[] = { static const u32 non_wakeup_gpios[] = {
...@@ -1904,7 +1904,7 @@ static int __init _omap_gpio_init(void) ...@@ -1904,7 +1904,7 @@ static int __init _omap_gpio_init(void)
} }
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
{ {
int i; int i;
...@@ -1927,7 +1927,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) ...@@ -1927,7 +1927,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
...@@ -1975,7 +1975,7 @@ static int omap_gpio_resume(struct sys_device *dev) ...@@ -1975,7 +1975,7 @@ static int omap_gpio_resume(struct sys_device *dev)
wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
...@@ -2013,7 +2013,7 @@ static struct sys_device omap_gpio_device = { ...@@ -2013,7 +2013,7 @@ static struct sys_device omap_gpio_device = {
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
static int workaround_enabled; static int workaround_enabled;
...@@ -2030,7 +2030,7 @@ void omap2_gpio_prepare_for_retention(void) ...@@ -2030,7 +2030,7 @@ void omap2_gpio_prepare_for_retention(void)
if (!(bank->enabled_non_wakeup_gpios)) if (!(bank->enabled_non_wakeup_gpios))
continue; continue;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);
l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT);
l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT);
...@@ -2045,7 +2045,7 @@ void omap2_gpio_prepare_for_retention(void) ...@@ -2045,7 +2045,7 @@ void omap2_gpio_prepare_for_retention(void)
bank->saved_risingdetect = l2; bank->saved_risingdetect = l2;
l1 &= ~bank->enabled_non_wakeup_gpios; l1 &= ~bank->enabled_non_wakeup_gpios;
l2 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
__raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT); __raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT);
__raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT); __raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT);
#endif #endif
...@@ -2074,7 +2074,7 @@ void omap2_gpio_resume_after_retention(void) ...@@ -2074,7 +2074,7 @@ void omap2_gpio_resume_after_retention(void)
if (!(bank->enabled_non_wakeup_gpios)) if (!(bank->enabled_non_wakeup_gpios))
continue; continue;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
__raw_writel(bank->saved_fallingdetect, __raw_writel(bank->saved_fallingdetect,
bank->base + OMAP24XX_GPIO_FALLINGDETECT); bank->base + OMAP24XX_GPIO_FALLINGDETECT);
__raw_writel(bank->saved_risingdetect, __raw_writel(bank->saved_risingdetect,
...@@ -2113,7 +2113,7 @@ void omap2_gpio_resume_after_retention(void) ...@@ -2113,7 +2113,7 @@ void omap2_gpio_resume_after_retention(void)
if (gen) { if (gen) {
u32 old0, old1; u32 old0, old1;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0);
old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);
__raw_writel(old0 | gen, bank->base + __raw_writel(old0 | gen, bank->base +
...@@ -2144,7 +2144,7 @@ void omap2_gpio_resume_after_retention(void) ...@@ -2144,7 +2144,7 @@ void omap2_gpio_resume_after_retention(void)
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
/* save the registers of bank 2-6 */ /* save the registers of bank 2-6 */
void omap_gpio_save_context(void) void omap_gpio_save_context(void)
{ {
...@@ -2241,7 +2241,7 @@ static int __init omap_gpio_sysinit(void) ...@@ -2241,7 +2241,7 @@ static int __init omap_gpio_sysinit(void)
mpuio_init(); mpuio_init();
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
if (cpu_is_omap16xx() || cpu_class_is_omap2()) { if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
if (ret == 0) { if (ret == 0) {
ret = sysdev_class_register(&omap_gpio_sysclass); ret = sysdev_class_register(&omap_gpio_sysclass);
...@@ -2301,7 +2301,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) ...@@ -2301,7 +2301,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
irqstat = irq_desc[irq].status; irqstat = irq_desc[irq].status;
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
if (is_in && ((bank->suspend_wakeup & mask) if (is_in && ((bank->suspend_wakeup & mask)
|| irqstat & IRQ_TYPE_SENSE_MASK)) { || irqstat & IRQ_TYPE_SENSE_MASK)) {
char *trigger = NULL; char *trigger = NULL;
......
arch/arm/plat-omap/i2c.c
View file @ a8eb7ca0
...@@ -50,10 +50,10 @@ static const char name[] = "i2c_omap"; ...@@ -50,10 +50,10 @@ static const char name[] = "i2c_omap";
static struct resource i2c_resources[][2] = { static struct resource i2c_resources[][2] = {
{ I2C_RESOURCE_BUILDER(0, 0) }, { I2C_RESOURCE_BUILDER(0, 0) },
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) }, { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },
#endif #endif
#if defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP3)
{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) }, { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) },
#endif #endif
}; };
...@@ -72,10 +72,10 @@ static struct resource i2c_resources[][2] = { ...@@ -72,10 +72,10 @@ static struct resource i2c_resources[][2] = {
static u32 i2c_rate[ARRAY_SIZE(i2c_resources)]; static u32 i2c_rate[ARRAY_SIZE(i2c_resources)];
static struct platform_device omap_i2c_devices[] = { static struct platform_device omap_i2c_devices[] = {
I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]), I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]),
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]), I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]),
#endif #endif
#if defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP3)
I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_rate[2]), I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_rate[2]),
#endif #endif
}; };
......
arch/arm/plat-omap/include/plat/cpu.h
View file @ a8eb7ca0
...@@ -114,7 +114,7 @@ unsigned int omap_rev(void); ...@@ -114,7 +114,7 @@ unsigned int omap_rev(void);
# define OMAP_NAME omap16xx # define OMAP_NAME omap16xx
# endif # endif
#endif #endif
#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)) #if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
# if (defined(OMAP_NAME) || defined(MULTI_OMAP1)) # if (defined(OMAP_NAME) || defined(MULTI_OMAP1))
# error "OMAP1 and OMAP2 can't be selected at the same time" # error "OMAP1 and OMAP2 can't be selected at the same time"
# endif # endif
...@@ -241,7 +241,7 @@ IS_OMAP_SUBCLASS(443x, 0x443) ...@@ -241,7 +241,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
# define cpu_is_omap242x() is_omap242x() # define cpu_is_omap242x() is_omap242x()
# define cpu_is_omap243x() is_omap243x() # define cpu_is_omap243x() is_omap243x()
# endif # endif
# if defined(CONFIG_ARCH_OMAP34XX) # if defined(CONFIG_ARCH_OMAP3)
# undef cpu_is_omap34xx # undef cpu_is_omap34xx
# undef cpu_is_omap343x # undef cpu_is_omap343x
# define cpu_is_omap34xx() is_omap34xx() # define cpu_is_omap34xx() is_omap34xx()
...@@ -260,7 +260,7 @@ IS_OMAP_SUBCLASS(443x, 0x443) ...@@ -260,7 +260,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
# undef cpu_is_omap243x # undef cpu_is_omap243x
# define cpu_is_omap243x() 1 # define cpu_is_omap243x() 1
# endif # endif
# if defined(CONFIG_ARCH_OMAP34XX) # if defined(CONFIG_ARCH_OMAP3)
# undef cpu_is_omap34xx # undef cpu_is_omap34xx
# define cpu_is_omap34xx() 1 # define cpu_is_omap34xx() 1
# endif # endif
...@@ -385,7 +385,7 @@ IS_OMAP_TYPE(3517, 0x3517) ...@@ -385,7 +385,7 @@ IS_OMAP_TYPE(3517, 0x3517)
# define cpu_is_omap2430() is_omap2430() # define cpu_is_omap2430() is_omap2430()
#endif #endif
#if defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP3)
# undef cpu_is_omap3430 # undef cpu_is_omap3430
# undef cpu_is_omap3503 # undef cpu_is_omap3503
# undef cpu_is_omap3515 # undef cpu_is_omap3515
......
arch/arm/plat-omap/include/plat/io.h
View file @ a8eb7ca0
...@@ -284,7 +284,7 @@ static inline void omap243x_map_common_io(void) ...@@ -284,7 +284,7 @@ static inline void omap243x_map_common_io(void)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
extern void omap34xx_map_common_io(void); extern void omap34xx_map_common_io(void);
#else #else
static inline void omap34xx_map_common_io(void) static inline void omap34xx_map_common_io(void)
......
arch/arm/plat-omap/include/plat/mcbsp.h
View file @ a8eb7ca0
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX #define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX
#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX #define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX
#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ #elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
defined(CONFIG_ARCH_OMAP4) defined(CONFIG_ARCH_OMAP4)
#define OMAP_MCBSP_REG_DRR2 0x00 #define OMAP_MCBSP_REG_DRR2 0x00
...@@ -374,7 +374,7 @@ struct omap_mcbsp_platform_data { ...@@ -374,7 +374,7 @@ struct omap_mcbsp_platform_data {
u8 dma_rx_sync, dma_tx_sync; u8 dma_rx_sync, dma_tx_sync;
u16 rx_irq, tx_irq; u16 rx_irq, tx_irq;
struct omap_mcbsp_ops *ops; struct omap_mcbsp_ops *ops;
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
u16 buffer_size; u16 buffer_size;
#endif #endif
}; };
...@@ -410,7 +410,7 @@ struct omap_mcbsp { ...@@ -410,7 +410,7 @@ struct omap_mcbsp {
struct omap_mcbsp_platform_data *pdata; struct omap_mcbsp_platform_data *pdata;
struct clk *iclk; struct clk *iclk;
struct clk *fclk; struct clk *fclk;
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
int dma_op_mode; int dma_op_mode;
u16 max_tx_thres; u16 max_tx_thres;
u16 max_rx_thres; u16 max_rx_thres;
...@@ -423,7 +423,7 @@ int omap_mcbsp_init(void); ...@@ -423,7 +423,7 @@ int omap_mcbsp_init(void);
void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
int size); int size);
void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold); void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);
void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold); void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold);
u16 omap_mcbsp_get_max_tx_threshold(unsigned int id); u16 omap_mcbsp_get_max_tx_threshold(unsigned int id);
......
arch/arm/plat-omap/include/plat/omap34xx.h
View file @ a8eb7ca0
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_ARCH_OMAP34XX_H #ifndef __ASM_ARCH_OMAP3_H
#define __ASM_ARCH_OMAP34XX_H #define __ASM_ARCH_OMAP3_H
/* /*
* Please place only base defines here and put the rest in device * Please place only base defines here and put the rest in device
...@@ -82,5 +82,5 @@ ...@@ -82,5 +82,5 @@
#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
#endif /* __ASM_ARCH_OMAP34XX_H */ #endif /* __ASM_ARCH_OMAP3_H */
arch/arm/plat-omap/mcbsp.c
View file @ a8eb7ca0
...@@ -198,7 +198,7 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) ...@@ -198,7 +198,7 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
} }
EXPORT_SYMBOL(omap_mcbsp_config); EXPORT_SYMBOL(omap_mcbsp_config);
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
/* /*
* omap_mcbsp_set_tx_threshold configures how to deal * omap_mcbsp_set_tx_threshold configures how to deal
* with transmit threshold. the threshold value and handler can be * with transmit threshold. the threshold value and handler can be
...@@ -1107,7 +1107,7 @@ void omap_mcbsp_set_spi_mode(unsigned int id, ...@@ -1107,7 +1107,7 @@ void omap_mcbsp_set_spi_mode(unsigned int id,
} }
EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
#define max_thres(m) (mcbsp->pdata->buffer_size) #define max_thres(m) (mcbsp->pdata->buffer_size)
#define valid_threshold(m, val) ((val) <= max_thres(m)) #define valid_threshold(m, val) ((val) <= max_thres(m))
#define THRESHOLD_PROP_BUILDER(prop) \ #define THRESHOLD_PROP_BUILDER(prop) \
...@@ -1246,7 +1246,7 @@ static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) ...@@ -1246,7 +1246,7 @@ static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp)
#else #else
static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {} static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {}
static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {} static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {}
#endif /* CONFIG_ARCH_OMAP34XX */ #endif /* CONFIG_ARCH_OMAP3 */
/* /*
* McBSP1 and McBSP3 are directly mapped on 1610 and 1510. * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.
......
arch/arm/plat-omap/sram.c
View file @ a8eb7ca0
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000) #define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000)
#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000) #define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000)
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
#define SRAM_BOOTLOADER_SZ 0x00 #define SRAM_BOOTLOADER_SZ 0x00
#else #else
#define SRAM_BOOTLOADER_SZ 0x80 #define SRAM_BOOTLOADER_SZ 0x80
......
drivers/net/smc911x.h
View file @ a8eb7ca0
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define SMC_USE_16BIT 0 #define SMC_USE_16BIT 0
#define SMC_USE_32BIT 1 #define SMC_USE_32BIT 1
#define SMC_IRQ_SENSE IRQF_TRIGGER_LOW #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
#elif defined(CONFIG_ARCH_OMAP34XX) #elif defined(CONFIG_ARCH_OMAP3)
#define SMC_USE_16BIT 0 #define SMC_USE_16BIT 0
#define SMC_USE_32BIT 1 #define SMC_USE_32BIT 1
#define SMC_IRQ_SENSE IRQF_TRIGGER_LOW #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
......
drivers/spi/Kconfig
View file @ a8eb7ca0
...@@ -164,7 +164,7 @@ config SPI_OMAP_UWIRE ...@@ -164,7 +164,7 @@ config SPI_OMAP_UWIRE
config SPI_OMAP24XX config SPI_OMAP24XX
tristate "McSPI driver for OMAP24xx/OMAP34xx" tristate "McSPI driver for OMAP24xx/OMAP34xx"
depends on ARCH_OMAP2 || ARCH_OMAP34XX depends on ARCH_OMAP2 || ARCH_OMAP3
help help
SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
(McSPI) modules. (McSPI) modules.
......
drivers/spi/omap2_mcspi.c
View file @ a8eb7ca0
...@@ -1014,7 +1014,7 @@ static u8 __initdata spi2_txdma_id[] = { ...@@ -1014,7 +1014,7 @@ static u8 __initdata spi2_txdma_id[] = {
OMAP24XX_DMA_SPI2_TX1, OMAP24XX_DMA_SPI2_TX1,
}; };
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
|| defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP4)
static u8 __initdata spi3_rxdma_id[] = { static u8 __initdata spi3_rxdma_id[] = {
OMAP24XX_DMA_SPI3_RX0, OMAP24XX_DMA_SPI3_RX0,
......
drivers/usb/Kconfig
View file @ a8eb7ca0
...@@ -61,7 +61,7 @@ config USB_ARCH_HAS_EHCI ...@@ -61,7 +61,7 @@ config USB_ARCH_HAS_EHCI
default y if ARCH_W90X900 default y if ARCH_W90X900
default y if ARCH_AT91SAM9G45 default y if ARCH_AT91SAM9G45
default y if ARCH_MXC default y if ARCH_MXC
default y if ARCH_OMAP34XX default y if ARCH_OMAP3
default PCI default PCI
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
......
drivers/usb/host/ehci-hcd.c
View file @ a8eb7ca0
...@@ -1118,7 +1118,7 @@ MODULE_LICENSE ("GPL"); ...@@ -1118,7 +1118,7 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
#endif #endif
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP3
#include "ehci-omap.c" #include "ehci-omap.c"
#define PLATFORM_DRIVER ehci_hcd_omap_driver #define PLATFORM_DRIVER ehci_hcd_omap_driver
#endif #endif
......
drivers/usb/musb/Kconfig
View file @ a8eb7ca0
...@@ -37,7 +37,7 @@ config USB_MUSB_SOC ...@@ -37,7 +37,7 @@ config USB_MUSB_SOC
depends on USB_MUSB_HDRC depends on USB_MUSB_HDRC
default y if ARCH_DAVINCI default y if ARCH_DAVINCI
default y if ARCH_OMAP2430 default y if ARCH_OMAP2430
default y if ARCH_OMAP34XX default y if ARCH_OMAP3
default y if (BF54x && !BF544) default y if (BF54x && !BF544)
default y if (BF52x && !BF522 && !BF523) default y if (BF52x && !BF522 && !BF523)
...@@ -48,7 +48,7 @@ comment "OMAP 243x high speed USB support" ...@@ -48,7 +48,7 @@ comment "OMAP 243x high speed USB support"
depends on USB_MUSB_HDRC && ARCH_OMAP2430 depends on USB_MUSB_HDRC && ARCH_OMAP2430
comment "OMAP 343x high speed USB support" comment "OMAP 343x high speed USB support"
depends on USB_MUSB_HDRC && ARCH_OMAP34XX depends on USB_MUSB_HDRC && ARCH_OMAP3
comment "Blackfin high speed USB Support" comment "Blackfin high speed USB Support"
depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523)) depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
...@@ -153,7 +153,7 @@ config MUSB_PIO_ONLY ...@@ -153,7 +153,7 @@ config MUSB_PIO_ONLY
config USB_INVENTRA_DMA config USB_INVENTRA_DMA
bool bool
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN
help help
Enable DMA transfers using Mentor's engine. Enable DMA transfers using Mentor's engine.
......
drivers/usb/musb/musb_core.c
View file @ a8eb7ca0
...@@ -1000,7 +1000,7 @@ static void musb_shutdown(struct platform_device *pdev) ...@@ -1000,7 +1000,7 @@ static void musb_shutdown(struct platform_device *pdev)
* more than selecting one of a bunch of predefined configurations. * more than selecting one of a bunch of predefined configurations.
*/ */
#if defined(CONFIG_USB_TUSB6010) || \ #if defined(CONFIG_USB_TUSB6010) || \
defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
static ushort __initdata fifo_mode = 4; static ushort __initdata fifo_mode = 4;
#else #else
static ushort __initdata fifo_mode = 2; static ushort __initdata fifo_mode = 2;
......
drivers/usb/musb/musb_core.h
View file @ a8eb7ca0
...@@ -562,7 +562,7 @@ extern void musb_hnp_stop(struct musb *musb); ...@@ -562,7 +562,7 @@ extern void musb_hnp_stop(struct musb *musb);
extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode); extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode);
#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \ #if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \
defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout);
#else #else
#define musb_platform_try_idle(x, y) do {} while (0) #define musb_platform_try_idle(x, y) do {} while (0)
......
drivers/w1/masters/Kconfig
View file @ a8eb7ca0
...@@ -60,7 +60,7 @@ config W1_MASTER_GPIO ...@@ -60,7 +60,7 @@ config W1_MASTER_GPIO
config HDQ_MASTER_OMAP config HDQ_MASTER_OMAP
tristate "OMAP HDQ driver" tristate "OMAP HDQ driver"
depends on ARCH_OMAP2430 || ARCH_OMAP34XX depends on ARCH_OMAP2430 || ARCH_OMAP3
help help
Say Y here if you want support for the 1-wire or HDQ Interface Say Y here if you want support for the 1-wire or HDQ Interface
on an OMAP processor. on an OMAP processor.
......
drivers/watchdog/Kconfig
View file @ a8eb7ca0
...@@ -194,7 +194,7 @@ config EP93XX_WATCHDOG ...@@ -194,7 +194,7 @@ config EP93XX_WATCHDOG
config OMAP_WATCHDOG config OMAP_WATCHDOG
tristate "OMAP Watchdog" tristate "OMAP Watchdog"
depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3
help help
Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y' Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y'
here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer. here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.
......
sound/soc/omap/omap-mcbsp.c
View file @ a8eb7ca0
...@@ -82,11 +82,11 @@ static const int omap1_dma_reqs[][2] = {}; ...@@ -82,11 +82,11 @@ static const int omap1_dma_reqs[][2] = {};
static const unsigned long omap1_mcbsp_port[][2] = {}; static const unsigned long omap1_mcbsp_port[][2] = {};
#endif #endif
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
static const int omap24xx_dma_reqs[][2] = { static const int omap24xx_dma_reqs[][2] = {
{ OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
{ OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
{ OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
{ OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
{ OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
...@@ -124,7 +124,7 @@ static const unsigned long omap2430_mcbsp_port[][2] = { ...@@ -124,7 +124,7 @@ static const unsigned long omap2430_mcbsp_port[][2] = {
static const unsigned long omap2430_mcbsp_port[][2] = {}; static const unsigned long omap2430_mcbsp_port[][2] = {};
#endif #endif
#if defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP3)
static const unsigned long omap34xx_mcbsp_port[][2] = { static const unsigned long omap34xx_mcbsp_port[][2] = {
{ OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
......
sound/soc/omap/omap-mcbsp.h
View file @ a8eb7ca0
...@@ -50,7 +50,7 @@ enum omap_mcbsp_div { ...@@ -50,7 +50,7 @@ enum omap_mcbsp_div {
#undef NUM_LINKS #undef NUM_LINKS
#define NUM_LINKS 3 #define NUM_LINKS 3
#endif #endif
#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
#undef NUM_LINKS #undef NUM_LINKS
#define NUM_LINKS 5 #define NUM_LINKS 5
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7