From patchwork Wed Jan 18 19:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BF2F6C32793 for ; Wed, 18 Jan 2023 19:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gamNQ84E8rsL+yS8glMB0CGbmsblcjbMsFXHxNYvULY=; b=uOePYs2cDRb1wG +N5P/VEznlKSPWcCp2u8bzYjPbnLc+jUcTRG99Ix3LyRXS6feO3O5lGqFTV9oUM6TzccocHj1lp/K /Ywmsw38x4vYeR7oWo3HRZodD3erGi/Ik7QVrxUVNWnEsDul9Gg9Wp7+kcI4/1iI+BmBmRViBsRo6 mZGoK2RRp4LGxeYvN37wiZJ9uDshulx4qqSvWnmg04OSPUrOl+Z1BpogWNLWSX0y4SQNCShVdkKyl FnuOXsVUrnW+VoehmEZhXo62Gl+xMWhoaqEUrrlJ2+yQV3fJG1zK1hX3aVRmfXFzwSiYQD6tiBPf+ cTQa+V+G1ne9BmfEdihw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxK-002Rar-C3; Wed, 18 Jan 2023 19:18:42 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxE-002RZA-S4; Wed, 18 Jan 2023 19:18:38 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E3293158E; Wed, 18 Jan 2023 20:18:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069514; bh=BwKY49SsGRfLKtwynm1ZtOjuQBk6X8yUktR1hkyodis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pz1CU3PqffAhIFYxIVlbenqt63EbVRewfW9KV/04OnuRZ8K8WgXJvU+xPJv4QnYsy LU5nnCcv5puDeeiru70KANkamo1qvsg6DbQn/hvC7i8czU4zDg7LM5Ll1t3ECYtbbQ Nk7atFrlBSX6ChjNugXvVVRrTh13l42obt6yIEwY= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 1/6] staging: vc04_services: Drop __VCCOREVER__ remnants Date: Thu, 19 Jan 2023 00:48:06 +0530 Message-Id: <20230118191811.208552-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111837_087848_5C25448C X-CRM114-Status: UNSURE ( 9.72 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 8ba5f91bab63("staging: vc04_services: remove __VCCOREVER__") was meant to remove all of __VCCOREVER__ definitions but missed to remove a few. Hence, drop them now. Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 +- drivers/staging/vc04_services/bcm2835-camera/Makefile | 3 +-- drivers/staging/vc04_services/vchiq-mmal/Makefile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile index d59fe4dde615..fc7ac6112a3e 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/Makefile +++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile @@ -2,4 +2,4 @@ obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o -ccflags-y += -I $(srctree)/$(src)/../include -D__VCCOREVER__=0x04000000 +ccflags-y += -I $(srctree)/$(src)/../include diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 3a76d6ade428..3494c82b271a 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -7,5 +7,4 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o ccflags-y += \ -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../vchiq-mmal/ \ - -D__VCCOREVER__=0x04000000 + -I $(srctree)/$(src)/../vchiq-mmal/ diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile index b2a830f48acc..c7d3b06e17ce 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile @@ -5,5 +5,4 @@ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o ccflags-y += \ -I$(srctree)/$(src)/.. \ - -I$(srctree)/$(src)/../include \ - -D__VCCOREVER__=0x04000000 + -I$(srctree)/$(src)/../include From patchwork Wed Jan 18 19:18:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106962 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33DACC38147 for ; Wed, 18 Jan 2023 19:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=w7RsKMVwcWfAoZU403UlVyajrmT76+SwwqjaAFkmDBY=; b=wtHAN+zaHcQxrv F1sUtCkUgquM4bXegA+sMt/NNPYWpWg39CCXm8ByDOvZ/ei0QB0Ktp0U1zjEwiOVi79+fdI5Y34sW Zle8qq9XYxqAS8qYLARE00aekNVXq0bHekXq9tg612CssVER1BMtxyp4dzBQFC6+2rfjC+oVNatLH HynpEfA7qyMlIp0XVEvQvR2WjeM4oQl34xKL9pY2gLJExO4/cId63gkXhOmvsnwTHMAmTB19fyHP5 I8rOkfnty/fR/T8Cw9hPmU42vpMX4IDSG5Z2RAb6Zf1TXlm0cLN/xtUv0W305xDS3A6aOJElawbeG SfRgwj0FjHr28eMEV7TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxT-002Rds-I9; Wed, 18 Jan 2023 19:18:51 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxL-002Rb1-GL; Wed, 18 Jan 2023 19:18:44 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 839E51056; Wed, 18 Jan 2023 20:18:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069522; bh=psqCt6za/rWwlS8mx3H67DzrDFITmHUqUzosgzjCokY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAJ9Y52AiPrqGZhBONG9RqjapRQzUKzvOGwsc8HSlPY+buefXW3uFeDrj9roboLs2 V9BKgWtND9DZQpgd56Kt32KWzQnt00jZaEbObbg8DdYjwLEdXZ95XmYvCzFRlfI/KK 2/7pe96HfLZtF+3uvSMFnqupGZUlRnSR1AEUBzQI= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 2/6] vc04_services: bcm2835-audio: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:07 +0530 Message-Id: <20230118191811.208552-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111843_716802_EE4BEBA8 X-CRM114-Status: GOOD ( 10.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop the include directive they can break the build one only wants to build a subdirectory. Replace with "../" for the includes, in the bcm2835.h instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 -- drivers/staging/vc04_services/bcm2835-audio/bcm2835.h | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile index fc7ac6112a3e..01ceebdf88e7 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/Makefile +++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile @@ -1,5 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o - -ccflags-y += -I $(srctree)/$(src)/../include diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h index 38b7451d77b2..0a81383c475a 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -6,11 +6,12 @@ #include #include -#include #include #include #include +#include "../include/linux/raspberrypi/vchiq.h" + #define MAX_SUBSTREAMS (8) #define AVAIL_SUBSTREAMS_MASK (0xff) From patchwork Wed Jan 18 19:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106963 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79A6CC32793 for ; Wed, 18 Jan 2023 19:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cSj/SkXpYwP9G8G9I+Mb3hAD5tIQKLLK8N4fQCDbXVM=; b=AmU0Ue0mUYAnG6 NGE9QDgpFFNLDQB/KZ2mlnlF7p8htHlaO8SS+svt+hiVI5ctMuc8Sk6WKvyCIWwPQuZCTtLIiXec8 jgOvC+xYlHTnp0TV+uc6nUhNl3KB9EvK1CeDwzhyimsmgLQ8T0wm9XTjlZhy/pj6FLULzPPMnWJqc LQwArq/tCDsJ1gOpAyB0+mS6O58IiOkoDJv+2J4sjvG51uC92iZvsNzJmrbuhZWZdfhEiI+0coh1z fq0/r92fc7PnBiVuvXY32bUx7nhESPnK9WryHQUhGk/8d2BqtvvJzc5uv6IcjeHm80xplIJ9lmQk4 bdLEEmif83mHQHTX2Lvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxc-002Rgr-Q4; Wed, 18 Jan 2023 19:19:00 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxS-002RdD-Lf; Wed, 18 Jan 2023 19:18:52 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AC6CB158E; Wed, 18 Jan 2023 20:18:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069529; bh=mqcrmgKlmNwZ/4j0H9w4QnhJtOQYVKklQnpKaMrxgQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EUD7YRa2wdvmnQC4BXu+KgSvft4jaJHEjf3GNj1no0n1//Q0kZWtAhO/3BJ4AGM1U Pe8RhT3MVjGzNW+NDfnSwOZCA2tKpbKd3iq/NzKmGp+koTgvUZIbjyXmMS05m+kdyZ gqlLMQd9Im+UcrPVz66i+CKmv7imxcF1+DUbhAD0= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 3/6] vc04_services: bcm2835-camera: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:08 +0530 Message-Id: <20230118191811.208552-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111850_883400_FE11A6F0 X-CRM114-Status: GOOD ( 10.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop the include directive they can break the build one only wants to build a subdirectory. Replace with "../" for the includes, in the bcm2835-camera files instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/bcm2835-camera/Makefile | 4 ---- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +++++----- .../staging/vc04_services/bcm2835-camera/controls.c | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 3494c82b271a..203b93899b20 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile @@ -4,7 +4,3 @@ bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \ controls.o obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o - -ccflags-y += \ - -I $(srctree)/$(src)/.. \ - -I $(srctree)/$(src)/../vchiq-mmal/ diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 797ebe2a973a..4f81765912ea 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -26,11 +26,11 @@ #include #include -#include "mmal-common.h" -#include "mmal-encodings.h" -#include "mmal-vchiq.h" -#include "mmal-msg.h" -#include "mmal-parameters.h" +#include "../vchiq-mmal/mmal-common.h" +#include "../vchiq-mmal/mmal-encodings.h" +#include "../vchiq-mmal/mmal-vchiq.h" +#include "../vchiq-mmal/mmal-msg.h" +#include "../vchiq-mmal/mmal-parameters.h" #include "bcm2835-camera.h" #define MIN_WIDTH 32 diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c index 5644d1d457b9..6bce45925bf1 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c @@ -23,9 +23,9 @@ #include #include -#include "mmal-common.h" -#include "mmal-vchiq.h" -#include "mmal-parameters.h" +#include "../vchiq-mmal/mmal-common.h" +#include "../vchiq-mmal/mmal-vchiq.h" +#include "../vchiq-mmal/mmal-parameters.h" #include "bcm2835-camera.h" /* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -4.0 to +4.0. From patchwork Wed Jan 18 19:18:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106964 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77F56C32793 for ; Wed, 18 Jan 2023 19:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aqiAH+bHd6vnDBIv9/CE6n2c1qJ60g7nx2KT8jV0VqA=; b=VNDoCYGnnrwQJg RqUSQ6r2xpDa3ExpLdENhvH2DSHuPJrxbaeyXL+RxcdAgWuWQmPpBc2BMdI00FupkdM41Dx7P+bLK 3tHbqiRw1+SJTIC73RBlZukpXjnNuXc+zH+fetGAyCxYZPd2fhTYWIi/hM3aRL0Q+YKLU/1Do82Ok 5m+vptRwe+xBhrJ7nxK7BwUOWMih69tJHR6mW6q9lORNM6qVima3AuTw6+dEF2jh9y0yN0XKFLxrM UO0bceDbsT5dwBjx0pBEEIEexdNGQqTRGVJNhLEi2h87y7AU92Z1bV4q1x5DgXzAEqQwla2Ol5S87 gZCYvBwSK7GB7a1WtXnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxo-002RmD-8E; Wed, 18 Jan 2023 19:19:12 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxb-002RgM-Vc; Wed, 18 Jan 2023 19:19:01 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 667591056; Wed, 18 Jan 2023 20:18:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069538; bh=+PIqosEfP+3HYLMfQ6JbsMBronwbnjz96aQGq+N2CTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pi6XHOjq4artr+hK1B+r5a9I4ThZKP5lqO87TdRR4LnT4WuPBdinA79PI1sujrPD/ VH2ExsrLO48DzQ6gXAn2vrhVDlkqDDVyZ/1F4dqYUk6u9aWDUx9I5hQs1wp/1C9bZX OVWbg2ouKMPbzEX7jRCSbRRKO3uqSdZA4xIn2mTs= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 4/6] vc04_services: vchiq-mmal: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:09 +0530 Message-Id: <20230118191811.208552-5-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111900_197184_5B813ECF X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop the include directive they can break the build one only wants to build a subdirectory. Replace with "../" for the includes, in the mmal-vchiq.c instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/vchiq-mmal/Makefile | 4 ---- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile index c7d3b06e17ce..6937f6534c26 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile @@ -2,7 +2,3 @@ bcm2835-mmal-vchiq-objs := mmal-vchiq.o obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o - -ccflags-y += \ - -I$(srctree)/$(src)/.. \ - -I$(srctree)/$(src)/../include diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c index 6b5879a33780..234e3764db64 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -23,9 +23,9 @@ #include #include #include -#include #include +#include "../include/linux/raspberrypi/vchiq.h" #include "mmal-common.h" #include "mmal-vchiq.h" #include "mmal-msg.h" From patchwork Wed Jan 18 19:18:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106965 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06DB9C38147 for ; Wed, 18 Jan 2023 19:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FIpCi+by1RmvUYByKgrx81r6q/865A72STMG/Bvxd7c=; b=lSUrmPgc6GUn/l HZfqkLg+htcIJri8jDvNbKgTI/iY5gSRg8iVmEsYAsJEiq+9btnt3GzH4gpPeV89ppXAHglwRjovJ f+8XcChmCx+LZFQzavKi8ZqyeXkNoaGRO9KzKBi7/9aC/BNSs7AMPct5TgNnQhgQWwUwgzpzSIytz 78NodY0/o7R7GW4qqdupx85vDjPsWzTvTu86vS4/NbCsorgFwBpEaSzcIuiAfboXf/IO3S6sLqZ0B 5iPTr01GEa6XB85aYuCNUJ/az5DUJ+5rTWTMoxRCAGK3MNdMgHd1cIyIDFG70EGAtXEKxBTZSZruF cg+6sTxJixpMuZo0oEnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDy4-002Rtf-6G; Wed, 18 Jan 2023 19:19:28 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxi-002Rju-SN; Wed, 18 Jan 2023 19:19:08 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 493F3158E; Wed, 18 Jan 2023 20:18:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069545; bh=dMHCbrz0mI0q2foYrd80/bZE6sYjFmNjq2hzq9Ngwic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K4Soc2vfgEjDIRa0cFIGwrRsF7klHc/Cs8VV7W/8t5wMCrh5HM0PL52Pn4c5XgVjk kAbrZLEoFU4mxNqutcLr5yDiz7wKBzHv+XUV1QxekrydDFvxsXr+EYuzeTnqGEiRLe eLIejk78/XVeKG9VcuTmv7NAzcLIru6aymRKKAc4= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 5/6] vc04_services: interface: Drop include Makefile directive Date: Thu, 19 Jan 2023 00:48:10 +0530 Message-Id: <20230118191811.208552-6-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111907_090884_53321BF6 X-CRM114-Status: GOOD ( 10.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop the include directive they can break the build one only wants to build a subdirectory. Replace with "../" for the includes, in the interface/ files instead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Umang Jain --- drivers/staging/vc04_services/Makefile | 2 -- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index 1fd191e2e2a5..44794bdf6173 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -15,5 +15,3 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/ -ccflags-y += -I $(srctree)/$(src)/include - diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index ec3505424718..12da398c6115 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -10,8 +10,8 @@ #include #include #include -#include +#include "../../include/linux/raspberrypi/vchiq.h" #include "vchiq_cfg.h" /* Do this so that we can test-build the code on non-rpi systems */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h index 96f50beace44..17550831f86c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h @@ -5,7 +5,8 @@ #define VCHIQ_IOCTLS_H #include -#include + +#include "../../include/linux/raspberrypi/vchiq.h" #define VCHIQ_IOC_MAGIC 0xc4 #define VCHIQ_INVALID_HANDLE (~0) From patchwork Wed Jan 18 19:18:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13106966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7295C32793 for ; Wed, 18 Jan 2023 19:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6iB329gwDGYuB8rMTi4bzb/v7s1QOHinQmHfETh2ncs=; b=W+LKjSt7Dk8ZFw LBD7PhVUHVOXT6tGkWDfMjnYLrUq+FKO8NdDdtelGqrA9yqZuQzKwNhmGmNwR3GkWhHNewxpCLbO9 Q/VRFCER338xk6ONgIEvuVEEc9rAHKVxJJ5J4eVNqe/OBd0/YCG1INpNeLvjGxomRcnzr9W9Qy6eC tB7iAFE4UqevLGn3dv7KVWYDdPyMspSJqqQ6YZGSgB5TOr26sL2N9u2bXr0kRTDqDjsLSK7vSJOME sCW+VMrRdBxK1+XIoe2Ju3cPBUL4jwO6VNxO2V2/AUjBawgTjej3yZ7WjISaFN03ND88lpV8edlLS SV7Jx7wDxBTO71gxbITw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDyK-002S2S-73; Wed, 18 Jan 2023 19:19:44 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pIDxq-002Rn6-BU; Wed, 18 Jan 2023 19:19:16 +0000 Received: from umang.jainideasonboard.com (unknown [IPv6:2405:204:820c:4b28:9aaf:3c:ef34:ecdd]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 44A0A1056; Wed, 18 Jan 2023 20:19:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674069553; bh=v7f2EepVufrbXEZ17JZNbOqBSaSez3VNJ0FenZNNITU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fgxgii/T8W/KCP1MmqKx/qWjYOiaFcmxtzdXmmuDidXNmNN+J+nGKyXbN+dunckMy GbOMV+ay1Nxz07kDBi+A/YS9XDT6DnmivgL5NrhpuoqTbhfRUjmxReg80AbgtPqauZ fhjudRJ2PyzxaMJ90EtLFQsKwCXDlAAMKVzMRoPc= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Nicolas Saenz Julienne , Phil Elwell , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH v4 6/6] staging: vc04_services: vchiq: Register devices with a custom bus_type Date: Thu, 19 Jan 2023 00:48:11 +0530 Message-Id: <20230118191811.208552-7-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118191811.208552-1-umang.jain@ideasonboard.com> References: <20230118191811.208552-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_111914_600149_5E436636 X-CRM114-Status: GOOD ( 29.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The devices that the vchiq interface registers(bcm2835-audio, bcm2835-camera) are implemented and exposed by the VC04 firmware. The device tree describes the VC04 itself with the resources required to communicate with it through a mailbox interface. However, the vchiq interface registers these devices as platform devices. This also means the specific drivers for these devices are also getting registered as platform drivers. This is not correct and a blatant abuse of platform device/driver. Replace the platform device/driver model with a standard device driver model. A custom bus_type, vchiq_bus_type, is created in the vchiq interface which matches the devices to their specific device drivers thereby, establishing driver binding. A struct vchiq_device wraps the struct device for each device being registered on the bus by the vchiq interface. Each device registered will expose a 'name' read-only device attribute in sysfs (/sys/bus/vchiq-bus/devices). New devices and drivers can be added by registering on vchiq_bus_type and adding a corresponding device name entry in the static list of devices, vchiq_devices. There is currently no way to enumerate the VCHIQ devices that are available from the firmware. Signed-off-by: Umang Jain --- .../vc04_services/bcm2835-audio/bcm2835.c | 19 ++- .../bcm2835-camera/bcm2835-camera.c | 17 ++- .../interface/vchiq_arm/vchiq_arm.c | 121 +++++++++++++++--- .../interface/vchiq_arm/vchiq_arm.h | 1 + 4 files changed, 117 insertions(+), 41 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c index 00bc898b0189..9f3af84f5d5d 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -1,12 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright 2011 Broadcom Corporation. All rights reserved. */ -#include - #include #include #include +#include "../interface/vchiq_arm/vchiq_arm.h" #include "bcm2835.h" static bool enable_hdmi; @@ -268,9 +267,8 @@ static int snd_add_child_devices(struct device *device, u32 numchans) return 0; } -static int snd_bcm2835_alsa_probe(struct platform_device *pdev) +static int snd_bcm2835_alsa_probe(struct device *dev) { - struct device *dev = &pdev->dev; int err; if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { @@ -292,30 +290,29 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) #ifdef CONFIG_PM -static int snd_bcm2835_alsa_suspend(struct platform_device *pdev, +static int snd_bcm2835_alsa_suspend(struct device *pdev, pm_message_t state) { return 0; } -static int snd_bcm2835_alsa_resume(struct platform_device *pdev) +static int snd_bcm2835_alsa_resume(struct device *pdev) { return 0; } #endif -static struct platform_driver bcm2835_alsa_driver = { +static struct device_driver bcm2835_alsa_driver = { .probe = snd_bcm2835_alsa_probe, #ifdef CONFIG_PM .suspend = snd_bcm2835_alsa_suspend, .resume = snd_bcm2835_alsa_resume, #endif - .driver = { - .name = "bcm2835_audio", - }, + .name = "bcm2835_audio", + .bus = &vchiq_bus_type, }; -module_platform_driver(bcm2835_alsa_driver); +module_driver(bcm2835_alsa_driver, driver_register, driver_unregister); MODULE_AUTHOR("Dom Cobley"); MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 4f81765912ea..199a49f9ec1e 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -24,8 +24,8 @@ #include #include #include -#include +#include "../interface/vchiq_arm/vchiq_arm.h" #include "../vchiq-mmal/mmal-common.h" #include "../vchiq-mmal/mmal-encodings.h" #include "../vchiq-mmal/mmal-vchiq.h" @@ -1841,7 +1841,7 @@ static struct v4l2_format default_v4l2_format = { .fmt.pix.sizeimage = 1024 * 768, }; -static int bcm2835_mmal_probe(struct platform_device *pdev) +static int bcm2835_mmal_probe(struct device *device) { int ret; struct bcm2835_mmal_dev *dev; @@ -1896,7 +1896,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) &camera_instance); ret = v4l2_device_register(NULL, &dev->v4l2_dev); if (ret) { - dev_err(&pdev->dev, "%s: could not register V4L2 device: %d\n", + dev_err(device, "%s: could not register V4L2 device: %d\n", __func__, ret); goto free_dev; } @@ -1976,7 +1976,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) return ret; } -static int bcm2835_mmal_remove(struct platform_device *pdev) +static int bcm2835_mmal_remove(struct device *device) { int camera; struct vchiq_mmal_instance *instance = gdev[0]->instance; @@ -1990,15 +1990,14 @@ static int bcm2835_mmal_remove(struct platform_device *pdev) return 0; } -static struct platform_driver bcm2835_camera_driver = { +static struct device_driver bcm2835_camera_driver = { + .name = "bcm2835-camera", .probe = bcm2835_mmal_probe, .remove = bcm2835_mmal_remove, - .driver = { - .name = "bcm2835-camera", - }, + .bus = &vchiq_bus_type, }; -module_platform_driver(bcm2835_camera_driver) +module_driver(bcm2835_camera_driver, driver_register, driver_unregister) MODULE_DESCRIPTION("Broadcom 2835 MMAL video capture"); MODULE_AUTHOR("Vincent Sanders"); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 22de23f3af02..86c8e5df7cf6 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -65,9 +67,6 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR; DEFINE_SPINLOCK(msg_queue_spinlock); struct vchiq_state g_state; -static struct platform_device *bcm2835_camera; -static struct platform_device *bcm2835_audio; - struct vchiq_drvdata { const unsigned int cache_line_size; struct rpi_firmware *fw; @@ -132,6 +131,51 @@ struct vchiq_pagelist_info { unsigned int scatterlist_mapped; }; +struct vchiq_device { + const char *name; + struct device dev; +}; + +static ssize_t vchiq_dev_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct vchiq_device *device = container_of(dev, struct vchiq_device, dev); + + return sprintf(buf, "%s", device->name); +} + +static DEVICE_ATTR_RO(vchiq_dev); + +static struct attribute *vchiq_dev_attrs[] = { + &dev_attr_vchiq_dev.attr, + NULL +}; + +ATTRIBUTE_GROUPS(vchiq_dev); + +static const struct device_type vchiq_device_type = { + .groups = vchiq_dev_groups +}; + +static int vchiq_bus_type_match(struct device *dev, struct device_driver *drv) +{ + if (dev->bus == &vchiq_bus_type && + strcmp(dev_name(dev), drv->name) == 0) + return 1; + return 0; +} + +struct bus_type vchiq_bus_type = { + .name = "vchiq-bus", + .match = vchiq_bus_type_match, +}; +EXPORT_SYMBOL(vchiq_bus_type); + +static const char *const vchiq_devices[] = { + "bcm2835_audio", + "bcm2835-camera", +}; + static void __iomem *g_regs; /* This value is the size of the L2 cache lines as understood by the * VPU firmware, which determines the required alignment of the @@ -1763,26 +1807,52 @@ static const struct of_device_id vchiq_of_match[] = { }; MODULE_DEVICE_TABLE(of, vchiq_of_match); -static struct platform_device * +static void +vchiq_release_device(struct device *dev) +{ + struct vchiq_device *device; + + device = container_of(dev, struct vchiq_device, dev); + kfree(device); +} + +static int vchiq_register_child(struct platform_device *pdev, const char *name) { - struct platform_device_info pdevinfo; - struct platform_device *child; + struct vchiq_device *device = NULL; + int ret; - memset(&pdevinfo, 0, sizeof(pdevinfo)); + device = kzalloc(sizeof(*device), GFP_KERNEL); + if (!device) + return -ENOMEM; - pdevinfo.parent = &pdev->dev; - pdevinfo.name = name; - pdevinfo.id = PLATFORM_DEVID_NONE; - pdevinfo.dma_mask = DMA_BIT_MASK(32); + device->name = name; + device->dev.init_name = name; + device->dev.parent = &pdev->dev; + device->dev.bus = &vchiq_bus_type; + device->dev.type = &vchiq_device_type; + device->dev.release = vchiq_release_device; + + ret = dma_set_mask_and_coherent(&device->dev, DMA_BIT_MASK(32)); + if (ret < 0) { + vchiq_release_device(&device->dev); + return ret; + } - child = platform_device_register_full(&pdevinfo); - if (IS_ERR(child)) { - dev_warn(&pdev->dev, "%s not registered\n", name); - child = NULL; + ret = device_register(&device->dev); + if (ret) { + put_device(&device->dev); + return -EINVAL; } - return child; + return 0; +} + +static int +vchiq_unregister_child(struct device *dev, void *data) +{ + device_unregister(dev); + return 0; } static int vchiq_probe(struct platform_device *pdev) @@ -1790,7 +1860,7 @@ static int vchiq_probe(struct platform_device *pdev) struct device_node *fw_node; const struct of_device_id *of_id; struct vchiq_drvdata *drvdata; - int err; + int i, err; of_id = of_match_node(vchiq_of_match, pdev->dev.of_node); drvdata = (struct vchiq_drvdata *)of_id->data; @@ -1832,8 +1902,12 @@ static int vchiq_probe(struct platform_device *pdev) goto error_exit; } - bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); - bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); + for (i = 0; i < ARRAY_SIZE(vchiq_devices); i++) { + err = vchiq_register_child(pdev, vchiq_devices[i]); + if (!err) + dev_err(&pdev->dev, "Failed to register %s vchiq device\n", + vchiq_devices[i]); + } return 0; @@ -1845,8 +1919,8 @@ static int vchiq_probe(struct platform_device *pdev) static int vchiq_remove(struct platform_device *pdev) { - platform_device_unregister(bcm2835_audio); - platform_device_unregister(bcm2835_camera); + bus_for_each_dev(&vchiq_bus_type, NULL, NULL, vchiq_unregister_child); + vchiq_debugfs_deinit(); vchiq_deregister_chrdev(); @@ -1866,6 +1940,10 @@ static int __init vchiq_driver_init(void) { int ret; + ret = bus_register(&vchiq_bus_type); + if (ret) + pr_err("Failed to register %s\n", vchiq_bus_type.name); + ret = platform_driver_register(&vchiq_driver); if (ret) pr_err("Failed to register vchiq driver\n"); @@ -1876,6 +1954,7 @@ module_init(vchiq_driver_init); static void __exit vchiq_driver_exit(void) { + bus_unregister(&vchiq_bus_type); platform_driver_unregister(&vchiq_driver); } module_exit(vchiq_driver_exit); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h index 2fb31f9b527f..98c3af32774a 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -81,6 +81,7 @@ extern int vchiq_susp_log_level; extern spinlock_t msg_queue_spinlock; extern struct vchiq_state g_state; +extern struct bus_type vchiq_bus_type; extern struct vchiq_state * vchiq_get_state(void);