From 074420a5dda00bc24c5c11ad80256c9f2c724819 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 12 Nov 2012 01:11:23 +0100 Subject: 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. --- arch/arm/mach-tegra/board-colibri_t20.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'arch') 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, @@ -730,8 +730,6 @@ static void ulpi_link_platform_open(void) int reset_gpio = TEGRA_GPIO_PV1; /* USB3340 RESETB */ 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); @@ -739,9 +737,6 @@ static void ulpi_link_platform_open(void) 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); -- cgit v1.2.3