Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-18 11:17:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two small hwspinlock changes for better OMAP support, coming

Browse Source 
from Suman Anna.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT6iF2AAoJELLolMlTRIoMRSAQAI7aoIN7heqKqnZHL2AfB6oL
 umHc/sFksb8jlCm1IArGqgh77lpzwRODjh0k6qua6mMMCX59sFBMaEKiJiccjlne
 0vEs4usG9ZXn6so3l1oFz5zedPp15zzssxygIeMpXTynSZbSwabwWiVvW1yneHGa
 oEuXDC1CuMHVqdZ23a1xokzKRpWVf7taGhy3tqrGyS2J4BgGgdKoBn1hl2F2WRkk
 zpqZ5+vtrTVVHthZ2zSkR/3PSEA6w/yZLfBDI9i6avq6v2JRnWdU4Hqf7eeZUREq
 WpqKmHAcx3OAvAlxWDiYi9nBgBuNFKoXg04XhbJnV6q4lo4VXyz/g1DgicHRNyZd
 kw6rJnMrf1ra7qjAEYwSuzBhqaVxNAItaa8pDk4eaj6oSpOeZEktdV/kKLtZHZib
 E0mOIcB1gGvl0ZD0pqM4l4EvRnd/XlvxDH447qxvSk2k4RCx1tBpqUVVh9Hr5YXU
 7u5xIlktj4EKIt/hN5oZm9FHIds6BDju2iIz6U1kTN+NfcBGlbInJ5U4KKeEfdk6
 s/jLnnAarychrVIbxLLhLJlWhQky3b5Pl76Fl75vYKpca7mzZmRv+rGNc6pS/j6f
 JcjwDUANOUxUwUZLqDQ1UuLeAKxjsvcU4rdkkup+0XEP2s9SM960vOEzaFVePuce
 0XC2/BCXvTrsHB2keeKS
 =PYNx
 -----END PGP SIGNATURE-----

Merge tag 'hwspinlock-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

Pull hwspinlock updates from Ohad Ben-Cohen:
 "Two small hwspinlock changes for better OMAP support, coming from
  Suman Anna"

* tag 'hwspinlock-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock: enable OMAP build for AM33xx, AM43xx & DRA7xx
  hwspinlock/omap: enable module before reading SYSSTATUS register
This commit is contained in:
Linus Torvalds 2014-08-14 10:11:58 -06:00
commit 2d0c05e1c5
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwspinlock/Kconfig
View File

@ -10,7 +10,7 @@ menu "Hardware Spinlock drivers"
config HWSPINLOCK_OMAP
tristate "OMAP Hardware Spinlock device"
depends on ARCH_OMAP4 || SOC_OMAP5
depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX
select HWSPINLOCK
help
Say y here to support the OMAP Hardware Spinlock device (firstly

27
drivers/hwspinlock/omap_hwspinlock.c
View File

@ -98,10 +98,29 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
if (!io_base)
return -ENOMEM;
/*
* make sure the module is enabled and clocked before reading
* the module SYSSTATUS register
*/
pm_runtime_enable(&pdev->dev);
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0) {
pm_runtime_put_noidle(&pdev->dev);
goto iounmap_base;
}
/* Determine number of locks */
i = readl(io_base + SYSSTATUS_OFFSET);
i >>= SPINLOCK_NUMLOCKS_BIT_OFFSET;
/*
* runtime PM will make sure the clock of this module is
* enabled again iff at least one lock is requested
*/
ret = pm_runtime_put(&pdev->dev);
if (ret < 0)
goto iounmap_base;
/* one of the four lsb's must be set, and nothing else */
if (hweight_long(i & 0xf) != 1 || i > 8) {
ret = -EINVAL;
@ -121,12 +140,6 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
/*
* runtime PM will make sure the clock of this module is
* enabled iff at least one lock is requested
*/
pm_runtime_enable(&pdev->dev);
ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
pdata->base_id, num_locks);
if (ret)
@ -135,9 +148,9 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
return 0;
reg_fail:
pm_runtime_disable(&pdev->dev);
kfree(bank);
iounmap_base:
pm_runtime_disable(&pdev->dev);
iounmap(io_base);
return ret;
}