Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 167839
b: refs/heads/master
c: c33da3a
h: refs/heads/master
i:
  167837: 8729793
  167835: 7dfc3fa
  167831: f1416a7
  167823: 7757e4c
  167807: b7a8ca3
v: v3
  • Loading branch information
Janusz Krzysztofik authored and Tony Lindgren committed Oct 22, 2009
1 parent 2fc7654 commit 042fadb
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dcc730dc9d7614fdaf6bce73d6e8ffe47c8820b1
refs/heads/master: c33da3a80074094303d643a90ef589330b491270
4 changes: 4 additions & 0 deletions trunk/arch/arm/mach-omap1/board-ams-delta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ static struct platform_device *ams_delta_devices[] __initdata = {

static void __init ams_delta_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);

iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));

omap_board_config = ams_delta_config;
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ static void __init omap_generic_init(void)
{
#ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap15xx()) {
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

omap_usb_init(&generic1510_usb_config);
}
#endif
Expand Down
20 changes: 20 additions & 0 deletions trunk/arch/arm/mach-omap1/board-innovator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,26 @@ static void __init innovator_init(void)
{
#ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) {
unsigned char reg;

/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

reg = fpga_read(OMAP1510_FPGA_POWER);
reg |= OMAP1510_FPGA_PCR_COM1_EN;
fpga_write(reg, OMAP1510_FPGA_POWER);
udelay(10);

reg = fpga_read(OMAP1510_FPGA_POWER);
reg |= OMAP1510_FPGA_PCR_COM2_EN;
fpga_write(reg, OMAP1510_FPGA_POWER);
udelay(10);

platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));
spi_register_board_info(innovator1510_boardinfo,
ARRAY_SIZE(innovator1510_boardinfo));
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-palmte.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,14 @@ static void __init palmte_misc_gpio_setup(void)

static void __init omap_palmte_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

omap_board_config = palmte_config;
omap_board_config_size = ARRAY_SIZE(palmte_config);

Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-palmtt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,14 @@ static void __init omap_mpu_wdt_mode(int mode) {

static void __init omap_palmtt_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

omap_mpu_wdt_mode(0);

omap_board_config = palmtt_config;
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-palmz71.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,14 @@ palmz71_gpio_setup(int early)
static void __init
omap_palmz71_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

palmz71_gpio_setup(1);
omap_mpu_wdt_mode(0);

Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-sx1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,14 @@ static struct omap_board_config_kernel sx1_config[] __initdata = {

static void __init omap_sx1_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices));

omap_board_config = sx1_config;
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-omap1/board-voiceblue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ static void __init voiceblue_init_irq(void)

static void __init voiceblue_init(void)
{
/* mux pins for uarts */
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);

/* Watchdog */
gpio_request(0, "Watchdog");
/* smc91x reset */
Expand Down
26 changes: 0 additions & 26 deletions trunk/arch/arm/mach-omap1/serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ void __init omap_serial_init(void)
}

for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
unsigned char reg;

switch (i) {
case 0:
uart1_ck = clk_get(NULL, "uart1_ck");
Expand All @@ -143,16 +141,6 @@ void __init omap_serial_init(void)
if (cpu_is_omap15xx())
clk_set_rate(uart1_ck, 12000000);
}
if (cpu_is_omap15xx()) {
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
if (machine_is_omap_innovator()) {
reg = fpga_read(OMAP1510_FPGA_POWER);
reg |= OMAP1510_FPGA_PCR_COM1_EN;
fpga_write(reg, OMAP1510_FPGA_POWER);
udelay(10);
}
}
break;
case 1:
uart2_ck = clk_get(NULL, "uart2_ck");
Expand All @@ -165,16 +153,6 @@ void __init omap_serial_init(void)
else
clk_set_rate(uart2_ck, 48000000);
}
if (cpu_is_omap15xx()) {
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
if (machine_is_omap_innovator()) {
reg = fpga_read(OMAP1510_FPGA_POWER);
reg |= OMAP1510_FPGA_PCR_COM2_EN;
fpga_write(reg, OMAP1510_FPGA_POWER);
udelay(10);
}
}
break;
case 2:
uart3_ck = clk_get(NULL, "uart3_ck");
Expand All @@ -185,10 +163,6 @@ void __init omap_serial_init(void)
if (cpu_is_omap15xx())
clk_set_rate(uart3_ck, 12000000);
}
if (cpu_is_omap15xx()) {
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);
}
break;
}
omap_serial_reset(&serial_platform_data[i]);
Expand Down

0 comments on commit 042fadb

Please sign in to comment.