diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-15 01:36:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-15 01:36:51 +0200 |
| commit | fde7dc63b1caa6dedf9af7cbf79895589629bc95 (patch) | |
| tree | b719b754a9b65be628a30a2a9cc041d0f43eeaf6 /drivers/mailbox/arm_mhu.c | |
| parent | Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/denni... (diff) | |
| parent | mailbox: handle failed named mailbox channel request (diff) | |
| download | linux-fde7dc63b1caa6dedf9af7cbf79895589629bc95.tar.xz linux-fde7dc63b1caa6dedf9af7cbf79895589629bc95.zip | |
Merge tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- stm32: race fix by adding a spinlock
- mhu: trim included headers
- omap: add support for K3 SoCs
- imx: Irq disable fix
- bcm: tidy up extracting driver data
- tegra: make resume 'noirq'
- api: fix error handling
* tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: handle failed named mailbox channel request
mailbox: tegra: avoid resume NULL mailboxes
mailbox: tegra: hsp: add noirq resume
mailbox: bcm-flexrm-mailbox: using dev_get_drvdata directly
mailbox: imx: Clear GIEn bit at shutdown
mailbox: omap: Add support for TI K3 SoCs
dt-bindings: mailbox: omap: Update bindings for TI K3 SoCs
mailbox: arm_mhu: reorder header inclusion and drop unneeded ones
mailbox: stm32_ipcc: add spinlock to fix channels concurrent access
Diffstat (limited to 'drivers/mailbox/arm_mhu.c')
| -rw-r--r-- | drivers/mailbox/arm_mhu.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/mailbox/arm_mhu.c b/drivers/mailbox/arm_mhu.c index b47851856086..9da236552bd7 100644 --- a/drivers/mailbox/arm_mhu.c +++ b/drivers/mailbox/arm_mhu.c @@ -5,16 +5,13 @@ * Author: Jassi Brar <jaswinder.singh@linaro.org> */ -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/mutex.h> -#include <linux/delay.h> -#include <linux/slab.h> +#include <linux/amba/bus.h> +#include <linux/device.h> #include <linux/err.h> +#include <linux/interrupt.h> #include <linux/io.h> -#include <linux/module.h> -#include <linux/amba/bus.h> #include <linux/mailbox_controller.h> +#include <linux/module.h> #define INTR_STAT_OFS 0x0 #define INTR_SET_OFS 0x8 |