From mboxrd@z Thu Jan 1 00:00:00 1970 From: sricharan Subject: [PATCH 3/5] omap3: board-3430sdp: Initialise the serial pads. Date: Fri, 28 Jan 2011 10:38:16 +0530 Message-ID: <1296191298-17545-4-git-send-email-r.sricharan@ti.com> References: <1296191298-17545-1-git-send-email-r.sricharan@ti.com> Return-path: Received: from arroyo.ext.ti.com ([192.94.94.40]:33960 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751178Ab1A1FGJ (ORCPT ); Fri, 28 Jan 2011 00:06:09 -0500 In-Reply-To: <1296191298-17545-1-git-send-email-r.sricharan@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: r.sricharan@ti.com, linux-omap@vger.kernel.org Cc: santosh.shilimkar@ti.com, tony@atomide.com, paul@pwsan.com Use the mux framework to initialise the serial pads. Signed-off-by: sricharan --- arch/arm/mach-omap2/board-3430sdp.c | 86 ++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 3b39ef1..422c259 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -663,6 +663,90 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; + +static struct omap_device_pad serial1_pads[] __initdata = { + { .name = "uart1_cts.uart1_cts", + .enable = OMAP_PIN_INPUT| + OMAP_PIN_OFF_INPUT_PULLDOWN | + OMAP_MUX_MODE0, + }, + { .name = "uart1_rts.uart1_rts", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, + { .name = "uart1_rx.uart1_rx", + .enable = OMAP_PIN_INPUT | OMAP_PIN_OFF_INPUT_PULLDOWN | + OMAP_MUX_MODE0, + }, + { .name = "uart1_tx.uart1_tx", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, +}; + +static struct omap_device_pad serial2_pads[] __initdata = { + { .name = "uart2_cts.uart2_cts", + .enable = OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_INPUT_PULLDOWN | + OMAP_MUX_MODE0, + }, + { .name = "uart2_rts.uart2_rts", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, + { .name = "uart2_rx.uart2_rx", + .enable = OMAP_PIN_INPUT | OMAP_PIN_OFF_INPUT_PULLDOWN | + OMAP_MUX_MODE0, + }, + { .name = "uart2_tx.uart2_tx", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, +}; + +static struct omap_device_pad serial3_pads[] __initdata = { + { .name = "uart3_cts_rctx.uart3_cts_rctx", + .enable = OMAP_PIN_INPUT_PULLDOWN | + OMAP_PIN_OFF_INPUT_PULLDOWN | OMAP_MUX_MODE0, + }, + { .name = "uart3_rts_sd.uart3_rts_sd", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, + { .name = "uart3_rx_irrx.uart3_rx_irrx", + .enable = OMAP_PIN_INPUT | OMAP_PIN_OFF_INPUT_PULLDOWN | + OMAP_MUX_MODE0, + }, + { .name = "uart3_tx_irtx.uart3_tx_irtx", + .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, + }, +}; + +static struct omap_board_data serial1_data = { + .id = 0, + .pads = serial1_pads, + .pads_cnt = ARRAY_SIZE(serial1_pads), +}; + +static struct omap_board_data serial2_data = { + .id = 1, + .pads = serial2_pads, + .pads_cnt = ARRAY_SIZE(serial2_pads), +}; + +static struct omap_board_data serial3_data = { + .id = 2, + .pads = serial3_pads, + .pads_cnt = ARRAY_SIZE(serial3_pads), +}; + +static inline void board_serial_init(void) +{ + omap_serial_init_port(&serial1_data); + omap_serial_init_port(&serial2_data); + omap_serial_init_port(&serial3_data); +} +#else +#define board_mux NULL + +static inline void board_serial_init(void) +{ + omap_serial_init(); +} #endif /* @@ -804,7 +888,7 @@ static void __init omap_3430sdp_init(void) spi_register_board_info(sdp3430_spi_board_info, ARRAY_SIZE(sdp3430_spi_board_info)); ads7846_dev_init(); - omap_serial_init(); + board_serial_init(); usb_musb_init(&musb_board_data); board_smc91x_init(); board_flash_init(sdp_flash_partitions, chip_sel_3430); -- 1.7.0.4