p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl3K6rMRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPrZg//Vt0zrGT7F7dyiyl+BCxUrnoejBa4aWJc
 OUmdvWv8umKCepzn4QwrOTogLBgZes1Le15mPfbktmU8lSIH9KuZGm/KmZB0mO0S
 uJCuoHY6gMqRF9hAhMXFcfsXcuBc0ytZVA9yOLhUP9VAsxySo7kKnfMLJ/W6xjWr
 4bLW894/lDPJ3ENUrJcUR1breV6VRnYOJ6dqE3cNLSA3BNNcGIwfOJK7Ob/owkXN
 k/3nTI+g6h6Pzm5WlJxt78cyhgRY1AGOZ8+UlBywgSMJmja4SaysZ1Ga+6rwjKQ9
 mJFWe6b13lAr9gIu1f88Yw/zb3jYVpjhEdXUGf8VeFDTxgrFnDt6N8FuM3LbTagU
 L2jsjSegC78qqYUDiFDOD+2w9V7LIxqu7G9wy27BXJqB15beE5aGFMJGnMTfhid6
 xfVBUl9Q+G4dZi4TNG+SeT3pJJqmBuv80hlcsCVSC5mNoF6bvXa9zJo99DUhjsHX
 tjyIILl1BsAImSbQq2LzDE+CtSjRKpovBNxtGO+2C9MeBKW7LI0+lNvTUIcKvHVJ
 xvEMFdEAUE7SY0/3zKczLkHlIHP+NVolo+7+YgwAjQ28rKqcgKQ1nTLZIOT2wnQw
 NDiKUJ5nTy3To8NPUzwdY645vzaY5NI+XRqRhUbk5OAgqRjkcq6T8cyA7FY6Db0b
 3R99xi1BcQI=
 =2Ql6
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-11-12 22:57:37 -08:00
parent 0f3dac6110 0b491904f0
commit 82b711c251
4 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/mach-omap1/Kconfig
View File

@ -4,30 +4,25 @@ if ARCH_OMAP1
menu "TI OMAP1 specific features" menu "TI OMAP1 specific features"
comment "OMAP Core Type" comment "OMAP Core Type"
depends on ARCH_OMAP1
config ARCH_OMAP730 config ARCH_OMAP730
depends on ARCH_OMAP1
bool "OMAP730 Based System" bool "OMAP730 Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
select OMAP_MPU_TIMER select OMAP_MPU_TIMER
config ARCH_OMAP850 config ARCH_OMAP850
depends on ARCH_OMAP1
bool "OMAP850 Based System" bool "OMAP850 Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
config ARCH_OMAP15XX config ARCH_OMAP15XX
depends on ARCH_OMAP1
default y default y
bool "OMAP15xx Based System" bool "OMAP15xx Based System"
select CPU_ARM925T select CPU_ARM925T
select OMAP_MPU_TIMER select OMAP_MPU_TIMER
config ARCH_OMAP16XX config ARCH_OMAP16XX
depends on ARCH_OMAP1
bool "OMAP16xx Based System" bool "OMAP16xx Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
@ -35,7 +30,6 @@ config ARCH_OMAP16XX
config OMAP_MUX config OMAP_MUX
bool "OMAP multiplexing support" bool "OMAP multiplexing support"
depends on ARCH_OMAP
default y default y
help help
Pin multiplexing support for OMAP boards. If your bootloader 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. printed, it's safe to deselect OMAP_MUX for your product.
comment "OMAP Board Type" comment "OMAP Board Type"
depends on ARCH_OMAP1
config MACH_OMAP_INNOVATOR config MACH_OMAP_INNOVATOR
bool "TI Innovator" bool "TI Innovator"
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) depends on ARCH_OMAP15XX || ARCH_OMAP16XX
help help
TI OMAP 1510 or 1610 Innovator board support. Say Y here if you TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
have such a board. have such a board.
config MACH_OMAP_H2 config MACH_OMAP_H2
bool "TI H2 Support" bool "TI H2 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 1610/1611B H2 board support. Say Y here if you have such TI OMAP 1610/1611B H2 board support. Say Y here if you have such
a board. a board.
config MACH_OMAP_H3 config MACH_OMAP_H3
bool "TI H3 Support" bool "TI H3 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 1710 H3 board support. Say Y here if you have such TI OMAP 1710 H3 board support. Say Y here if you have such
a board. a board.
@ -91,7 +84,7 @@ config MACH_HERALD
config MACH_OMAP_OSK config MACH_OMAP_OSK
bool "TI OSK Support" bool "TI OSK Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board. if you have such a board.
@ -106,21 +99,21 @@ config OMAP_OSK_MISTRAL
config MACH_OMAP_PERSEUS2 config MACH_OMAP_PERSEUS2
bool "TI Perseus2" bool "TI Perseus2"
depends on ARCH_OMAP1 && ARCH_OMAP730 depends on ARCH_OMAP730
help help
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
a board. a board.
config MACH_OMAP_FSAMPLE config MACH_OMAP_FSAMPLE
bool "TI F-Sample" bool "TI F-Sample"
depends on ARCH_OMAP1 && ARCH_OMAP730 depends on ARCH_OMAP730
help help
Support for TI OMAP 850 F-Sample board. Say Y here if you have such Support for TI OMAP 850 F-Sample board. Say Y here if you have such
a board. a board.
config MACH_OMAP_PALMTE config MACH_OMAP_PALMTE
bool "Palm Tungsten E" bool "Palm Tungsten E"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Tungsten E PDA. To boot the kernel, you'll Support for the Palm Tungsten E PDA. To boot the kernel, you'll
need a PalmOS compatible bootloader; check out need a PalmOS compatible bootloader; check out
@ -129,7 +122,7 @@ config MACH_OMAP_PALMTE
config MACH_OMAP_PALMZ71 config MACH_OMAP_PALMZ71
bool "Palm Zire71" bool "Palm Zire71"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Zire71 PDA. To boot the kernel, Support for the Palm Zire71 PDA. To boot the kernel,
you'll need a PalmOS compatible bootloader; check out you'll need a PalmOS compatible bootloader; check out
@ -138,7 +131,7 @@ config MACH_OMAP_PALMZ71
config MACH_OMAP_PALMTT config MACH_OMAP_PALMTT
bool "Palm Tungsten|T" bool "Palm Tungsten|T"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Tungsten|T PDA. To boot the kernel, you'll Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
need a PalmOS compatible bootloader (Garux); check out need a PalmOS compatible bootloader (Garux); check out
@ -147,7 +140,7 @@ config MACH_OMAP_PALMTT
config MACH_SX1 config MACH_SX1
bool "Siemens SX1" bool "Siemens SX1"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
select I2C select I2C
help help
Support for the Siemens SX1 phone. To boot the kernel, Support for the Siemens SX1 phone. To boot the kernel,
@ -159,14 +152,14 @@ config MACH_SX1
config MACH_NOKIA770 config MACH_NOKIA770
bool "Nokia 770" bool "Nokia 770"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
Support for the Nokia 770 Internet Tablet. Say Y here if you Support for the Nokia 770 Internet Tablet. Say Y here if you
have such a device. have such a device.
config MACH_AMS_DELTA config MACH_AMS_DELTA
bool "Amstrad E3 (Delta)" bool "Amstrad E3 (Delta)"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
select FIQ select FIQ
select GPIO_GENERIC_PLATFORM select GPIO_GENERIC_PLATFORM
select LEDS_GPIO_REGISTER select LEDS_GPIO_REGISTER
@ -178,7 +171,7 @@ config MACH_AMS_DELTA
config MACH_OMAP_GENERIC config MACH_OMAP_GENERIC
bool "Generic OMAP board" bool "Generic OMAP board"
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) depends on ARCH_OMAP15XX || ARCH_OMAP16XX
help help
Support for generic OMAP-1510, 1610 or 1710 board with Support for generic OMAP-1510, 1610 or 1710 board with
no FPGA. Can be used as template for porting Linux to no FPGA. Can be used as template for porting Linux to

