diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-15 20:58:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-15 20:58:37 -0800 |
| commit | 8a5f0f8228dd1380c13c315bcb6d58b6823f533b (patch) | |
| tree | e3f42dd100745670617b368e60e70e32d43a8685 | |
| parent | 738384aad76127fbfe4481a6a50558411b3713c4 (diff) | |
| parent | e5fe29c7198a1f6616286dfc8602a69da165cb3f (diff) | |
| download | talos-op-linux-8a5f0f8228dd1380c13c315bcb6d58b6823f533b.tar.gz talos-op-linux-8a5f0f8228dd1380c13c315bcb6d58b6823f533b.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index ba1aa07bdb29..c15c5c9c9085 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -193,7 +193,7 @@ static struct platform_device rx51_charger_device = { static void __init rx51_charger_init(void) { WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO, - GPIOF_OUT_INIT_LOW, "isp1704_reset")); + GPIOF_OUT_INIT_HIGH, "isp1704_reset")); platform_device_register(&rx51_charger_device); } diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 292eee3be15f..28fcb27005d2 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c @@ -145,6 +145,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) pdata->reg_size = 4; pdata->has_ccr = true; } + pdata->set_clk_src = omap2_mcbsp_set_clk_src; + if (id == 1) + pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; if (oh->class->rev == MCBSP_CONFIG_TYPE3) { if (id == 2) @@ -174,9 +177,6 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) name, oh->name); return PTR_ERR(pdev); } - pdata->set_clk_src = omap2_mcbsp_set_clk_src; - if (id == 1) - pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; omap_mcbsp_count++; return 0; } |
