diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
| commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
| tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch | |
| parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
| parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
| download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch')
| -rw-r--r-- | 0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch b/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch index db8a4a16c..877249e2f 100644 --- a/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch +++ b/0001-firmware-raspberrypi-Introduce-vl805-init-routine.patch @@ -18,7 +18,7 @@ Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> 2 files changed, 45 insertions(+) diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index da26a584dca0..cbb495aff6a0 100644 +index a3e85186f8e6..89a50f65d498 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -12,6 +12,7 @@ @@ -29,7 +29,7 @@ index da26a584dca0..cbb495aff6a0 100644 #include <soc/bcm2835/raspberrypi-firmware.h> #define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf)) -@@ -286,6 +287,43 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) +@@ -280,6 +281,43 @@ struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node) } EXPORT_SYMBOL_GPL(rpi_firmware_get); |