diff options
| -rw-r--r-- | drivers/firmware/tegra/Makefile | 1 | ||||
| -rw-r--r-- | drivers/firmware/tegra/bpmp-private.h | 3 | ||||
| -rw-r--r-- | drivers/firmware/tegra/bpmp.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile index ba45e58f7647..676b01caff05 100644 --- a/drivers/firmware/tegra/Makefile +++ b/drivers/firmware/tegra/Makefile | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | tegra-bpmp-y = bpmp.o | 1 | tegra-bpmp-y = bpmp.o |
| 2 | tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o | 2 | tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o |
| 3 | tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o | 3 | tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o |
| 4 | tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o | ||
| 4 | tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o | 5 | tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o |
| 5 | obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o | 6 | obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o |
| 6 | obj-$(CONFIG_TEGRA_IVC) += ivc.o | 7 | obj-$(CONFIG_TEGRA_IVC) += ivc.o |
diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h index cc343f4ebafb..54d560c48398 100644 --- a/drivers/firmware/tegra/bpmp-private.h +++ b/drivers/firmware/tegra/bpmp-private.h | |||
| @@ -23,7 +23,8 @@ struct tegra_bpmp_ops { | |||
| 23 | int (*resume)(struct tegra_bpmp *bpmp); | 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 | extern const struct tegra_bpmp_ops tegra186_bpmp_ops; | 28 | extern const struct tegra_bpmp_ops tegra186_bpmp_ops; |
| 28 | #endif | 29 | #endif |
| 29 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) | 30 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) |
diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 6498c848c82c..dd775e8ba5a0 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c | |||
| @@ -813,7 +813,8 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) | |||
| 813 | 813 | ||
| 814 | static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume); | 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 | static const struct tegra_bpmp_soc tegra186_soc = { | 818 | static const struct tegra_bpmp_soc tegra186_soc = { |
| 818 | .channels = { | 819 | .channels = { |
| 819 | .cpu_tx = { | 820 | .cpu_tx = { |
| @@ -859,7 +860,8 @@ static const struct tegra_bpmp_soc tegra210_soc = { | |||
| 859 | #endif | 860 | #endif |
| 860 | 861 | ||
| 861 | static const struct of_device_id tegra_bpmp_match[] = { | 862 | static const struct of_device_id tegra_bpmp_match[] = { |
| 862 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) | 863 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ |
| 864 | IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) | ||
| 863 | { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, | 865 | { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, |
| 864 | #endif | 866 | #endif |
| 865 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) | 867 | #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) |
