tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Olof Johansson 8a5f0f82 738384aa

+4 -4
+1 -1
arch/arm/mach-omap2/board-rx51-peripherals.c
··· 193 193 static void __init rx51_charger_init(void) 194 194 { 195 195 WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO, 196 - GPIOF_OUT_INIT_LOW, "isp1704_reset")); 196 + GPIOF_OUT_INIT_HIGH, "isp1704_reset")); 197 197 198 198 platform_device_register(&rx51_charger_device); 199 199 }
+3 -3
arch/arm/mach-omap2/mcbsp.c
··· 145 145 pdata->reg_size = 4; 146 146 pdata->has_ccr = true; 147 147 } 148 + pdata->set_clk_src = omap2_mcbsp_set_clk_src; 149 + if (id == 1) 150 + pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; 148 151 149 152 if (oh->class->rev == MCBSP_CONFIG_TYPE3) { 150 153 if (id == 2) ··· 177 174 name, oh->name); 178 175 return PTR_ERR(pdev); 179 176 } 180 - pdata->set_clk_src = omap2_mcbsp_set_clk_src; 181 - if (id == 1) 182 - pdata->mux_signal = omap2_mcbsp1_mux_rx_clk; 183 177 omap_mcbsp_count++; 184 178 return 0; 185 179 }