Commit f0d0b8cb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.11/soc-signed' of... 

Merge tag 'omap-for-v4.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omaps for v4.11 merge window. This adds support
for keeping the interconnect target module active for uart if
earlycon is specified. And we're adding Aaro Koskinen as a
co-maintainer for omap1 to make sure things stay working for
omap1. The other changes are mostly clean-up of old legacy code:

- Remove unused omap_display_init()
- Make omapdss_find_dss_of_node() function static
- Add support for earlycon
- Tidy up omap1 usb logging output with pr_cont
- Make omap_otg_init() static
- Delete redundant CPU class checks for omap1
- Remove unused mpurate cmdline option that has not done
  anything for past 1.5 years at least

* tag 'omap-for-v4.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: clock: Remove unused mpurate cmdline option
  ARM: OMAP2+: omap_hwmod: Add support for earlycon
  MAINTAINERS: Add Aaro Koskinen as TI omap1 SoC co-maintainer
  ARM: OMAP1: USB: delete redundant CPU class checks
  ARM: OMAP1: USB: make omap_otg_init() static
  ARM: OMAP1: USB: tidy up logging output
  ARM: OMAP2+: Make the omapdss_find_dss_of_node() function static
  ARM: OMAP2+: Remove unused omap_display_init() function

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 37b3785b 8c4bc910

MAINTAINERS

+16 −3
Original line number Diff line number Diff line
@@ -8919,7 +8919,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/
@@ -8927,8 +8940,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/clock.c

+0 −20
Original line number Diff line number Diff line
@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent); 
 * OMAP specific clock functions shared between omap1 and omap2

 */



int __initdata mpurate;



/*

 * By default we use the rate set by the bootloader.

 * You can override this with mpurate= cmdline option.

 */

static int __init omap_clk_setup(char *str)

{

	get_option(&str, &mpurate);



	if (!mpurate)

		return 1;



	if (mpurate < 1000)

		mpurate *= 1000000;



	return 1;

}

__setup("mpurate=", omap_clk_setup);



/* Used for clocks that always have same value as the parent clock */

unsigned long followparent_recalc(struct clk *clk)

{

arch/arm/mach-omap1/clock.h

+0 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ struct clk_functions { 
	void		(*clk_disable_unused)(struct clk *clk);

};



extern int mpurate;



extern int clk_init(struct clk_functions *custom_clocks);

extern void clk_preinit(struct clk *clk);

extern int clk_register(struct clk *clk);

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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE