From patchwork Mon Dec 28 12:45:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352693 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9806960jai; Mon, 28 Dec 2020 06:58:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJypjJ5e5fY9bNR8u2uP3CI5RCvIGImGZN6KtnknIMPmVAIWgH1THnpi8PLLkpC5O3Vn82mH X-Received: by 2002:a17:906:b217:: with SMTP id p23mr2852103ejz.461.1609167527935; Mon, 28 Dec 2020 06:58:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167527; cv=none; d=google.com; s=arc-20160816; b=xf5DqJR7V7+lxdbXZm/Oh1FOmYMbQytoe0Gy8q8sCK4FVvJdaB2QFvWaQe5DhgEFy6 g6Iw72XypCwPea3Q1gwDJt7VXreB3yLdspgO9Id8fV43QR+68HKekESOTyKaCtN0hzdp pkZqYNpXmebtqCWaKMgn8ZkccQWM6rZoXkEjOvqkZA1YTSnX2eium3l0M0d55yf2zLr+ ByX30OLDFensgQ/PCxX+Bko1ureLre6cfRQJCUps981pb/l5uiHLbCAIZcDOvjYc/6ka CiUUgcw5PoGyXa7aBapaPqxpvE/bgkNxngVI+Ow73hdpWN+X9dHKYonvQVes4r+TQ8TY cHgQ== 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=wBCqwT38yYhjrupDETQJ0AQXeNbtdZlfuxjRn2QUr84=; b=MERjL0Ou9vbcDPv5qlAHwEOJz5t0NBR/migyAJGDn2KY+4LogFlM2kvd/a0XyFrc8A 8HUDTNV9aROeRkuQKN7G6Ha/3OrXPMJG86RlHCvkfOPx75Xi06BO87NWT9SXSeToIRlN fSJ/K4LP9lsSROvHy2s+5alrgj8/HqaTqV9vSUsnl0aAMRGBvzF5NIrFgYlgUjc8j0Wd Uj5Bllr/eT9aTRz4OhtR+DrznvwOTAxpaY6fzri7QQsZJC+lD02sj+UTKpGG9VanR12J RrXXuw0pX9n4ZxGB/S3QVNEa4UEvbW+TbPegx+uG0u01QpuGK2f+2JYqNkbewofPm/ff XMYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0VJrPquQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 m6si19388054edr.532.2020.12.28.06.58.47; Mon, 28 Dec 2020 06:58:47 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=0VJrPquQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S2440658AbgL1OPe (ORCPT + 14 others); Mon, 28 Dec 2020 09:15:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:50406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440678AbgL1OPb (ORCPT ); Mon, 28 Dec 2020 09:15:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8DE2B207B2; Mon, 28 Dec 2020 14:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164890; bh=ru7VfCUzhDwXPSmUE9w67o+EJFfnR3QxtyIwwT1hSDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0VJrPquQ1MMmTgYbpmqbNylFku/8hnt/s/zvGsCcWe9H1wZerFfjirkhqHyhexBFH Flsj+v2uxpk2cis0tAu5V4Kp2yzOMj1Lc9iO0J1xs8IiohxXdVXgSaOEcPsdCiMrOD 2yCwz/1T5qmk7T1AEy5DoUVp2+vvqXAFzxjlZMG0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacopo Mondi , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.10 335/717] staging: bcm2835: fix vchiq_mmal dependencies Date: Mon, 28 Dec 2020 13:45:33 +0100 Message-Id: <20201228125037.070890072@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 6c91799f59ed491a2b5bf5ef7c6d60306cda4e09 ] When the MMAL code is built-in but the vchiq core config is set to =m, the mmal code never gets built, which in turn can lead to link errors: ERROR: modpost: "vchiq_mmal_port_set_format" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_port_disable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_port_parameter_set" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_component_finalise" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_port_connect_tunnel" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_component_enable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_finalise" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_component_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_component_disable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "mmal_vchi_buffer_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_port_enable" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_version" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_submit_buffer" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_init" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "mmal_vchi_buffer_cleanup" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! ERROR: modpost: "vchiq_mmal_port_parameter_get" [drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko] undefined! Change the Kconfig to depend on BCM2835_VCHIQ like the other drivers, and remove the now redundant dependencies. Fixes: b18ee53ad297 ("staging: bcm2835: Break MMAL support out from camera") Acked-by: Jacopo Mondi Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20201203223836.1362313-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/vc04_services/vchiq-mmal/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig index 500c0d12e4ff2..c99525a0bb452 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig @@ -1,6 +1,6 @@ config BCM2835_VCHIQ_MMAL tristate "BCM2835 MMAL VCHIQ service" - depends on (ARCH_BCM2835 || COMPILE_TEST) + depends on BCM2835_VCHIQ help Enables the MMAL API over VCHIQ interface as used for the majority of the multimedia services on VideoCore.