diff options
| author | Thierry Reding <treding@nvidia.com> | 2020-09-17 12:07:51 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2020-09-18 15:57:04 +0200 |
| commit | 0ebdf11699d0491c0a1eee5bb5d920f4f36810ba (patch) | |
| tree | 2c6197f7c114a1c8aa1b11efbf0706e19f111a99 /drivers/firmware | |
| parent | Merge branch 'for-5.10/soc' into for-5.10/firmware (diff) | |
| download | linux-0ebdf11699d0491c0a1eee5bb5d920f4f36810ba.tar.xz linux-0ebdf11699d0491c0a1eee5bb5d920f4f36810ba.zip | |
firmware: tegra: Enable BPMP support on Tegra234
Enable support for the BPMP on Tegra234 to avoid relying on Tegra194
being enabled to pull in the needed OF device ID table entry.
On simulation platforms the BPMP hasn't booted up yet by the time we
probe the BPMP driver and the BPMP hasn't had a chance to mark the
doorbell as ringable by the CCPLEX. This corresponding check in the
BPMP driver will therefore fail. Work around this by disabling the
check on simulation platforms.
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/tegra/bpmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 4d93d8925e14..0742a90cb844 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -856,7 +856,8 @@ static const struct tegra_bpmp_soc tegra210_soc = { static const struct of_device_id tegra_bpmp_match[] = { #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, #endif #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) |