diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 13:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 13:01:15 -0400 |
commit | 0160e00ae8e987be8822745fb166aa76451c9bcc (patch) | |
tree | deca2d09a729155ed0cb631f2bc8f557e634ab06 /drivers/firmware/arm_scpi.c | |
parent | c81ee18e97e4e3162169a749eb7f2b79b3510c7a (diff) | |
parent | b6942b68f85ed3161c91741791ec6f1779574919 (diff) |
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Olof Johansson:
"Driver updates for ARM SoCs:
Reset subsystem, merged through arm-soc by tradition:
- Make bool drivers explicitly non-modular
- New support for i.MX7 and Arria10 reset controllers
PATA driver for Palmchip BK371 (acked by Tejun)
Power domain drivers for i.MX (GPC, GPCv2)
- Moved out of mach-imx for GPC
- Bunch of tweaks, fixes, etc
PMC support for Tegra186
SoC detection support for Renesas RZ/G1H and RZ/G1N
Move Tegra flow controller driver from mach directory to drivers/soc
- (Power management / CPU power driver)
Misc smaller tweaks for other platforms"
* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
soc: pm-domain: Fix the mangled urls
soc: renesas: rcar-sysc: Add support for R-Car H3 ES2.0
soc: renesas: rcar-sysc: Add support for fixing up power area tables
soc: renesas: Register SoC device early
soc: imx: gpc: add workaround for i.MX6QP to the GPC PD driver
dt-bindings: imx-gpc: add i.MX6 QuadPlus compatible
soc: imx: gpc: add defines for domain index
soc: imx: Add GPCv2 power gating driver
dt-bindings: Add GPCv2 power gating driver
ARM/clk: move the ICST library to drivers/clk
ARM: plat-versatile: remove stale clock header
ARM: keystone: Drop PM domain support for k2g
soc: ti: Add ti_sci_pm_domains driver
dt-bindings: Add TI SCI PM Domains
PM / Domains: Do not check if simple providers have phandle cells
PM / Domains: Add generic data pointer to genpd data struct
soc/tegra: Add initial flowctrl support for Tegra132/210
soc/tegra: flowctrl: Add basic platform driver
soc/tegra: Move Tegra flowctrl driver
ARM: tegra: Remove unnecessary inclusion of flowctrl header
...
Diffstat (limited to 'drivers/firmware/arm_scpi.c')
-rw-r--r-- | drivers/firmware/arm_scpi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c index 9ad0b1934be9..f6cfc31d34c7 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c | |||
@@ -538,7 +538,7 @@ static int scpi_send_message(u8 idx, void *tx_buf, unsigned int tx_len, | |||
538 | msg->tx_len = tx_len; | 538 | msg->tx_len = tx_len; |
539 | msg->rx_buf = rx_buf; | 539 | msg->rx_buf = rx_buf; |
540 | msg->rx_len = rx_len; | 540 | msg->rx_len = rx_len; |
541 | init_completion(&msg->done); | 541 | reinit_completion(&msg->done); |
542 | 542 | ||
543 | ret = mbox_send_message(scpi_chan->chan, msg); | 543 | ret = mbox_send_message(scpi_chan->chan, msg); |
544 | if (ret < 0 || !rx_buf) | 544 | if (ret < 0 || !rx_buf) |
@@ -872,8 +872,11 @@ static int scpi_alloc_xfer_list(struct device *dev, struct scpi_chan *ch) | |||
872 | return -ENOMEM; | 872 | return -ENOMEM; |
873 | 873 | ||
874 | ch->xfers = xfers; | 874 | ch->xfers = xfers; |
875 | for (i = 0; i < MAX_SCPI_XFERS; i++, xfers++) | 875 | for (i = 0; i < MAX_SCPI_XFERS; i++, xfers++) { |
876 | init_completion(&xfers->done); | ||
876 | list_add_tail(&xfers->node, &ch->xfers_list); | 877 | list_add_tail(&xfers->node, &ch->xfers_list); |
878 | } | ||
879 | |||
877 | return 0; | 880 | return 0; |
878 | } | 881 | } |
879 | 882 | ||