Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272774
b: refs/heads/master
c: bc24ed4
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Warren authored and Olof Johansson committed Aug 9, 2011
1 parent 34c9357 commit 1392bf8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a697e694aeb82f2643825c45dc0214666172c540
refs/heads/master: bc24ed4f21c0ef6d99b653077747c3104f5f9b60
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ static struct tegra_gpio_table gpio_table[] = {
{ .gpio = TEGRA_GPIO_POWERKEY, .enable = true },
{ .gpio = TEGRA_GPIO_ISL29018_IRQ, .enable = true },
{ .gpio = TEGRA_GPIO_CDC_IRQ, .enable = true },
{ .gpio = TEGRA_GPIO_USB1, .enable = true },
};

void __init seaboard_pinmux_init(void)
Expand Down
27 changes: 27 additions & 0 deletions trunk/arch/arm/mach-tegra/board-seaboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ static __initdata struct tegra_clk_init_table seaboard_clk_init_table[] = {
{ "pll_a_out0", "pll_a", 11289600, true },
{ "cdev1", NULL, 0, true },
{ "i2s1", "pll_a_out0", 11289600, false},
{ "usbd", "clk_m", 12000000, true},
{ "usb3", "clk_m", 12000000, true},
{ NULL, NULL, 0, 0},
};

Expand Down Expand Up @@ -182,6 +184,29 @@ static struct i2c_board_info __initdata wm8903_device = {
.irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_CDC_IRQ),
};

static int seaboard_ehci_init(void)
{
int gpio_status;

gpio_status = gpio_request(TEGRA_GPIO_USB1, "VBUS_USB1");
if (gpio_status < 0) {
pr_err("VBUS_USB1 request GPIO FAILED\n");
WARN_ON(1);
}

gpio_status = gpio_direction_output(TEGRA_GPIO_USB1, 1);
if (gpio_status < 0) {
pr_err("VBUS_USB1 request GPIO DIRECTION FAILED\n");
WARN_ON(1);
}
gpio_set_value(TEGRA_GPIO_USB1, 1);

platform_device_register(&tegra_ehci1_device);
platform_device_register(&tegra_ehci3_device);

return 0;
}

static void __init seaboard_i2c_init(void)
{
gpio_request(TEGRA_GPIO_ISL29018_IRQ, "isl29018");
Expand Down Expand Up @@ -209,6 +234,8 @@ static void __init seaboard_common_init(void)
tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4;

platform_add_devices(seaboard_devices, ARRAY_SIZE(seaboard_devices));

seaboard_ehci_init();
}

static void __init tegra_seaboard_init(void)
Expand Down

0 comments on commit 1392bf8

Please sign in to comment.