From mboxrd@z Thu Jan 1 00:00:00 1970 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 3BFB4E7C4F6 for ; Thu, 5 Oct 2023 08:04:50 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/XN91B7CKj7l/2mpJZjW3Neoj7R3c2zRmnu5hS1uhek=; b=HEzaWQ2daXbDyu phZTpcnj7QAZK3j5VTsyw9sarHdFVBWGw9oJyvLpZ7P/UwuGbFI/JfjrRCbn6TYEO3p+irzJvBg5H cpcHnrmus7jSt9xCG6S4MPN9NWOKYCnZuPH2vzTZRRu+LE2mpcfCXCrIIgG5HHPtzfaw02AxsQhea hlfwixdhAfrsMDIOC/4990cvhhwAziM8Khc9PW2V9HyyMN2TR4JS2sFJANFadpEWcH6MNtCXidR33 OJ94nYR65Ra+mwky34R4j6sLW2kTWi0I5jvQPebeHDFULC+uO10RIEZ2GHGdyh/kJI2XpCkiEJdKr gdFKCIBteSrmFuLjJw4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qoJLF-001e0B-2w; Thu, 05 Oct 2023 08:04:17 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qoJLC-001dyI-2T; Thu, 05 Oct 2023 08:04:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id E3FEDCE1DE2; Thu, 5 Oct 2023 08:04:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5A15C4166B; Thu, 5 Oct 2023 08:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696493052; bh=bhrFsDpbzXSbshflQPJ73aE6VYGi2Pa16fWZ0LDK9cA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FBfUn83j17Q26OciLdhKLUQDfdTu7vc998nDCD56wiDoRzUXMkv7OgqEmf2h6uVbW DZ7dxiWo1Dsgxjfn7ToPkm9PDfnS9FYaDtTJ8SNRri2Ox+RxFkgQqy/IM98hqfJjWT KPWljbuB0/iLQSGu1vHCUENWxzuJEnAuVmbZqI2M= Date: Thu, 5 Oct 2023 10:04:09 +0200 From: Greg Kroah-Hartman To: Umang Jain Cc: linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren , Florian Fainelli , Adrien Thierry , Dan Carpenter , Dave Stevenson , Kieran Bingham , Laurent Pinchart Subject: Re: [PATCH v12 5/6] staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type Message-ID: <2023100542-gluten-rally-5a96@gregkh> References: <20230923143200.268063-1-umang.jain@ideasonboard.com> <20230923143200.268063-6-umang.jain@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230923143200.268063-6-umang.jain@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231005_010415_153114_866335E7 X-CRM114-Status: GOOD ( 22.87 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Sep 23, 2023 at 08:01:59PM +0530, Umang Jain wrote: > Register the bcm2835-camera with the vchiq_bus_type instead of using > platform driver/device. > > Since we moved away bcm2835-camera from platform driver/device, > we have to set the DMA mask explicitly. Set the DMA mask at probe > time. > > Also the VCHIQ firmware doesn't support device enumeration, hence > one has to maintain a list of devices to be registered in the interface. > > Signed-off-by: Umang Jain > --- > .../bcm2835-camera/bcm2835-camera.c | 21 ++++++++++--------- > .../interface/vchiq_arm/vchiq_arm.c | 11 +++++++--- > 2 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > index fcad5118f3e8..c873eace1437 100644 > --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > @@ -11,6 +11,7 @@ > * Luke Diamand @ Broadcom > */ > > +#include > #include > #include > #include > @@ -24,8 +25,8 @@ > #include > #include > #include > -#include > > +#include "../interface/vchiq_arm/vchiq_bus.h" > #include "../vchiq-mmal/mmal-common.h" > #include "../vchiq-mmal/mmal-encodings.h" > #include "../vchiq-mmal/mmal-vchiq.h" > @@ -1841,7 +1842,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 vchiq_device *device) > { > int ret; > struct bcm2835_mmal_dev *dev; > @@ -1852,9 +1853,9 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) > unsigned int resolutions[MAX_BCM2835_CAMERAS][2]; > int i; > > - ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > + ret = dma_set_mask_and_coherent(&device->dev, DMA_BIT_MASK(32)); > if (ret) { > - dev_err(&pdev->dev, "dma_set_mask_and_coherent failed: %d\n", ret); > + dev_err(&device->dev, "dma_set_mask_and_coherent failed: %d\n", ret); > return ret; > } > > @@ -1902,7 +1903,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->dev, "%s: could not register V4L2 device: %d\n", > __func__, ret); > goto free_dev; > } > @@ -1982,7 +1983,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) > return ret; > } > > -static void bcm2835_mmal_remove(struct platform_device *pdev) > +static void bcm2835_mmal_remove(struct vchiq_device *device) > { > int camera; > struct vchiq_mmal_instance *instance = gdev[0]->instance; > @@ -1994,17 +1995,17 @@ static void bcm2835_mmal_remove(struct platform_device *pdev) > vchiq_mmal_finalise(instance); > } > > -static struct platform_driver bcm2835_camera_driver = { > +static struct vchiq_driver bcm2835_camera_driver = { > .probe = bcm2835_mmal_probe, > - .remove_new = bcm2835_mmal_remove, > + .remove = bcm2835_mmal_remove, > .driver = { > .name = "bcm2835-camera", > }, > }; > > -module_platform_driver(bcm2835_camera_driver) > +module_vchiq_driver(bcm2835_camera_driver) > > MODULE_DESCRIPTION("Broadcom 2835 MMAL video capture"); > MODULE_AUTHOR("Vincent Sanders"); > MODULE_LICENSE("GPL"); > -MODULE_ALIAS("platform:bcm2835-camera"); > +MODULE_ALIAS("bcm2835-camera"); Now that you are on your own bus, why do you need the MODULE_ALIAS() line at all? thanks, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel