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

firmware: tegra: bpmp: Fix Tegra234-only builds

The tegra186_bpmp_ops symbol is used on Tegra234, so make sure it's
available.

Signed-off-by: Thierry Reding <treding@nvidia.com>

+5 -2
+1
drivers/firmware/tegra/Makefile
··· 3 3 tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o 4 4 tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o 5 5 tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o 6 + tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o 6 7 tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o 7 8 obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o 8 9 obj-$(CONFIG_TEGRA_IVC) += ivc.o
+2 -1
drivers/firmware/tegra/bpmp-private.h
··· 24 24 }; 25 25 26 26 #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 27 - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 27 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ 28 + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) 28 29 extern const struct tegra_bpmp_ops tegra186_bpmp_ops; 29 30 #endif 30 31 #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
+2 -1
drivers/firmware/tegra/bpmp.c
··· 809 809 }; 810 810 811 811 #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ 812 - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) 812 + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ 813 + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) 813 814 static const struct tegra_bpmp_soc tegra186_soc = { 814 815 .channels = { 815 816 .cpu_tx = {