shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'hwlock-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc

Browse Source 
Pull hwspinlock updates from Bjorn Andersson:
 "Add support for the hardware spinlock in the TI K3 AM64x SoC"

* tag 'hwlock-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  hwspinlock: omap: Add support for K3 AM64x SoCs
  dt-bindings: hwlock: Update OMAP HwSpinlock binding for AM64x SoCs
This commit is contained in:
Linus Torvalds
2021-02-24 11:22:57 -08:00
parent 719bbd4a50 b9ddb2500e
commit 890caa39a9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.yaml
View File

@@ -13,6 +13,7 @@ properties:
compatible:
enum:
- ti,omap4-hwspinlock # for OMAP44xx, OMAP54xx, AM33xx, AM43xx, DRA7xx SoCs
- ti,am64-hwspinlock # for K3 AM64x SoCs
- ti,am654-hwspinlock # for K3 AM65x, J721E and J7200 SoCs
reg:

4
drivers/hwspinlock/omap_hwspinlock.c
View File

@@ -2,11 +2,12 @@
/*
* OMAP hardware spinlock driver
*
* Copyright (C) 2010-2015 Texas Instruments Incorporated - http://www.ti.com
* Copyright (C) 2010-2021 Texas Instruments Incorporated - https://www.ti.com
*
* Contact: Simon Que <sque@ti.com>
* Hari Kanigeri <h-kanigeri2@ti.com>
* Ohad Ben-Cohen <ohad@wizery.com>
* Suman Anna <s-anna@ti.com>
*/
#include <linux/kernel.h>
@@ -164,6 +165,7 @@ static int omap_hwspinlock_remove(struct platform_device *pdev)
static const struct of_device_id omap_hwspinlock_of_match[] = {
{ .compatible = "ti,omap4-hwspinlock", },
{ .compatible = "ti,am64-hwspinlock", },
{ .compatible = "ti,am654-hwspinlock", },
{ /* end */ },
};