Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e054b361 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

firmware: tegra: bpmp: Fix Tegra234-only builds 



[ Upstream commit bd778b893963d67d7eb01f49d84ffcd3eaf229dd ]

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

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 94d00957

drivers/firmware/tegra/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ tegra-bpmp-y = bpmp.o 
tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC)	+= bpmp-tegra210.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC)	+= bpmp-tegra186.o

tegra-bpmp-$(CONFIG_DEBUG_FS)	+= bpmp-debugfs.o

obj-$(CONFIG_TEGRA_BPMP)	+= tegra-bpmp.o

obj-$(CONFIG_TEGRA_IVC)		+= ivc.o

drivers/firmware/tegra/bpmp-private.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ struct tegra_bpmp_ops { 
};



#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)

extern const struct tegra_bpmp_ops tegra186_bpmp_ops;

#endif

#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/firmware/tegra/bpmp.c

+2 −1
Original line number Diff line number Diff line
@@ -808,7 +808,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = { 
};



#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)

static const struct tegra_bpmp_soc tegra186_soc = {

	.channels = {

		.cpu_tx = {