Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (8a5f0f82) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}