Commit 15ac408e authored by Kalle Valo's avatar Kalle Valo Committed by Tony Lindgren

OMAP: UART: drop OMAP_TAG_UART, enable all UARTs, auto-disabled on idle

OMAP tags are deprecrated so drop them.

Drop UART config data which decides which UARTs to enable during boot.
This is no longer necessary since serial core code disables clocks
after inactivity.

Background: with new UART idle code, all on-chip UARTs are idled using
a configurable inactivity timer (default 5 seconds.)  After the
inactivity timer, UART clocks are disabled automatically.
Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 987cadcf
...@@ -162,10 +162,6 @@ static struct omap_lcd_config ams_delta_lcd_config __initdata = { ...@@ -162,10 +162,6 @@ static struct omap_lcd_config ams_delta_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_uart_config ams_delta_uart_config __initdata = {
.enabled_uarts = 1,
};
static struct omap_usb_config ams_delta_usb_config __initdata = { static struct omap_usb_config ams_delta_usb_config __initdata = {
.register_host = 1, .register_host = 1,
.hmc_mode = 16, .hmc_mode = 16,
...@@ -174,7 +170,6 @@ static struct omap_usb_config ams_delta_usb_config __initdata = { ...@@ -174,7 +170,6 @@ static struct omap_usb_config ams_delta_usb_config __initdata = {
static struct omap_board_config_kernel ams_delta_config[] = { static struct omap_board_config_kernel ams_delta_config[] = {
{ OMAP_TAG_LCD, &ams_delta_lcd_config }, { OMAP_TAG_LCD, &ams_delta_lcd_config },
{ OMAP_TAG_UART, &ams_delta_uart_config },
}; };
static struct resource ams_delta_kp_resources[] = { static struct resource ams_delta_kp_resources[] = {
......
...@@ -240,16 +240,11 @@ static int nand_dev_ready(struct omap_nand_platform_data *data) ...@@ -240,16 +240,11 @@ static int nand_dev_ready(struct omap_nand_platform_data *data)
return gpio_get_value(P2_NAND_RB_GPIO_PIN); return gpio_get_value(P2_NAND_RB_GPIO_PIN);
} }
static struct omap_uart_config fsample_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1)),
};
static struct omap_lcd_config fsample_lcd_config __initdata = { static struct omap_lcd_config fsample_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_board_config_kernel fsample_config[] = { static struct omap_board_config_kernel fsample_config[] = {
{ OMAP_TAG_UART, &fsample_uart_config },
{ OMAP_TAG_LCD, &fsample_lcd_config }, { OMAP_TAG_LCD, &fsample_lcd_config },
}; };
......
...@@ -57,12 +57,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = { ...@@ -57,12 +57,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
}; };
#endif #endif
static struct omap_uart_config generic_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel generic_config[] __initdata = { static struct omap_board_config_kernel generic_config[] __initdata = {
{ OMAP_TAG_UART, &generic_uart_config },
}; };
static void __init omap_generic_init(void) static void __init omap_generic_init(void)
......
...@@ -360,16 +360,11 @@ static struct omap_usb_config h2_usb_config __initdata = { ...@@ -360,16 +360,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
.pins[1] = 3, .pins[1] = 3,
}; };
static struct omap_uart_config h2_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_lcd_config h2_lcd_config __initdata = { static struct omap_lcd_config h2_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_board_config_kernel h2_config[] __initdata = { static struct omap_board_config_kernel h2_config[] __initdata = {
{ OMAP_TAG_UART, &h2_uart_config },
{ OMAP_TAG_LCD, &h2_lcd_config }, { OMAP_TAG_LCD, &h2_lcd_config },
}; };
......
...@@ -313,16 +313,11 @@ static struct omap_usb_config h3_usb_config __initdata = { ...@@ -313,16 +313,11 @@ static struct omap_usb_config h3_usb_config __initdata = {
.pins[1] = 3, .pins[1] = 3,
}; };
static struct omap_uart_config h3_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_lcd_config h3_lcd_config __initdata = { static struct omap_lcd_config h3_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_board_config_kernel h3_config[] __initdata = { static struct omap_board_config_kernel h3_config[] __initdata = {
{ OMAP_TAG_UART, &h3_uart_config },
{ OMAP_TAG_LCD, &h3_lcd_config }, { OMAP_TAG_LCD, &h3_lcd_config },
}; };
......
...@@ -368,13 +368,8 @@ static inline void innovator_mmc_init(void) ...@@ -368,13 +368,8 @@ static inline void innovator_mmc_init(void)
} }
#endif #endif
static struct omap_uart_config innovator_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel innovator_config[] = { static struct omap_board_config_kernel innovator_config[] = {
{ OMAP_TAG_LCD, NULL }, { OMAP_TAG_LCD, NULL },
{ OMAP_TAG_UART, &innovator_uart_config },
}; };
static void __init innovator_init(void) static void __init innovator_init(void)
......
...@@ -293,10 +293,6 @@ static struct omap_usb_config osk_usb_config __initdata = { ...@@ -293,10 +293,6 @@ static struct omap_usb_config osk_usb_config __initdata = {
.pins[0] = 2, .pins[0] = 2,
}; };
static struct omap_uart_config osk_uart_config __initdata = {
.enabled_uarts = (1 << 0),
};
#ifdef CONFIG_OMAP_OSK_MISTRAL #ifdef CONFIG_OMAP_OSK_MISTRAL
static struct omap_lcd_config osk_lcd_config __initdata = { static struct omap_lcd_config osk_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
...@@ -304,7 +300,6 @@ static struct omap_lcd_config osk_lcd_config __initdata = { ...@@ -304,7 +300,6 @@ static struct omap_lcd_config osk_lcd_config __initdata = {
#endif #endif
static struct omap_board_config_kernel osk_config[] __initdata = { static struct omap_board_config_kernel osk_config[] __initdata = {
{ OMAP_TAG_UART, &osk_uart_config },
#ifdef CONFIG_OMAP_OSK_MISTRAL #ifdef CONFIG_OMAP_OSK_MISTRAL
{ OMAP_TAG_LCD, &osk_lcd_config }, { OMAP_TAG_LCD, &osk_lcd_config },
#endif #endif
......
...@@ -212,10 +212,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = { ...@@ -212,10 +212,6 @@ static struct omap_lcd_config palmte_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_uart_config palmte_uart_config __initdata = {
.enabled_uarts = (1 << 0) | (1 << 1) | (0 << 2),
};
#ifdef CONFIG_APM #ifdef CONFIG_APM
/* /*
* Values measured in 10 minute intervals averaged over 10 samples. * Values measured in 10 minute intervals averaged over 10 samples.
...@@ -302,7 +298,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) ...@@ -302,7 +298,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery)
static struct omap_board_config_kernel palmte_config[] __initdata = { static struct omap_board_config_kernel palmte_config[] __initdata = {
{ OMAP_TAG_LCD, &palmte_lcd_config }, { OMAP_TAG_LCD, &palmte_lcd_config },
{ OMAP_TAG_UART, &palmte_uart_config },
}; };
static struct spi_board_info palmte_spi_info[] __initdata = { static struct spi_board_info palmte_spi_info[] __initdata = {
......
...@@ -274,13 +274,8 @@ static struct omap_lcd_config palmtt_lcd_config __initdata = { ...@@ -274,13 +274,8 @@ static struct omap_lcd_config palmtt_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_uart_config palmtt_uart_config __initdata = {
.enabled_uarts = (1 << 0) | (1 << 1) | (0 << 2),
};
static struct omap_board_config_kernel palmtt_config[] __initdata = { static struct omap_board_config_kernel palmtt_config[] __initdata = {
{ OMAP_TAG_LCD, &palmtt_lcd_config }, { OMAP_TAG_LCD, &palmtt_lcd_config },
{ OMAP_TAG_UART, &palmtt_uart_config },
}; };
static void __init omap_mpu_wdt_mode(int mode) { static void __init omap_mpu_wdt_mode(int mode) {
......
...@@ -244,13 +244,8 @@ static struct omap_lcd_config palmz71_lcd_config __initdata = { ...@@ -244,13 +244,8 @@ static struct omap_lcd_config palmz71_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_uart_config palmz71_uart_config __initdata = {
.enabled_uarts = (1 << 0) | (1 << 1) | (0 << 2),
};
static struct omap_board_config_kernel palmz71_config[] __initdata = { static struct omap_board_config_kernel palmz71_config[] __initdata = {
{OMAP_TAG_LCD, &palmz71_lcd_config}, {OMAP_TAG_LCD, &palmz71_lcd_config},
{OMAP_TAG_UART, &palmz71_uart_config},
}; };
static irqreturn_t static irqreturn_t
......
...@@ -208,16 +208,11 @@ static int nand_dev_ready(struct omap_nand_platform_data *data) ...@@ -208,16 +208,11 @@ static int nand_dev_ready(struct omap_nand_platform_data *data)
return gpio_get_value(P2_NAND_RB_GPIO_PIN); return gpio_get_value(P2_NAND_RB_GPIO_PIN);
} }
static struct omap_uart_config perseus2_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1)),
};
static struct omap_lcd_config perseus2_lcd_config __initdata = { static struct omap_lcd_config perseus2_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_board_config_kernel perseus2_config[] __initdata = { static struct omap_board_config_kernel perseus2_config[] __initdata = {
{ OMAP_TAG_UART, &perseus2_uart_config },
{ OMAP_TAG_LCD, &perseus2_lcd_config }, { OMAP_TAG_LCD, &perseus2_lcd_config },
}; };
......
...@@ -369,13 +369,8 @@ static struct platform_device *sx1_devices[] __initdata = { ...@@ -369,13 +369,8 @@ static struct platform_device *sx1_devices[] __initdata = {
}; };
/*-----------------------------------------*/ /*-----------------------------------------*/
static struct omap_uart_config sx1_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel sx1_config[] __initdata = { static struct omap_board_config_kernel sx1_config[] __initdata = {
{ OMAP_TAG_LCD, &sx1_lcd_config }, { OMAP_TAG_LCD, &sx1_lcd_config },
{ OMAP_TAG_UART, &sx1_uart_config },
}; };
/*-----------------------------------------*/ /*-----------------------------------------*/
......
...@@ -140,12 +140,7 @@ static struct omap_usb_config voiceblue_usb_config __initdata = { ...@@ -140,12 +140,7 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
.pins[2] = 6, .pins[2] = 6,
}; };
static struct omap_uart_config voiceblue_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel voiceblue_config[] = { static struct omap_board_config_kernel voiceblue_config[] = {
{ OMAP_TAG_UART, &voiceblue_uart_config },
}; };
static void __init voiceblue_init_irq(void) static void __init voiceblue_init_irq(void)
......
...@@ -109,7 +109,6 @@ static struct platform_device serial_device = { ...@@ -109,7 +109,6 @@ static struct platform_device serial_device = {
void __init omap_serial_init(void) void __init omap_serial_init(void)
{ {
int i; int i;
const struct omap_uart_config *info;
if (cpu_is_omap730()) { if (cpu_is_omap730()) {
serial_platform_data[0].regshift = 0; serial_platform_data[0].regshift = 0;
...@@ -131,19 +130,9 @@ void __init omap_serial_init(void) ...@@ -131,19 +130,9 @@ void __init omap_serial_init(void)
serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16; serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
} }
info = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
if (info == NULL)
return;
for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
unsigned char reg; unsigned char reg;
if (!((1 << i) & info->enabled_uarts)) {
serial_platform_data[i].membase = NULL;
serial_platform_data[i].mapbase = 0;
continue;
}
switch (i) { switch (i) {
case 0: case 0:
uart1_ck = clk_get(NULL, "uart1_ck"); uart1_ck = clk_get(NULL, "uart1_ck");
......
...@@ -146,12 +146,7 @@ static void __init omap_2430sdp_init_irq(void) ...@@ -146,12 +146,7 @@ static void __init omap_2430sdp_init_irq(void)
omap_gpio_init(); omap_gpio_init();
} }
static struct omap_uart_config sdp2430_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel sdp2430_config[] = { static struct omap_board_config_kernel sdp2430_config[] = {
{OMAP_TAG_UART, &sdp2430_uart_config},
{OMAP_TAG_LCD, &sdp2430_lcd_config}, {OMAP_TAG_LCD, &sdp2430_lcd_config},
}; };
......
...@@ -174,16 +174,11 @@ static void __init omap_3430sdp_init_irq(void) ...@@ -174,16 +174,11 @@ static void __init omap_3430sdp_init_irq(void)
omap_gpio_init(); omap_gpio_init();
} }
static struct omap_uart_config sdp3430_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_lcd_config sdp3430_lcd_config __initdata = { static struct omap_lcd_config sdp3430_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
static struct omap_board_config_kernel sdp3430_config[] __initdata = { static struct omap_board_config_kernel sdp3430_config[] __initdata = {
{ OMAP_TAG_UART, &sdp3430_uart_config },
{ OMAP_TAG_LCD, &sdp3430_lcd_config }, { OMAP_TAG_LCD, &sdp3430_lcd_config },
}; };
......
...@@ -47,7 +47,6 @@ static struct omap_lcd_config sdp4430_lcd_config __initdata = { ...@@ -47,7 +47,6 @@ static struct omap_lcd_config sdp4430_lcd_config __initdata = {
}; };
static struct omap_board_config_kernel sdp4430_config[] __initdata = { static struct omap_board_config_kernel sdp4430_config[] __initdata = {
{ OMAP_TAG_UART, &sdp4430_uart_config },
{ OMAP_TAG_LCD, &sdp4430_lcd_config }, { OMAP_TAG_LCD, &sdp4430_lcd_config },
}; };
......
...@@ -256,10 +256,6 @@ static void __init omap_apollon_init_irq(void) ...@@ -256,10 +256,6 @@ static void __init omap_apollon_init_irq(void)
apollon_init_smc91x(); apollon_init_smc91x();
} }
static struct omap_uart_config apollon_uart_config __initdata = {
.enabled_uarts = (1 << 0) | (0 << 1) | (0 << 2),
};
static struct omap_usb_config apollon_usb_config __initdata = { static struct omap_usb_config apollon_usb_config __initdata = {
.register_dev = 1, .register_dev = 1,
.hmc_mode = 0x14, /* 0:dev 1:host1 2:disable */ .hmc_mode = 0x14, /* 0:dev 1:host1 2:disable */
...@@ -272,7 +268,6 @@ static struct omap_lcd_config apollon_lcd_config __initdata = { ...@@ -272,7 +268,6 @@ static struct omap_lcd_config apollon_lcd_config __initdata = {
}; };
static struct omap_board_config_kernel apollon_config[] = { static struct omap_board_config_kernel apollon_config[] = {
{ OMAP_TAG_UART, &apollon_uart_config },
{ OMAP_TAG_LCD, &apollon_lcd_config }, { OMAP_TAG_LCD, &apollon_lcd_config },
}; };
......
...@@ -37,12 +37,7 @@ static void __init omap_generic_init_irq(void) ...@@ -37,12 +37,7 @@ static void __init omap_generic_init_irq(void)
omap_init_irq(); omap_init_irq();
} }
static struct omap_uart_config generic_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel generic_config[] = { static struct omap_board_config_kernel generic_config[] = {
{ OMAP_TAG_UART, &generic_uart_config },
}; };
static void __init omap_generic_init(void) static void __init omap_generic_init(void)
......
...@@ -276,10 +276,6 @@ static void __init omap_h4_init_irq(void) ...@@ -276,10 +276,6 @@ static void __init omap_h4_init_irq(void)
h4_init_flash(); h4_init_flash();
} }
static struct omap_uart_config h4_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_lcd_config h4_lcd_config __initdata = { static struct omap_lcd_config h4_lcd_config __initdata = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
...@@ -318,7 +314,6 @@ static struct omap_usb_config h4_usb_config __initdata = { ...@@ -318,7 +314,6 @@ static struct omap_usb_config h4_usb_config __initdata = {
}; };
static struct omap_board_config_kernel h4_config[] = { static struct omap_board_config_kernel h4_config[] = {
{ OMAP_TAG_UART, &h4_uart_config },
{ OMAP_TAG_LCD, &h4_lcd_config }, { OMAP_TAG_LCD, &h4_lcd_config },
}; };
......
...@@ -276,10 +276,6 @@ static void __init omap_ldp_init_irq(void) ...@@ -276,10 +276,6 @@ static void __init omap_ldp_init_irq(void)
ldp_init_smsc911x(); ldp_init_smsc911x();
} }
static struct omap_uart_config ldp_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct platform_device ldp_lcd_device = { static struct platform_device ldp_lcd_device = {
.name = "ldp_lcd", .name = "ldp_lcd",
.id = -1, .id = -1,
...@@ -290,7 +286,6 @@ static struct omap_lcd_config ldp_lcd_config __initdata = { ...@@ -290,7 +286,6 @@ static struct omap_lcd_config ldp_lcd_config __initdata = {
}; };
static struct omap_board_config_kernel ldp_config[] __initdata = { static struct omap_board_config_kernel ldp_config[] __initdata = {
{ OMAP_TAG_UART, &ldp_uart_config },
{ OMAP_TAG_LCD, &ldp_lcd_config }, { OMAP_TAG_LCD, &ldp_lcd_config },
}; };
......
...@@ -108,10 +108,6 @@ static struct platform_device omap3beagle_nand_device = { ...@@ -108,10 +108,6 @@ static struct platform_device omap3beagle_nand_device = {
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
static struct omap_uart_config omap3_beagle_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct twl4030_hsmmc_info mmc[] = { static struct twl4030_hsmmc_info mmc[] = {
{ {
.mmc = 1, .mmc = 1,
...@@ -345,7 +341,6 @@ static struct platform_device keys_gpio = { ...@@ -345,7 +341,6 @@ static struct platform_device keys_gpio = {
}; };
static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
{ OMAP_TAG_UART, &omap3_beagle_uart_config },
{ OMAP_TAG_LCD, &omap3_beagle_lcd_config }, { OMAP_TAG_LCD, &omap3_beagle_lcd_config },
}; };
......
...@@ -92,10 +92,6 @@ static inline void __init omap3evm_init_smc911x(void) ...@@ -92,10 +92,6 @@ static inline void __init omap3evm_init_smc911x(void)
gpio_direction_input(OMAP3EVM_ETHR_GPIO_IRQ); gpio_direction_input(OMAP3EVM_ETHR_GPIO_IRQ);
} }
static struct omap_uart_config omap3_evm_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct twl4030_hsmmc_info mmc[] = { static struct twl4030_hsmmc_info mmc[] = {
{ {
.mmc = 1, .mmc = 1,
...@@ -287,7 +283,6 @@ static void __init omap3_evm_init_irq(void) ...@@ -287,7 +283,6 @@ static void __init omap3_evm_init_irq(void)
} }
static struct omap_board_config_kernel omap3_evm_config[] __initdata = { static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
{ OMAP_TAG_UART, &omap3_evm_uart_config },
{ OMAP_TAG_LCD, &omap3_evm_lcd_config }, { OMAP_TAG_LCD, &omap3_evm_lcd_config },
}; };
......
...@@ -213,10 +213,6 @@ static struct twl4030_hsmmc_info omap3pandora_mmc[] = { ...@@ -213,10 +213,6 @@ static struct twl4030_hsmmc_info omap3pandora_mmc[] = {
{} /* Terminator */ {} /* Terminator */
}; };
static struct omap_uart_config omap3pandora_uart_config __initdata = {
.enabled_uarts = (1 << 2), /* UART3 */
};
static struct regulator_consumer_supply pandora_vmmc1_supply = { static struct regulator_consumer_supply pandora_vmmc1_supply = {
.supply = "vmmc", .supply = "vmmc",
}; };
...@@ -376,7 +372,6 @@ static struct omap_lcd_config omap3pandora_lcd_config __initdata = { ...@@ -376,7 +372,6 @@ static struct omap_lcd_config omap3pandora_lcd_config __initdata = {
}; };
static struct omap_board_config_kernel omap3pandora_config[] __initdata = { static struct omap_board_config_kernel omap3pandora_config[] __initdata = {
{ OMAP_TAG_UART, &omap3pandora_uart_config },
{ OMAP_TAG_LCD, &omap3pandora_lcd_config }, { OMAP_TAG_LCD, &omap3pandora_lcd_config },
}; };
......
...@@ -271,9 +271,6 @@ static void __init overo_flash_init(void) ...@@ -271,9 +271,6 @@ static void __init overo_flash_init(void)
printk(KERN_ERR "Unable to register NAND device\n"); printk(KERN_ERR "Unable to register NAND device\n");
} }
} }
static struct omap_uart_config overo_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct twl4030_hsmmc_info mmc[] = { static struct twl4030_hsmmc_info mmc[] = {
{ {
...@@ -378,7 +375,6 @@ static struct omap_lcd_config overo_lcd_config __initdata = { ...@@ -378,7 +375,6 @@ static struct omap_lcd_config overo_lcd_config __initdata = {
}; };
static struct omap_board_config_kernel overo_config[] __initdata = { static struct omap_board_config_kernel overo_config[] __initdata = {
{ OMAP_TAG_UART, &overo_uart_config },
{ OMAP_TAG_LCD, &overo_lcd_config }, { OMAP_TAG_LCD, &overo_lcd_config },
}; };
......
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
#include <mach/gpmc.h> #include <mach/gpmc.h>
#include <mach/usb.h> #include <mach/usb.h>
static struct omap_uart_config rx51_uart_config = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_lcd_config rx51_lcd_config = { static struct omap_lcd_config rx51_lcd_config = {
.ctrl_name = "internal", .ctrl_name = "internal",
}; };
...@@ -52,7 +48,6 @@ static struct omap_fbmem_config rx51_fbmem2_config = { ...@@ -52,7 +48,6 @@ static struct omap_fbmem_config rx51_fbmem2_config = {
}; };
static struct omap_board_config_kernel rx51_config[] = { static struct omap_board_config_kernel rx51_config[] = {
{ OMAP_TAG_UART, &rx51_uart_config },
{ OMAP_TAG_FBMEM, &rx51_fbmem0_config }, { OMAP_TAG_FBMEM, &rx51_fbmem0_config },
{ OMAP_TAG_FBMEM, &rx51_fbmem1_config }, { OMAP_TAG_FBMEM, &rx51_fbmem1_config },
{ OMAP_TAG_FBMEM, &rx51_fbmem2_config }, { OMAP_TAG_FBMEM, &rx51_fbmem2_config },
......
...@@ -30,12 +30,7 @@ static void __init omap_zoom2_init_irq(void) ...@@ -30,12 +30,7 @@ static void __init omap_zoom2_init_irq(void)
omap_gpio_init(); omap_gpio_init();
} }
static struct omap_uart_config zoom2_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
static struct omap_board_config_kernel zoom2_config[] __initdata = { static struct omap_board_config_kernel zoom2_config[] __initdata = {
{ OMAP_TAG_UART, &zoom2_uart_config },
}; };
static struct twl4030_gpio_platform_data zoom2_gpio_data = { static struct twl4030_gpio_platform_data zoom2_gpio_data = {
......
...@@ -555,7 +555,6 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = { ...@@ -555,7 +555,6 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
void __init omap_serial_init(void) void __init omap_serial_init(void)
{ {
int i; int i;
const struct omap_uart_config *info;
char name[16]; char name[16];
/* /*
...@@ -564,23 +563,12 @@ void __init omap_serial_init(void) ...@@ -564,23 +563,12 @@ void __init omap_serial_init(void)
* if not needed. * if not needed.
*/ */
info = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
if (info == NULL)
return;
for (i = 0; i < OMAP_MAX_NR_PORTS; i++) { for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
struct omap_uart_state *uart = &omap_uart[i]; struct omap_uart_state *uart = &omap_uart[i];
struct platform_device *pdev = &uart->pdev; struct platform_device *pdev = &uart->pdev;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct plat_serial8250_port *p = dev->platform_data; struct plat_serial8250_port *p = dev->platform_data;
if (!(info->enabled_uarts & (1 << i))) {
p->membase = NULL;
p->mapbase = 0;
continue;
}
sprintf(name, "uart%d_ick", i+1); sprintf(name, "uart%d_ick", i+1);
uart->ick = clk_get(NULL, name); uart->ick = clk_get(NULL, name);
if (IS_ERR(uart->ick)) { if (IS_ERR(uart->ick)) {
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define OMAP_TAG_CLOCK 0x4f01 #define OMAP_TAG_CLOCK 0x4f01
#define OMAP_TAG_LCD 0x4f05 #define OMAP_TAG_LCD 0x4f05
#define OMAP_TAG_GPIO_SWITCH 0x4f06 #define OMAP_TAG_GPIO_SWITCH 0x4f06
#define OMAP_TAG_UART 0x4f07
#define OMAP_TAG_FBMEM 0x4f08 #define OMAP_TAG_FBMEM 0x4f08
#define OMAP_TAG_STI_CONSOLE 0x4f09 #define OMAP_TAG_STI_CONSOLE 0x4f09
#define OMAP_TAG_CAMERA_SENSOR 0x4f0a #define OMAP_TAG_CAMERA_SENSOR 0x4f0a
......
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