2
arch/arm/mach-omap1/ams-delta-fiq.c
View File

@ -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 * 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. * interfere. Fail if any of those two couldn't be requested.
*/ */
switch (i) { switch (i) {

1
arch/arm/mach-omap2/display.c
View File

@ -265,6 +265,7 @@ static int __init omapdss_init_of(void)
r = of_platform_populate(node, NULL, NULL, &pdev->dev); r = of_platform_populate(node, NULL, NULL, &pdev->dev);
if (r) { if (r) {
pr_err("Unable to populate DSS submodule devices\n"); pr_err("Unable to populate DSS submodule devices\n");
put_device(&pdev->dev);
return r; return r;
} }

19
arch/arm/mach-omap2/omap_device.c
View File

@ -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 * omap_device_build_from_dt - build an omap_device with multiple hwmods
* @pdev_name: name of the platform_device driver to use * @pdev: The platform device to update.
* @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
* *
* Function for building an omap_device already registered from device-tree * 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 * 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 * Using the primary hwmod, query the context loss count for this
* device. * device.
@ -321,9 +317,8 @@ int omap_device_get_context_loss_count(struct platform_device *pdev)
/** /**
* omap_device_alloc - allocate an omap_device * omap_device_alloc - allocate an omap_device
* @pdev: platform_device that will be included in this 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 * @ohs: ptr to the omap_hwmod for this omap_device
* @pdata: platform_data ptr to associate with the platform_device * @oh_cnt: the size of the ohs list
* @pdata_len: amount of memory pointed to by @pdata
* *
* Convenience function for allocating an omap_device structure and filling * Convenience function for allocating an omap_device structure and filling
* hwmods, and resources. * 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 * 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 * Register the omap_device structure. This currently just calls
* platform_device_register() on the underlying platform_device. * 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 * 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 * Do whatever is necessary for the hwmods underlying omap_device @od
* to be accessible and ready to operate. This generally involves * 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 * 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 * Idle omap_device @od. Device drivers call this function indirectly
* via pm_runtime_put*(). Returns -EINVAL if the omap_device is not * via pm_runtime_put*(). Returns -EINVAL if the omap_device is not