summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-colibri_t20.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2012-11-12 01:11:23 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2012-11-12 01:11:23 +0100
commit074420a5dda00bc24c5c11ad80256c9f2c724819 (patch)
tree05d973f618088e83dafb4c2cfbe85b564248b55f /arch/arm/mach-tegra/board-colibri_t20.c
parentb9b32cb28a68e72eea39080c16db142996fc8dac (diff)
colibri_t20: unify Ethernet initialisation
After fixing Ethernet detection faults in the T20 BSP V1.x based Linux kernel 2.6.36.2 and U-Boot 2011.06 unify the Ethernet initialisation. While at it fix some minor white space issue plus add some clarifying ifdef comments.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20.c')
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index 4db9a2e21967..068187913e82 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -243,7 +243,7 @@ static void colibri_t20_gpio_init(void)
}
}
-/* I2C*/
+/* I2C */
/* GEN1_I2C: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier board) */
static struct i2c_board_info colibri_t20_i2c_bus1_board_info[] = {
@@ -519,14 +519,14 @@ static struct led_pwm tegra_leds_pwm[] = {
.max_brightness = 255,
.pwm_period_ns = 19600,
},
-#else
+#else /* MECS_TELLURIUM */
{
.name = "pwm_a",
.pwm_id = 0,
.max_brightness = 255,
.pwm_period_ns = 19600,
},
-#endif
+#endif /* MECS_TELLURIUM */
{
.name = "pwm_d",
.pwm_id = 3,
@@ -731,17 +731,12 @@ static void ulpi_link_platform_open(void)
gpio_request(reset_gpio, "ulpi_phy_reset");
gpio_direction_output(reset_gpio, 0);
-
- gpio_direction_output(reset_gpio, 0);
msleep(5);
gpio_direction_output(reset_gpio, 1);
}
static void ulpi_link_platform_post_phy_on(void)
{
- /* unreset */
- gpio_set_value(ETHERNET_RESET_GPIO, 1);
-
/* enable VBUS */
gpio_set_value(ETHERNET_VBUS_GPIO, 1);