lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 076/156] firmware: tegra: bpmp: Fix Tegra234-only builds
    Date
    From: Thierry Reding <treding@nvidia.com>

    [ Upstream commit bd778b893963d67d7eb01f49d84ffcd3eaf229dd ]

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

    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/tegra/Makefile | 1 +
    drivers/firmware/tegra/bpmp-private.h | 3 ++-
    drivers/firmware/tegra/bpmp.c | 3 ++-
    3 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile
    index 49c87e00fafb..620cf3fdd607 100644
    --- a/drivers/firmware/tegra/Makefile
    +++ b/drivers/firmware/tegra/Makefile
    @@ -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
    diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h
    index 54d560c48398..182bfe396516 100644
    --- a/drivers/firmware/tegra/bpmp-private.h
    +++ b/drivers/firmware/tegra/bpmp-private.h
    @@ -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)
    diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
    index 0742a90cb844..5654c5e9862b 100644
    --- a/drivers/firmware/tegra/bpmp.c
    +++ b/drivers/firmware/tegra/bpmp.c
    @@ -809,7 +809,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 = {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:14    [W:4.101 / U:1.952 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site