| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 11 Aug 2010 12:31:37 -0400
From: Jacob Tanenbaum <Jacob.Tanenbaum@...icpd.com>
To: linux@....linux.org.uk
Cc: linux-omap@...r.kernel.org, linux-kernel@...r.kernel.org,
rmk@....linux.org.uk, tony@...mide.com,
Jacob Tanenbaum <Jacob.Tanenbaum@...icpd.com>
Subject: [PATCH 4/4] enabling Ethernet support for LogicPD's OMAP3 TORPEDO and SOM dev kits
Enable SMSC911x Ethernet driver for LogicPD's OMAP
3530 LV SOM and OMAP 35x Torpedo board.
Tested against: linux-next 81e09f50c93edff607259cbe374a3006c9c5fa74
Signed-off-by: Jacob Tanenbaum <Jacob.Tanenbaum@...icpd.com>
---
arch/arm/mach-omap2/board-omap3logic.c | 90 +++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index 3358418..694bc27 100644
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -38,14 +38,21 @@
#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>
+#include <plat/control.h>
+
+#define OMAP3LOGIC_SMSC911X_CS 1
#define OMAP3530_LV_SOM_MMC_GPIO_CD 110
#define OMAP3530_LV_SOM_MMC_GPIO_WP 126
+#define OMAP3530_LV_SOM_SMSC911X_GPIO_IRQ 152
+
#define OMAP3_TORPEDO_MMC_GPIO_CD 127
#define OMAP3_TORPEDO_MMC_GPIO_WP (-EINVAL)
+#define OMAP3_TORPEDO_SMSC911X_GPIO_IRQ 129
/* Micron MT46H32M32LF-6 */
/* FIXME: borrowed from sdram-micron-mt46h32m32lf-6.h because on LogicPD
@@ -190,6 +197,78 @@ 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)
@@ -204,14 +283,23 @@ static void __init omap3logic_init_irq(void)
#endif
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.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists