Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp684694pxv; Thu, 22 Jul 2021 09:41:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd9pFyREjC2yKgSiWKgGKH1+NhJwdxNfNiaIoIyBGdr8HhULUsGB520PtASaZPjQsVQi4u X-Received: by 2002:a05:6602:2595:: with SMTP id p21mr469534ioo.51.1626972077111; Thu, 22 Jul 2021 09:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972077; cv=none; d=google.com; s=arc-20160816; b=I1Pu+2qfmYkGcGzSIgb+Xw/q45ieBZgHSrVVR4KSgjrj5F1oQtTGufoXwTs4yt1R4Y njHTFhYiw2B7cPmd5xrbYza4ISCJl6jQTcedPBjBd3/5chKWoDdhe6umqDMPTBAqNwiP /6KPokGF+Y3/87Wg1yzfPwUUyUFANosBse1hJRuhVHdXwLF3+vrWAXieVNso6bwXJ3Os gZoUkVpmTffA6dd/sw/MOyDyQ6FfwcZM7OQ6y6W7p0Xz0/jKKmzdZIy1pG7TPLz8kocR z+L3aMrqs/Rhw8d309Nzg4yRLkMT4wYj2qtGU9YGNUKODSezv7IzgUlWtEJk0myZPYOY gLxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gA5KC2Zkan4P/Ih3TccJ95yiGMqVAWXdpIAbodHRsEM=; b=PLGpcdL/pWs1gF9Xax8+XnL+I1eQTsiDKUeFiYfQC+dc1mOKxpNfkRI9aBo4JSa03j 7A4H5KhBVl7/G0sATzlzrDjJLOQXAksDrmmWzS/dr0urJubvyicjwjroTFXdPvb7WqMu Ztdk46LxIcXS8S/nKQc+XmhMWZC93r4Gr9Kh20XOaNOenPI13ae42yUazQVraCx7H4Zs DiuFk59amDRKyER1DNPfPBwhZKzDuAOHRnj0ewf4kHXSfSLI3HH3ULpbm3vMcddJ7Lcm 52NKP0quuhVoRBHeuWGlue2N+taol+616kXh56fAKQ5YK7N+05y7WvCR5SwYoyB+J+V0 av6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UYcjXMqt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g17si29055734jaq.116.2021.07.22.09.41.05; Thu, 22 Jul 2021 09:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UYcjXMqt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233240AbhGVP7H (ORCPT + 99 others); Thu, 22 Jul 2021 11:59:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:33908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232963AbhGVP5Z (ORCPT ); Thu, 22 Jul 2021 11:57:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 47AE06135B; Thu, 22 Jul 2021 16:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971878; bh=IS1vLpPz6uocNDSd2Xrszaj7fRjp7DbJLKWZOOhIkb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UYcjXMqt/PLVaerqO9bJEUycue2l5g0HPOFWqpacc6iU6A5NBYMEcPi+X1t0Dnptz oUrguImsdY33HQw2wS+TcgjZ6axA1CgqtPwlE6wpcEz2tjpY8t/IQgbhPvKv0d5yJd 4jr0pphGIHLVBAUH0TdTt6EMJIPJ/EQRS1JrT7dM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thierry Reding , Sasha Levin Subject: [PATCH 5.10 061/125] firmware: tegra: bpmp: Fix Tegra234-only builds Date: Thu, 22 Jul 2021 18:30:52 +0200 Message-Id: <20210722155626.723179459@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding [ Upstream commit bd778b893963d67d7eb01f49d84ffcd3eaf229dd ] The tegra186_bpmp_ops symbol is used on Tegra234, so make sure it's available. Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- 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