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

Commit 79d031fc authored by Thierry Reding's avatar Thierry Reding
Browse files

firmware: tegra: Conditionally support SoC generations 



Only include support for Tegra210 and Tegra186 in the BPMP driver if
support for those SoCs was selected. This fixes a build failure seen
on 32-bit ARM allmodconfig builds, but could also happen on 64-bit
ARM builds if either Tegra210 or Tegra186 were not selected.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarTimo Alho <talho@nvidia.com>
Tested-by: default avatarTimo Alho <talho@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent e835d442

drivers/firmware/tegra/bpmp-private.h

+4 −0
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ struct tegra_bpmp_ops { 
	int (*resume)(struct tegra_bpmp *bpmp);

};



#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)

extern const struct tegra_bpmp_ops tegra186_bpmp_ops;

#endif

#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

extern const struct tegra_bpmp_ops tegra210_bpmp_ops;

#endif



#endif

drivers/firmware/tegra/bpmp.c

+8 −0
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) 


static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume);



#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)

static const struct tegra_bpmp_soc tegra186_soc = {

	.channels = {

		.cpu_tx = {
@@ -832,7 +833,9 @@ static const struct tegra_bpmp_soc tegra186_soc = { 
	.ops = &tegra186_bpmp_ops,

	.num_resets = 193,

};

#endif



#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

static const struct tegra_bpmp_soc tegra210_soc = {

	.channels = {

		.cpu_tx = {
@@ -853,10 +856,15 @@ static const struct tegra_bpmp_soc tegra210_soc = { 
	},

	.ops = &tegra210_bpmp_ops,

};

#endif



static const struct of_device_id tegra_bpmp_match[] = {

#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)

	{ .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc },

#endif

#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

	{ .compatible = "nvidia,tegra210-bpmp", .data = &tegra210_soc },

#endif

	{ }

};