Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp694513pxv; Thu, 22 Jul 2021 09:53:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJxa9J3SXPagIv8vXx2WIiu4gcLfytOqzi86cxd8wsqz5Hsx6LecYmhznlieoPTIByY09E X-Received: by 2002:a05:6402:4d1:: with SMTP id n17mr615868edw.337.1626972806556; Thu, 22 Jul 2021 09:53:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972806; cv=none; d=google.com; s=arc-20160816; b=dB1Bc9IDa93ENfQlpVNbBY6OaksI2UVGX0J5EKMlbdTbP0fsdxTDLs/cQNT174+19L KHRcTtfbuZaosmAks2u1h4Ijk1pmSKVZGUPhmY6zywP59ujRQOUOiA0I8AF+AfwpKBX3 Y2fpVeERRyhPtv/QMLBIgjDNKPcLscdhFWVHxdtAnjNqJ5W+0/KQhdWCw/mdHa7h5zx4 hANcCdPxwmy80IaasRP6oSdfoLCiDvL+GTh+schWakYoTTWmVoGmbH2HHYOZ6wNK+c6T moi6LnjkhGTg+FLEjTi8FFC3zw5tnl9Cxbw0N+X4/VnCeoQsqks8v9y+fQHDkU7yX/tK zeXg== 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=sX30qa6axaReek7NhrxSwKb51lz2q4xdoa8LMDO8dJhcIPPw+ZtKXOC6aXllfOHlY3 ziczoAx3jQjPxfJ14R7EUl7Z4M1iW8sTkAJwgYs6WCG84aWL4yPjntvadUOHFQLoLX1O BrZZ98Ck4tQ3McJpbEflrT3TeVKTJgxqSYjo0W+ldKJpj7gc8ReO7J1/8mm4PVaC2X/b iTgT86e2510T0qVtqa3X2sCdgT/pxiOB40J9QbiscoR02mypAg68SlVpxRysrO27HC+e thd7RHRPNp7meQr+mWIrub6I7BW606IiewSA5wz90yuCJzLk/HssNEwGB6b5pt767pjL rCWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=X6tBH0i9; 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 ce16si16965327ejb.307.2021.07.22.09.53.03; Thu, 22 Jul 2021 09:53:26 -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=X6tBH0i9; 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 S235022AbhGVQLI (ORCPT + 99 others); Thu, 22 Jul 2021 12:11:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:47916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234363AbhGVQGe (ORCPT ); Thu, 22 Jul 2021 12:06:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09FDC61363; Thu, 22 Jul 2021 16:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972428; bh=IS1vLpPz6uocNDSd2Xrszaj7fRjp7DbJLKWZOOhIkb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X6tBH0i9XjtfvXtGyC4smGm4yeJJONwrRjfZirH+ngvRjM3ZxUfOGHtTpWqSQQxuK B/0er2nOG/ME0Eghka6QlCP/i8ZmIudobwRz0pepokIHdk8bkZq0oA8EcFxzD/IHRR DmO+IOOjx7z3ayeMRvX62LvqmmHjqKk0t/e9RgKg= 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.13 076/156] firmware: tegra: bpmp: Fix Tegra234-only builds Date: Thu, 22 Jul 2021 18:30:51 +0200 Message-Id: <20210722155630.850609367@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@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