From: Jacob Tanenbaum <Jacob.Tanenbaum@logicpd.com>
To: linux@arm.linux.org.uk
Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
Jacob Tanenbaum <jacob.tanenbaum@logicpd.com>
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 [thread overview]
Message-ID: <1282708420-26418-4-git-send-email-Jacob.Tanenbaum@logicpd.com> (raw)
In-Reply-To: <1282708420-26418-3-git-send-email-Jacob.Tanenbaum@logicpd.com>
From: Jacob Tanenbaum <jacob.tanenbaum@logicpd.com>
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 <Jacob.Tanenbaum@logicpd.com>
---
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 <plat/mux.h>
#include <plat/board.h>
#include <plat/common.h>
+#include <plat/gpmc-smsc911x.h>
#include <plat/gpmc.h>
#include <plat/timer-gp.h>
#include <plat/sdrc.h>
@@ -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
next prev parent reply other threads:[~2010-08-25 3:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 3:53 [PATCH 1/4] initial support for LogicPD's OMAP3530LV SOM and OMAP35x Torpedo dev boards Jacob Tanenbaum
2010-08-25 3:53 ` [PATCH 2/4] Low-level init of hsmmc controller for LogicPD's OMAP3530LV SOM and OMAP 35x " Jacob Tanenbaum
2010-08-25 3:53 ` [PATCH 3/4] add generic smsc911x support for LogicPD's OMAP 3530LV SOM and Torpedo 35x dev kits Jacob Tanenbaum
2010-08-25 3:53 ` Jacob Tanenbaum [this message]
2010-09-02 13:24 ` [PATCH 4/4] Enabling Ethernet support for LogicPD's OMAP 3530LV SOM and OMAP 35x Torpedo dev board Russell King - ARM Linux
2010-09-02 13:22 ` [PATCH 2/4] Low-level init of hsmmc controller for LogicPD's OMAP3530LV SOM and OMAP 35x Torpedo dev boards Russell King - ARM Linux
2010-09-02 13:20 ` [PATCH 1/4] initial support for LogicPD's OMAP3530LV SOM and OMAP35x " Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282708420-26418-4-git-send-email-Jacob.Tanenbaum@logicpd.com \
--to=jacob.tanenbaum@logicpd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®