tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

firmware/tegra: Enable Tegra186 BPMP support on Tegra194

The BPMP implementation on Tegra194 is mostly compatible with the
implementation on Tegra186, so make sure the latter is available when
support for Tegra194 is enabled.

Suggested-by: Timo Alho <talho@nvidia.com>
Reviewed-by: Timo Alho <talho@nvidia.com>
Tested-by: Timo Alho <talho@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

Thierry Reding fe45ab55 79d031fc

+7 -3
+1
drivers/firmware/tegra/Makefile
··· 1 1 tegra-bpmp-y = bpmp.o 2 2 tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o 3 3 tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o 4 + tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o 4 5 tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o 5 6 obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o 6 7 obj-$(CONFIG_TEGRA_IVC) += ivc.o
+2 -1
drivers/firmware/tegra/bpmp-private.h
··· 23 23 int (*resume)(struct tegra_bpmp *bpmp); 24 24 }; 25 25 26 - #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) 26 + #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 27 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 27 28 extern const struct tegra_bpmp_ops tegra186_bpmp_ops; 28 29 #endif 29 30 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
+4 -2
drivers/firmware/tegra/bpmp.c
··· 813 813 814 814 static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume); 815 815 816 - #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) 816 + #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 817 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 817 818 static const struct tegra_bpmp_soc tegra186_soc = { 818 819 .channels = { 819 820 .cpu_tx = { ··· 860 859 #endif 861 860 862 861 static const struct of_device_id tegra_bpmp_match[] = { 863 - #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) 862 + #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 863 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 864 864 { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, 865 865 #endif 866 866 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)