Commit 82b711c2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.5/soc-late-signed' of... 

Merge tag 'omap-for-v5.5/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Few late SoC changes for v5.5 merge window

These changes just clean up few typos, and there is one non-critical
correction of missing put_device() after calling of_platform_populate()
for display controller.

Naturally none of this is urgent and can be merged when suitable.

* tag 'omap-for-v5.5/soc-late-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Add missing put_device() call in omapdss_init_of()
  OMAP2: fixup doc comments in omap_device
  ARM: OMAP1: drop duplicated dependency on ARCH_OMAP1
  ARM: OMAP1: ams-delta FIQ: Fix a typo ("Initiaize")

Link: https://lore.kernel.org/r/pull-1573579927-542764@atomide.com-2


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0f3dac61 0b491904

arch/arm/mach-omap1/Kconfig

+13 −20
Original line number Diff line number Diff line
@@ -4,30 +4,25 @@ if ARCH_OMAP1 
menu "TI OMAP1 specific features"



comment "OMAP Core Type"

	depends on ARCH_OMAP1



config ARCH_OMAP730

	depends on ARCH_OMAP1

	bool "OMAP730 Based System"

	select ARCH_OMAP_OTG

	select CPU_ARM926T

	select OMAP_MPU_TIMER



config ARCH_OMAP850

	depends on ARCH_OMAP1

	bool "OMAP850 Based System"

	select ARCH_OMAP_OTG

	select CPU_ARM926T



config ARCH_OMAP15XX

	depends on ARCH_OMAP1

	default y

	bool "OMAP15xx Based System"

	select CPU_ARM925T

	select OMAP_MPU_TIMER



config ARCH_OMAP16XX

	depends on ARCH_OMAP1

	bool "OMAP16xx Based System"

	select ARCH_OMAP_OTG

	select CPU_ARM926T
@@ -35,7 +30,6 @@ config ARCH_OMAP16XX 


config OMAP_MUX

	bool "OMAP multiplexing support"

	depends on ARCH_OMAP

	default y

	help

	  Pin multiplexing support for OMAP boards. If your bootloader
@@ -60,25 +54,24 @@ config OMAP_MUX_WARNINGS 
	  printed, it's safe to deselect OMAP_MUX for your product.



comment "OMAP Board Type"

	depends on ARCH_OMAP1



config MACH_OMAP_INNOVATOR

	bool "TI Innovator"

	depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)

	depends on ARCH_OMAP15XX || ARCH_OMAP16XX

	help

          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you

          have such a board.



config MACH_OMAP_H2

	bool "TI H2 Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_H3

	bool "TI H3 Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 1710 H3 board support. Say Y here if you have such

	  a board.
@@ -91,7 +84,7 @@ config MACH_HERALD 


config MACH_OMAP_OSK

	bool "TI OSK Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here

          if you have such a board.
@@ -106,21 +99,21 @@ config OMAP_OSK_MISTRAL 


config MACH_OMAP_PERSEUS2

	bool "TI Perseus2"

	depends on ARCH_OMAP1 && ARCH_OMAP730

	depends on ARCH_OMAP730

    	help

	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such

	  a board.



config MACH_OMAP_FSAMPLE

	bool "TI F-Sample"

	depends on ARCH_OMAP1 && ARCH_OMAP730

	depends on ARCH_OMAP730

    	help

	  Support for TI OMAP 850 F-Sample board. Say Y here if you have such

	  a board.



config MACH_OMAP_PALMTE

	bool "Palm Tungsten E"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP15XX

	help

	  Support for the Palm Tungsten E PDA.  To boot the kernel, you'll

	  need a PalmOS compatible bootloader; check out
@@ -129,7 +122,7 @@ config MACH_OMAP_PALMTE 


config MACH_OMAP_PALMZ71

	bool "Palm Zire71"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP15XX

	help

	 Support for the Palm Zire71 PDA. To boot the kernel,

	 you'll need a PalmOS compatible bootloader; check out
@@ -138,7 +131,7 @@ config MACH_OMAP_PALMZ71 


config MACH_OMAP_PALMTT

	bool "Palm Tungsten|T"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP15XX

	help

	  Support for the Palm Tungsten|T PDA. To boot the kernel, you'll

	  need a PalmOS compatible bootloader (Garux); check out
@@ -147,7 +140,7 @@ config MACH_OMAP_PALMTT 


