diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:50:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:50:57 +0200 |
| commit | d0994465d0eaeab1627697d88eccfa32bbd39714 (patch) | |
| tree | 82e29a2b9c514932b003dd950b93fa1c02fbafc7 /include/soc | |
| parent | Merge tag 'imx-drivers-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers (diff) | |
| parent | firmware: tegra: adjust tested variable (diff) | |
| download | linux-dev-d0994465d0eaeab1627697d88eccfa32bbd39714.tar.xz linux-dev-d0994465d0eaeab1627697d88eccfa32bbd39714.zip | |
Merge tag 'tegra-for-4.17-firmware' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers
Pull "firmware: Changes for v4.17-rc1" from Thierry Reding:
These changes are rather small, with just a fix for a return value check
and some preparatory work for Tegra194 BPMP support.
* tag 'tegra-for-4.17-firmware' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
firmware: tegra: adjust tested variable
firmware: tegra: Simplify channel management
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/tegra/bpmp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/soc/tegra/bpmp.h b/include/soc/tegra/bpmp.h index aeae4466dd25..e69e4c4d80ae 100644 --- a/include/soc/tegra/bpmp.h +++ b/include/soc/tegra/bpmp.h @@ -75,8 +75,8 @@ struct tegra_bpmp { struct mbox_chan *channel; } mbox; - struct tegra_bpmp_channel *channels; - unsigned int num_channels; + spinlock_t atomic_tx_lock; + struct tegra_bpmp_channel *tx_channel, *rx_channel, *threaded_channels; struct { unsigned long *allocated; |