Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932462Ab0HYDzC (ORCPT ); Tue, 24 Aug 2010 23:55:02 -0400 Received: from mail.logicpd.com ([66.162.60.3]:27928 "EHLO smtp.logicpd.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755086Ab0HYDy5 (ORCPT ); Tue, 24 Aug 2010 23:54:57 -0400 From: Jacob Tanenbaum To: linux@arm.linux.org.uk Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Jacob Tanenbaum Subject: [PATCH 4/4] Enabling Ethernet support for LogicPD's OMAP 3530LV SOM and OMAP 35x Torpedo dev board Date: Tue, 24 Aug 2010 23:53:40 -0400 Message-Id: <1282708420-26418-4-git-send-email-Jacob.Tanenbaum@logicpd.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1282708420-26418-3-git-send-email-Jacob.Tanenbaum@logicpd.com> References: <1282708420-26418-1-git-send-email-Jacob.Tanenbaum@logicpd.com> <1282708420-26418-2-git-send-email-Jacob.Tanenbaum@logicpd.com> <1282708420-26418-3-git-send-email-Jacob.Tanenbaum@logicpd.com> X-OriginalArrivalTime: 25 Aug 2010 03:54:53.0826 (UTC) FILETIME=[467E2E20:01CB4409] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4255 Lines: 134 From: Jacob Tanenbaum ARM: OMAP3LOGIC: Ethernet driver and NFS added in defconfig Enable SMSC911x Ethernet driver and allow root file system on NFS for LogicPD's OMAP 3530 LV SOM and OMAP 35x Torpedo board. Tested against: 81e09f50c93edff607259cbe374a3006c9c5fa74 Signed-off-by: Jacob Tanenbaum --- arch/arm/mach-omap2/board-omap3logic.c | 83 ++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index bd83a83..42d6ffe 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -166,6 +167,77 @@ static void __init board_mmc_init(void) omap3logic_vmmc1_supply.dev = board_mmc_info[0].dev; } +static struct omap_smsc911x_platform_data __initdata board_smsc911x_data = { + .cs = OMAP3LOGIC_SMSC911X_CS, + .gpio_irq = -EINVAL, + .gpio_reset = -EINVAL, + .flags = IORESOURCE_IRQ_LOWLEVEL, +}; + +/* TODO/FIXME (comment by Peter Barada, LogicPD): + * Fix the PBIAS voltage for Torpedo MMC1 pins that + * are used for other needs (IRQs, etc). +static inline void __init omap3_torpedo_fix_pbias_voltage(void) */ +static void omap3torpedo_fix_pbias_voltage(void) +{ + u16 control_pbias_offset = OMAP343X_CONTROL_PBIAS_LITE; + static int pbias_fixed = -1; + u32 reg; + + if (!pbias_fixed) { + /* Set the bias for the pin */ + reg = omap_ctrl_readl(control_pbias_offset); + + reg &= ~OMAP343X_PBIASLITEPWRDNZ1; + omap_ctrl_writel(reg, control_pbias_offset); + + /* 100ms delay required for PBIAS configuration */ + msleep(100); + + reg |= OMAP343X_PBIASLITEVMODE1; + reg |= OMAP343X_PBIASLITEPWRDNZ1; + omap_ctrl_writel(reg | 0x300, control_pbias_offset); + + pbias_fixed = 1; + } +} + +static inline void __init board_smsc911x_init(void) +{ + /* OMAP3530 LV SOM board */ + if (machine_is_omap3530_lv_som()) { + board_smsc911x_data.gpio_irq = + OMAP3530_LV_SOM_SMSC911X_GPIO_IRQ; + /* board_smsc911x_data.gpio_reset + driven by SYS_nRESWARM, no GPIO */ + /* omap_cfg_reg(AE1_34XX_GPIO152_UP); */ + omap_mux_init_signal("gpio_152", OMAP_PIN_INPUT); + +/* omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);*/ + + /* OMAP3 Torpedo board */ + } else if (machine_is_omap3_torpedo()) { + board_smsc911x_data.gpio_irq = OMAP3_TORPEDO_SMSC911X_GPIO_IRQ; + /* board_smsc911x_data.gpio_reset driven + by SYS_nRESWARM, no GPIO */ + /*omap_cfg_reg(AE1_34XX_GPIO152_UP);*/ + omap_mux_init_signal("gpio_129", OMAP_PIN_INPUT); + /* TODO/FIXME (comment by Peter Barada, LogicPD): + * On Torpedo, LAN9221 IRQ is an MMC1_DATA7 pin + * and IRQ1760 IRQ is MMC1_DATA4 pin - need + * to update PBIAS to get voltage to the device + * so the IRQs works correctly rather than float + * and cause an IRQ storm... + */ + omap3torpedo_fix_pbias_voltage(); + /* unsupported board */ + } else { + printk(KERN_ERR "%s(): unknown machine type\n", __func__); + return; + } + gpmc_smsc911x_init(&board_smsc911x_data); +} + static void __init omap3logic_init_irq(void) { init_sdram(mt46h32m32lf6_sdrc_params); @@ -175,11 +247,22 @@ static void __init omap3logic_init_irq(void) omap_gpio_init(); } +#ifdef CONFIG_OMAP_MUX +static struct omap_board_mux board_mux[] __initdata = { + { .reg_offset = OMAP_MUX_TERMINATOR }, +}; +#else +#define board_mux NULL +#endif + static void __init omap3logic_init(void) { + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3logic_i2c_init(); omap_serial_init(); board_mmc_init(); + board_smsc911x_init(); + /* Ensure SDRC pins are mux'd for self-refresh */ omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); -- 1.7.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/