config MACH_SX1

	bool "Siemens SX1"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP15XX

	select I2C

	help

	  Support for the Siemens SX1 phone. To boot the kernel,
@@ -159,14 +152,14 @@ config MACH_SX1 


config MACH_NOKIA770

	bool "Nokia 770"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	depends on ARCH_OMAP16XX

	help

	  Support for the Nokia 770 Internet Tablet. Say Y here if you

	  have such a device.



config MACH_AMS_DELTA

	bool "Amstrad E3 (Delta)"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP15XX

	select FIQ

	select GPIO_GENERIC_PLATFORM

	select LEDS_GPIO_REGISTER
@@ -178,7 +171,7 @@ config MACH_AMS_DELTA 


config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

	depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)

	depends on ARCH_OMAP15XX || ARCH_OMAP16XX

	help

          Support for generic OMAP-1510, 1610 or 1710 board with

          no FPGA. Can be used as template for porting Linux to

arch/arm/mach-omap1/ams-delta-fiq.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void __init ams_delta_init_fiq(struct gpio_chip *chip, 


		/*

		 * FIQ handler takes full control over serio data and clk GPIO

		 * pins.  Initiaize them and keep requested so nobody can

		 * pins.  Initialize them and keep requested so nobody can

		 * interfere.  Fail if any of those two couldn't be requested.

		 */

		switch (i) {

arch/arm/mach-omap2/display.c

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static int __init omapdss_init_of(void) 
	r = of_platform_populate(node, NULL, NULL, &pdev->dev);

	if (r) {

		pr_err("Unable to populate DSS submodule devices\n");

		put_device(&pdev->dev);

		return r;

	}

arch/arm/mach-omap2/omap_device.c

+7 −12
Original line number Diff line number Diff line
@@ -119,11 +119,7 @@ static void _add_hwmod_clocks_clkdev(struct omap_device *od, 


/**

 * omap_device_build_from_dt - build an omap_device with multiple hwmods

 * @pdev_name: name of the platform_device driver to use

 * @pdev_id: this platform_device's connection ID

 * @oh: ptr to the single omap_hwmod that backs this omap_device

 * @pdata: platform_data ptr to associate with the platform_device

 * @pdata_len: amount of memory pointed to by @pdata

 * @pdev: The platform device to update.

 *

 * Function for building an omap_device already registered from device-tree

 *
@@ -292,7 +288,7 @@ static int _omap_device_idle_hwmods(struct omap_device *od) 


/**

 * omap_device_get_context_loss_count - get lost context count

 * @od: struct omap_device *

 * @pdev: The platform device to update.

 *

 * Using the primary hwmod, query the context loss count for this

 * device.
@@ -321,9 +317,8 @@ int omap_device_get_context_loss_count(struct platform_device *pdev) 
/**

 * omap_device_alloc - allocate an omap_device

 * @pdev: platform_device that will be included in this omap_device

 * @oh: ptr to the single omap_hwmod that backs this omap_device

 * @pdata: platform_data ptr to associate with the platform_device

 * @pdata_len: amount of memory pointed to by @pdata

 * @ohs: ptr to the omap_hwmod for this omap_device

 * @oh_cnt: the size of the ohs list

 *

 * Convenience function for allocating an omap_device structure and filling

 * hwmods, and resources.
@@ -649,7 +644,7 @@ struct dev_pm_domain omap_device_pm_domain = { 


/**

 * omap_device_register - register an omap_device with one omap_hwmod

 * @od: struct omap_device * to register

 * @pdev: the platform device (omap_device) to register.

 *

 * Register the omap_device structure.  This currently just calls

 * platform_device_register() on the underlying platform_device.
@@ -668,7 +663,7 @@ int omap_device_register(struct platform_device *pdev) 


/**

 * omap_device_enable - fully activate an omap_device

 * @od: struct omap_device * to activate

 * @pdev: the platform device to activate

 *

 * Do whatever is necessary for the hwmods underlying omap_device @od

 * to be accessible and ready to operate.  This generally involves
@@ -702,7 +697,7 @@ int omap_device_enable(struct platform_device *pdev) 


/**

 * omap_device_idle - idle an omap_device

 * @od: struct omap_device * to idle

 * @pdev: The platform_device (omap_device) to idle

 *

 * Idle omap_device @od.  Device drivers call this function indirectly

 * via pm_runtime_put*().  Returns -EINVAL if the omap_device is not

CRA Git | Maintained and supported by SUSTech CRA and CCSE