summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-11-28 02:25:25 +0300
committerFlorian Fainelli <f.fainelli@gmail.com>2018-11-28 02:25:25 +0300
commit34758f81559a1a664c8a99209b15267a542c3cf5 (patch)
tree8ccda271d5ce154d1772f3806823146d922310ff /drivers/soc
parent0810d5cc29a1e4bb9e738a478b746aebf8dc1931 (diff)
parent502b431cda801645fd73857f7b47a4666de3cb62 (diff)
downloadlinux-34758f81559a1a664c8a99209b15267a542c3cf5.tar.xz
Merge tag 'tags/bcm2835-drivers-next-2018-11-27' into drivers/next
This pull request adds SPDX to BCM2835 drivers, and fixes some bugs in the firmware driver (silently hanging if the VPU doesn't respond to a mailbox transaction, and undersized buffers in the firmware property transactions for tags that aren't used yet in the upstream). Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/bcm/raspberrypi-power.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/soc/bcm/raspberrypi-power.c b/drivers/soc/bcm/raspberrypi-power.c
index a78dfe0a2b50..5d1aacdd84ef 100644
--- a/drivers/soc/bcm/raspberrypi-power.c
+++ b/drivers/soc/bcm/raspberrypi-power.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
/* (C) 2015 Pengutronix, Alexander Aring <aar@pengutronix.de>
*
- * 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.
- *
* Authors:
* Alexander Aring <aar@pengutronix.de>
* Eric Anholt <eric@anholt.net>