summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings/power
diff options
context:
space:
mode:
authorOlof Johansson2018-12-03 22:06:27 +0100
committerOlof Johansson2018-12-03 22:06:27 +0100
commite5734bebed406cc35875044b6af9bd67c6160680 (patch)
treeaff1544115e2ce7bec2c21256908fa593d9f6a15 /include/dt-bindings/power
parentMerge tag 'omap-for-v4.21/driver-signed' of git://git.kernel.org/pub/scm/linu... (diff)
parentsoc: bcm: brcmstb: Don't leak device tree node reference (diff)
downloadkernel-qcow2-linux-e5734bebed406cc35875044b6af9bd67c6160680.tar.gz
kernel-qcow2-linux-e5734bebed406cc35875044b6af9bd67c6160680.tar.xz
kernel-qcow2-linux-e5734bebed406cc35875044b6af9bd67c6160680.zip
Merge tag 'arm-soc/for-4.21/drivers' of https://github.com/Broadcom/stblinux into next/drivers
This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes for 4.21, please pull the following changes: - James fixes the firmware interface after a commit changed the use of VLA and broke large transfers - Stefan adds a timeout check for Raspberry Pi firmware transactions and updates a bunch of SoC/firmware files to use SPDX tags - Wolfram switches the GISB bus arbiter to use dev_get_drvdata() - Yangtao provides a fix for a reference leak due to a call to of_find_node_by_path() - Florian fixes the CPU re-entry point out of S3 suspend with kernels built in Thumb2 mode * tag 'arm-soc/for-4.21/drivers' of https://github.com/Broadcom/stblinux: soc: bcm: brcmstb: Don't leak device tree node reference firmware: raspberrypi: Switch to SPDX identifier firmware: raspberrypi: Fix firmware calls with large buffers soc: bcm: Switch raspberrypi-power to SPDX identifier firmware: raspberrypi: Define timeout for transactions bus: brcmstb_gisb: simplify getting .driver_data soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings/power')
-rw-r--r--include/dt-bindings/power/raspberrypi-power.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/dt-bindings/power/raspberrypi-power.h b/include/dt-bindings/power/raspberrypi-power.h
index b3ff8e09a78f..3575f9f4b0bd 100644
--- a/include/dt-bindings/power/raspberrypi-power.h
+++ b/include/dt-bindings/power/raspberrypi-power.h
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright © 2015 Broadcom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/
#ifndef _DT_BINDINGS_ARM_BCM2835_RPI_POWER_H