Merge branch 'omap-for-v4.11/omap1' into omap-for-v4.11/soc (e33a316a) · Commits · e / devices / android_kernel_oneplus_sm7250

MAINTAINERS

+16 −3

Original line number	Diff line number	Diff line
		@@ -8909,7 +8909,20 @@ M: Josh Poimboeuf <jpoimboe@redhat.com>
		S: Supported
		F: tools/objtool/

		OMAP SUPPORT
		OMAP1 SUPPORT
		M: Aaro Koskinen <aaro.koskinen@iki.fi>
		M: Tony Lindgren <tony@atomide.com>
		L: linux-omap@vger.kernel.org
		Q: http://patchwork.kernel.org/project/linux-omap/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
		S: Maintained
		F: arch/arm/mach-omap1/
		F: arch/arm/plat-omap/
		F: arch/arm/configs/omap1_defconfig
		F: drivers/i2c/busses/i2c-omap.c
		F: include/linux/i2c-omap.h

		OMAP2+ SUPPORT
		M: Tony Lindgren <tony@atomide.com>
		L: linux-omap@vger.kernel.org
		W: http://www.muru.com/linux/omap/
		@@ -8917,8 +8930,8 @@ W: http://linux.omap.com/
		Q: http://patchwork.kernel.org/project/linux-omap/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
		S: Maintained
		F: arch/arm/omap/
		F: arch/arm/configs/omap1_defconfig
		F: arch/arm/mach-omap2/
		F: arch/arm/plat-omap/
		F: arch/arm/configs/omap2plus_defconfig
		F: drivers/i2c/busses/i2c-omap.c
		F: drivers/irqchip/irq-omap-intc.c

arch/arm/mach-omap1/include/mach/usb.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@

		#include <linux/platform_data/usb-omap1.h>

		void omap_otg_init(struct omap_usb_config *config);

		#if IS_ENABLED(CONFIG_USB)
		void omap1_usb_init(struct omap_usb_config *pdata);
		#else

arch/arm/mach-omap1/usb.c

+24 −27

Original line number	Diff line number	Diff line
		/*
		* Platform level USB initialization for FS USB OTG controller on omap1 and 24xx
		* Platform level USB initialization for FS USB OTG controller on omap1
		*
		* Copyright (C) 2004 Texas Instruments, Inc.
		*
		@@ -58,11 +58,12 @@

		#ifdef CONFIG_ARCH_OMAP_OTG

		void __init
		static void __init
		omap_otg_init(struct omap_usb_config *config)
		{
		u32 syscon;
		int alt_pingroup = 0;
		u16 w;

		/* NOTE: no bus or clock setup (yet?) */

		@@ -87,7 +88,6 @@ omap_otg_init(struct omap_usb_config *config)
		if (config->otg)
		syscon \|= OTG_EN;
		#endif
		if (cpu_class_is_omap1())
		pr_debug("USB_TRANSCEIVER_CTRL = %03x\n",
		omap_readl(USB_TRANSCEIVER_CTRL));
		pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2));
		@@ -95,20 +95,17 @@ omap_otg_init(struct omap_usb_config *config)

		printk("USB: hmc %d", config->hmc_mode);
		if (!alt_pingroup)
		printk(", usb2 alt %d wires", config->pins[2]);
		pr_cont(", usb2 alt %d wires", config->pins[2]);
		else if (config->pins[0])
		printk(", usb0 %d wires%s", config->pins[0],
		pr_cont(", usb0 %d wires%s", config->pins[0],
		is_usb0_device(config) ? " (dev)" : "");
		if (config->pins[1])
		printk(", usb1 %d wires", config->pins[1]);
		pr_cont(", usb1 %d wires", config->pins[1]);
		if (!alt_pingroup && config->pins[2])
		printk(", usb2 %d wires", config->pins[2]);
		pr_cont(", usb2 %d wires", config->pins[2]);
		if (config->otg)
		printk(", Mini-AB on usb%d", config->otg - 1);
		printk("\n");

		if (cpu_class_is_omap1()) {
		u16 w;
		pr_cont(", Mini-AB on usb%d", config->otg - 1);
		pr_cont("\n");

		/* leave USB clocks/controllers off until needed */
		w = omap_readw(ULPD_SOFT_REQ);
		@@ -119,7 +116,7 @@ omap_otg_init(struct omap_usb_config *config)
		w &= ~USB_MCLK_EN;
		w \|= DIS_USB_PVCI_CLK;
		omap_writew(w, ULPD_CLOCK_CTRL);
		}

		syscon = omap_readl(OTG_SYSCON_1);
		syscon \|= HST_IDLE_EN\|DEV_IDLE_EN\|OTG_IDLE_EN;

		@@ -166,7 +163,7 @@ omap_otg_init(struct omap_usb_config *config)
		}

		#else
		void omap_otg_init(struct omap_usb_config *config) {}
		static void omap_otg_init(struct omap_usb_config *config) {}
		#endif

		#if IS_ENABLED(CONFIG_USB_OMAP)
		@@ -573,13 +570,13 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)

		printk("USB: hmc %d", config->hmc_mode);
		if (config->pins[0])
		printk(", usb0 %d wires%s", config->pins[0],
		pr_cont(", usb0 %d wires%s", config->pins[0],
		is_usb0_device(config) ? " (dev)" : "");
		if (config->pins[1])
		printk(", usb1 %d wires", config->pins[1]);
		pr_cont(", usb1 %d wires", config->pins[1]);
		if (config->pins[2])
		printk(", usb2 %d wires", config->pins[2]);
		printk("\n");
		pr_cont(", usb2 %d wires", config->pins[2]);
		pr_cont("\n");

		/* use DPLL for 48 MHz function clock */
		pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),