Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp859935pxu; Thu, 3 Dec 2020 14:41:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTpshCvv9oG6sat1e0ioo2W9t5azOX5U958KUo9uKKTUbm7zgsiJ3IWeajU5SdF/Am5tSD X-Received: by 2002:a50:99cb:: with SMTP id n11mr4863232edb.362.1607035284615; Thu, 03 Dec 2020 14:41:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607035284; cv=none; d=google.com; s=arc-20160816; b=VdT1JvJDo6jpbILdritFr8BFJfCcso+8y+lKODZ8BLWcxUm2PcO0rHg//xm9HHJMbQ LCD6shN1KtyL8KREKLWAqfag6MzuOCnPnpMeXNF/A6prvBwvZDk4QxqUffqbpMUxu90q 0jlOFxH1inVYljnPxoN6pWzbVqLxRh3AprILczylxbitOFicMe1/HN5H/F2upHo6aX9P by7ys7Xrj/Bf4aeEWQ02V+H1kTjTj18RzEDznp3DDD0FO8BeFGC+M/eX3qUs6Tr0nVxV BkavPuzNoV04y0RI4UVM8YV5DIryYaqQJv2wMxbVscM1feHdn1AD9C7jCjb365kiWsjh puKw== 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 :message-id:date:subject:cc:to:from; bh=l/lA6515R6vvzgOBNbwsQXPVWzE5h2EdKCEsCp5jZQM=; b=YfrGhWK8t9koeRkR2DdfGD4MipfHiOsLv1GvW+uYybIcYDQQYYE+MCyNR5VgNTowmY Iz87tENciGozZI5YstyNIgjrB6GmMIa4ykIJF16b11clEDeMOKfaCIBQZ6ngVAHLzrT4 tchalnuB3iX0wFC9n0iaPuusonerk7ESq4GkWSVp2XxtYN2tc4VTS98jtPT1pMTGJJsc GZIlqQPQq2PTNG1fIdHwetEQ1C28bEVRSs6z65y4DEq9RqQGF+izIJTV3W63+qqxU8Ua WW+Md2Bzi5Z3Ki7sr/ovtW4mPL/MRgWfXaOEjyMLXcVEE9f216B75yT4ZmTiH/mmYcrf nxqg== ARC-Authentication-Results: i=1; mx.google.com; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hq35si223671ejc.633.2020.12.03.14.41.01; Thu, 03 Dec 2020 14:41:24 -0800 (PST) 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; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731951AbgLCWjW (ORCPT + 99 others); Thu, 3 Dec 2020 17:39:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:57476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731901AbgLCWjW (ORCPT ); Thu, 3 Dec 2020 17:39:22 -0500 From: Arnd Bergmann Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: Nicolas Saenz Julienne , Greg Kroah-Hartman , Jacopo Mondi Cc: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: bcm2835: fix vchiq_mmal dependencies Date: Thu, 3 Dec 2020 23:38:30 +0100 Message-Id: <20201203223836.1362313-1-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann 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") Signed-off-by: Arnd Bergmann --- drivers/staging/vc04_services/vchiq-mmal/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig index 500c0d12e4ff..c99525a0bb45 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. -- 2.27.0