[PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL

public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed

* [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL
@ 2025-09-07  8:56 Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 1/5] include: linux: Destage VCHIQ interface headers Jai Luthra
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Jai Luthra @ 2025-09-07  8:56 UTC (permalink / raw)
  To: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart,
	Jai Luthra, Umang Jain

Hi,

The goal of this series is to begin the destaging and upstreaming
process for various Raspberry Pi peripherals that currently interact
with the firmware using the VCHIQ interface present in the staging tree.

While destaging the interface to drivers/platform/raspberrypi, also move
the VCHIQ memory abstraction layer (MMAL) driver. Secondly, drop the
bcm2835-camera driver, as the bcm2835-unicam driver using V4L2 framework
is the recommended way to capture from CSI sensors on this platform.

The bcm2835-audio driver is left as-is in the staging tree, as I am not
an expert on ALSA. Volunteers are welcome :)

In (a) subsequent series, I will upstream the following components that
use VCHIQ interface:
- vc-sm-cma driver
- bcm2835-isp driver

Thanks,
	Jai

Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
---
Changes in v2:
- Destage to drivers/platform/raspberrypi instead
- Move BCM_VIDECORE menuconfig definition to the new directory's Kconfig
  along with BCM2835_VCHIQ and VCHIQ_CDEV
- Link to v1: https://lore.kernel.org/r/20250827-vchiq-destage-v1-0-5052a0d81c42@ideasonboard.com

---
Jai Luthra (4):
      staging: vc04_services: Cleanup VCHIQ TODO entries
      platform/broadcom: Destage VCHIQ interface
      media: staging: Drop bcm2835-camera driver
      platform/broadcom: Destage VCHIQ MMAL driver

Umang Jain (1):
      include: linux: Destage VCHIQ interface headers

 MAINTAINERS                                        |    2 +
 drivers/platform/Kconfig                           |    2 +
 drivers/platform/Makefile                          |    1 +
 drivers/platform/raspberrypi/Kconfig               |   52 +
 drivers/platform/raspberrypi/Makefile              |   15 +
 .../raspberrypi/vchiq-interface}/TESTING           |    0
 drivers/platform/raspberrypi/vchiq-interface/TODO  |    4 +
 .../raspberrypi/vchiq-interface}/vchiq_arm.c       |    9 +-
 .../raspberrypi/vchiq-interface}/vchiq_bus.c       |    4 +-
 .../raspberrypi/vchiq-interface}/vchiq_core.c      |    4 +-
 .../raspberrypi/vchiq-interface}/vchiq_debugfs.c   |    6 +-
 .../raspberrypi/vchiq-interface}/vchiq_dev.c       |    7 +-
 .../raspberrypi/vchiq-interface}/vchiq_ioctl.h     |    3 +-
 .../raspberrypi}/vchiq-mmal/Kconfig                |    0
 .../raspberrypi}/vchiq-mmal/Makefile               |    0
 .../raspberrypi}/vchiq-mmal/mmal-common.h          |    0
 .../raspberrypi}/vchiq-mmal/mmal-encodings.h       |    0
 .../raspberrypi}/vchiq-mmal/mmal-msg-common.h      |    0
 .../raspberrypi}/vchiq-mmal/mmal-msg-format.h      |    0
 .../raspberrypi}/vchiq-mmal/mmal-msg-port.h        |    0
 .../raspberrypi}/vchiq-mmal/mmal-msg.h             |    0
 .../raspberrypi}/vchiq-mmal/mmal-parameters.h      |    0
 .../raspberrypi}/vchiq-mmal/mmal-vchiq.c           |    5 +-
 .../raspberrypi}/vchiq-mmal/mmal-vchiq.h           |    0
 drivers/staging/vc04_services/Kconfig              |   49 -
 drivers/staging/vc04_services/Makefile             |   14 -
 .../vc04_services/bcm2835-audio/bcm2835-vchiq.c    |    5 +-
 .../staging/vc04_services/bcm2835-audio/bcm2835.c  |    3 +-
 .../staging/vc04_services/bcm2835-audio/bcm2835.h  |    3 +-
 .../staging/vc04_services/bcm2835-camera/Kconfig   |   13 -
 .../staging/vc04_services/bcm2835-camera/Makefile  |    6 -
 drivers/staging/vc04_services/bcm2835-camera/TODO  |   17 -
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  | 2011 --------------------
 .../vc04_services/bcm2835-camera/bcm2835-camera.h  |  142 --
 .../vc04_services/bcm2835-camera/controls.c        | 1399 --------------
 drivers/staging/vc04_services/interface/TODO       |   28 -
 .../include => include}/linux/raspberrypi/vchiq.h  |    0
 .../linux/raspberrypi}/vchiq_arm.h                 |    0
 .../linux/raspberrypi}/vchiq_bus.h                 |    0
 .../linux/raspberrypi}/vchiq_cfg.h                 |    0
 .../linux/raspberrypi}/vchiq_core.h                |    2 +-
 .../linux/raspberrypi}/vchiq_debugfs.h             |    0
 42 files changed, 103 insertions(+), 3703 deletions(-)
---
base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585
change-id: 20250827-vchiq-destage-39de1e67557d

Best regards,
-- 
Jai Luthra <jai.luthra@ideasonboard.com>



^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v2 1/5] include: linux: Destage VCHIQ interface headers
  2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
@ 2025-09-07  8:56 ` Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 2/5] staging: vc04_services: Cleanup VCHIQ TODO entries Jai Luthra
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 11+ messages in thread
From: Jai Luthra @ 2025-09-07  8:56 UTC (permalink / raw)
  To: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart,
	Jai Luthra, Umang Jain

From: Umang Jain <umang.jain@ideasonboard.com>

Move the VCHIQ headers from drivers/staging/vc04_services/include to
include/linux/raspberrypi

This is done so that they can be shared between the VCHIQ interface
(which is going to be de-staged in a subsequent commit from staging) and
the VCHIQ drivers left in the staging/vc04_services (namely
bcm2835-audio, bcm2835-camera).

The include/linux/raspberrypi/ provides a central location to serve both of
these areas.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
---
 MAINTAINERS                                                      | 1 +
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c      | 5 +++--
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.c            | 3 ++-
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.h            | 3 +--
 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c    | 3 ++-
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c    | 9 +++++----
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c    | 4 ++--
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c   | 4 ++--
 .../staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c    | 6 +++---
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c    | 7 ++++---
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h  | 3 +--
 drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c            | 5 +++--
 .../vc04_services/include => include}/linux/raspberrypi/vchiq.h  | 0
 .../vchiq_arm => include/linux/raspberrypi}/vchiq_arm.h          | 0
 .../vchiq_arm => include/linux/raspberrypi}/vchiq_bus.h          | 0
 .../vchiq_arm => include/linux/raspberrypi}/vchiq_cfg.h          | 0
 .../vchiq_arm => include/linux/raspberrypi}/vchiq_core.h         | 2 +-
 .../vchiq_arm => include/linux/raspberrypi}/vchiq_debugfs.h      | 0
 18 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index fe168477caa45799dfe07de2f54de6d6a1ce0615..5f79e377ad707ca65fe01f9882c95f8ab1aaa755 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4754,6 +4754,7 @@ T:	git https://github.com/broadcom/stblinux.git
 F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:	drivers/pci/controller/pcie-brcmstb.c
 F:	drivers/staging/vc04_services
+F:	include/linux/raspberrypi/vchiq*
 N:	bcm2711
 N:	bcm2712
 N:	bcm283*
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 0dbe76ee557032d7861acfc002cc203ff2e6971d..7368b384497f7b1439252a857f5845d3c4108c75 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -4,11 +4,12 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/completion.h>
+
+#include <linux/raspberrypi/vchiq_arm.h>
+
 #include "bcm2835.h"
 #include "vc_vchi_audioserv_defs.h"
 
-#include "../interface/vchiq_arm/vchiq_arm.h"
-
 struct bcm2835_audio_instance {
 	struct device *dev;
 	unsigned int service_handle;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
index b74cb104e9de00e7688a320949111a419cca084a..f292a6618166fe2581dffce873873c67af3d3b54 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -6,7 +6,8 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 
-#include "../interface/vchiq_arm/vchiq_bus.h"
+#include <linux/raspberrypi/vchiq_bus.h>
+
 #include "bcm2835.h"
 
 static bool enable_hdmi;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index 49ec5b496edb4ba8634171b1390c4e15181e4048..5a1348747ff4e0b63b244156a2252bb276863514 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -5,13 +5,12 @@
 #define __SOUND_ARM_BCM2835_H
 
 #include <linux/device.h>
+#include <linux/raspberrypi/vchiq.h>
 #include <linux/wait.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm-indirect.h>
 
-#include "../include/linux/raspberrypi/vchiq.h"
-
 #define MAX_SUBSTREAMS   (8)
 #define AVAIL_SUBSTREAMS_MASK  (0xff)
 
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index fa7ea4ca4c36f4ec7f76f6ffbea9f45205116bb8..d5e7b2d78eb478372e249ef0029874dffbc7e84f 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -26,7 +26,8 @@
 #include <media/v4l2-common.h>
 #include <linux/delay.h>
 
-#include "../interface/vchiq_arm/vchiq_bus.h"
+#include <linux/raspberrypi/vchiq_bus.h>
+
 #include "../vchiq-mmal/mmal-common.h"
 #include "../vchiq-mmal/mmal-encodings.h"
 #include "../vchiq-mmal/mmal-vchiq.h"
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 721b15b7e13b9f25cee7619575bbfa1a4734cce8..53e162278b478d4eea8dec6dd31f9a0ec15224c6 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -30,11 +30,12 @@
 #include <linux/uaccess.h>
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
-#include "vchiq_core.h"
+#include <linux/raspberrypi/vchiq_core.h>
+#include <linux/raspberrypi/vchiq_arm.h>
+#include <linux/raspberrypi/vchiq_bus.h>
+#include <linux/raspberrypi/vchiq_debugfs.h>
+
 #include "vchiq_ioctl.h"
-#include "vchiq_arm.h"
-#include "vchiq_bus.h"
-#include "vchiq_debugfs.h"
 
 #define DEVICE_NAME "vchiq"
 
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
index 41ece91ab88aa647a348910a0b913d0b28a8c761..f50e637d505cc58e86351de4e22ac57152570075 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
@@ -11,8 +11,8 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 
-#include "vchiq_arm.h"
-#include "vchiq_bus.h"
+#include <linux/raspberrypi/vchiq_arm.h>
+#include <linux/raspberrypi/vchiq_bus.h>
 
 static int vchiq_bus_type_match(struct device *dev, const struct device_driver *drv)
 {
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index e2cac0898b8faa3c255de6b8562c7096a9683c49..dc2c304c886edf59115fdd66c8842cb8eeeacff8 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -15,8 +15,8 @@
 #include <linux/rcupdate.h>
 #include <linux/sched/signal.h>
 
-#include "vchiq_arm.h"
-#include "vchiq_core.h"
+#include <linux/raspberrypi/vchiq_arm.h>
+#include <linux/raspberrypi/vchiq_core.h>
 
 #define VCHIQ_SLOT_HANDLER_STACK 8192
 
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
index d5f7f61c5626934b819e8ff322e22ae3d6158b31..c82326a9b6d9cfba7d4233a48530f85443eb2f5a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
@@ -5,9 +5,9 @@
  */
 
 #include <linux/debugfs.h>
-#include "vchiq_core.h"
-#include "vchiq_arm.h"
-#include "vchiq_debugfs.h"
+#include <linux/raspberrypi/vchiq_core.h>
+#include <linux/raspberrypi/vchiq_arm.h>
+#include <linux/raspberrypi/vchiq_debugfs.h>
 
 #ifdef CONFIG_DEBUG_FS
 
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
index 3b20ba5c736221ce1cacfc9ce86eca623382a30b..0f3dde2657d6b81fab64daa17d26592712fe8473 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
@@ -11,10 +11,11 @@
 #include <linux/compat.h>
 #include <linux/miscdevice.h>
 
-#include "vchiq_core.h"
+#include <linux/raspberrypi/vchiq_core.h>
+#include <linux/raspberrypi/vchiq_arm.h>
+#include <linux/raspberrypi/vchiq_debugfs.h>
+
 #include "vchiq_ioctl.h"
-#include "vchiq_arm.h"
-#include "vchiq_debugfs.h"
 
 static const char *const ioctl_names[] = {
 	"CONNECT",
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 afb71a83cfe7035e5dd61003fa99fd514ca18047..d0c759f6d8ea79e43247048f8b3903df67dd84c8 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -5,8 +5,7 @@
 #define VCHIQ_IOCTLS_H
 
 #include <linux/ioctl.h>
-
-#include "../../include/linux/raspberrypi/vchiq.h"
+#include <linux/raspberrypi/vchiq.h>
 
 #define VCHIQ_IOC_MAGIC 0xc4
 #define VCHIQ_INVALID_HANDLE (~0)
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 3fe482bd279390a7586c49bde00f38c61558ca8e..5caf9ae56ee48290401f86eadea9f1ca0149b11e 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -22,11 +22,12 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
+#include <linux/raspberrypi/vchiq.h>
 #include <linux/vmalloc.h>
 #include <media/videobuf2-vmalloc.h>
 
-#include "../include/linux/raspberrypi/vchiq.h"
-#include "../interface/vchiq_arm/vchiq_arm.h"
+#include <linux/raspberrypi/vchiq_arm.h>
+
 #include "mmal-common.h"
 #include "mmal-vchiq.h"
 #include "mmal-msg.h"
diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/include/linux/raspberrypi/vchiq.h
similarity index 100%
rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
rename to include/linux/raspberrypi/vchiq.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/include/linux/raspberrypi/vchiq_arm.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
rename to include/linux/raspberrypi/vchiq_arm.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h b/include/linux/raspberrypi/vchiq_bus.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
rename to include/linux/raspberrypi/vchiq_bus.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/include/linux/raspberrypi/vchiq_cfg.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
rename to include/linux/raspberrypi/vchiq_cfg.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/include/linux/raspberrypi/vchiq_core.h
similarity index 99%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
rename to include/linux/raspberrypi/vchiq_core.h
index 9b4e766990a493d6e9d4e0604f2c84f4e7b77804..dbcb19e7a6d39b94967261c4ab23d6325e999249 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/include/linux/raspberrypi/vchiq_core.h
@@ -15,7 +15,7 @@
 #include <linux/spinlock_types.h>
 #include <linux/wait.h>
 
-#include "../../include/linux/raspberrypi/vchiq.h"
+#include "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_debugfs.h b/include/linux/raspberrypi/vchiq_debugfs.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
rename to include/linux/raspberrypi/vchiq_debugfs.h

-- 
2.50.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 2/5] staging: vc04_services: Cleanup VCHIQ TODO entries
  2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 1/5] include: linux: Destage VCHIQ interface headers Jai Luthra
@ 2025-09-07  8:56 ` Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface Jai Luthra
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 11+ messages in thread
From: Jai Luthra @ 2025-09-07  8:56 UTC (permalink / raw)
  To: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart,
	Jai Luthra

Raspberry Pi downstream drivers using VCHIQ have changed a lot since
kernel version 4.4 mentioned in the TODO, and are tangential to the
destaing process - so drop those items from the list.

Secondly, the code indentation for the vchiq interface driver is not so
bad anymore since Umang's series (linked below) got merged, so drop it
from the TODO.

Link: https://lore.kernel.org/all/20241013112128.397249-1-umang.jain@ideasonboard.com/
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
---
 drivers/staging/vc04_services/interface/TODO | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/TODO b/drivers/staging/vc04_services/interface/TODO
index f6f24600aa86240fba77169f62f3e657e42727c3..2357dae413f102df49a233f7263ad0299bfe004a 100644
--- a/drivers/staging/vc04_services/interface/TODO
+++ b/drivers/staging/vc04_services/interface/TODO
@@ -1,28 +1,4 @@
-* Import drivers using VCHI.
-
-VCHI is just a tool to let drivers talk to the firmware.  Here are
-some of the ones we want:
-
-  - vc_mem (https://github.com/raspberrypi/linux/blob/rpi-4.4.y/drivers/char/broadcom/vc_mem.c)
-
-  This driver is what the vcdbg userspace program uses to set up its
-  requests to the firmware, which are transmitted across VCHIQ.  vcdbg
-  is really useful for debugging firmware interactions.
-
-  - VCSM (https://github.com/raspberrypi/linux/tree/rpi-4.4.y/drivers/char/broadcom/vc_sm)
-
-  This driver is used for talking about regions of VC memory across
-  firmware protocols including VCHI.  We'll want to extend this driver
-  to manage these buffers as dmabufs so that we can zero-copy import
-  camera images into vc4 for rendering/display.
-
 * Documentation
 
 A short top-down description of this driver's architecture (function of
 kthreads, userspace, limitations) could be very helpful for reviewers.
-
-* Reformat core code with more sane indentations
-
-The code follows the 80 characters limitation yet tends to go 3 or 4 levels of
-indentation deep making it very unpleasant to read. This is specially relevant
-in the character driver ioctl code and in the core thread functions.

-- 
2.50.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface
  2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 1/5] include: linux: Destage VCHIQ interface headers Jai Luthra
  2025-09-07  8:56 ` [PATCH v2 2/5] staging: vc04_services: Cleanup VCHIQ TODO entries Jai Luthra
@ 2025-09-07  8:56 ` Jai Luthra
  2025-09-20  9:14   ` Stefan Wahren
  2025-09-07  8:56 ` [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver Jai Luthra
  2025-09-08  5:48 ` [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Dan Carpenter
  4 siblings, 1 reply; 11+ messages in thread
From: Jai Luthra @ 2025-09-07  8:56 UTC (permalink / raw)
  To: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart,
	Jai Luthra

Destage the VCHIQ interface driver to drivers/platform/raspberrypi.

There is still the remaining TODO item of improving the documentation,
which can be handled post destaging.

Secondly, multimedia drivers like codec and ISP that rely on this
interface need to be upstreamed. And lastly, the drivers that facilitate
the shared memory between VideoCore and Linux, like the vc-sm-cma driver
and vc_mem char driver also need to be upstreamed.

Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
---
 MAINTAINERS                                        |  1 +
 drivers/platform/Kconfig                           |  2 +
 drivers/platform/Makefile                          |  1 +
 drivers/platform/raspberrypi/Kconfig               | 50 ++++++++++++++++++++++
 drivers/platform/raspberrypi/Makefile              | 14 ++++++
 .../raspberrypi/vchiq-interface}/TESTING           |  0
 .../raspberrypi/vchiq-interface}/TODO              |  0
 .../raspberrypi/vchiq-interface}/vchiq_arm.c       |  0
 .../raspberrypi/vchiq-interface}/vchiq_bus.c       |  0
 .../raspberrypi/vchiq-interface}/vchiq_core.c      |  0
 .../raspberrypi/vchiq-interface}/vchiq_debugfs.c   |  0
 .../raspberrypi/vchiq-interface}/vchiq_dev.c       |  0
 .../raspberrypi/vchiq-interface}/vchiq_ioctl.h     |  0
 drivers/staging/vc04_services/Kconfig              | 45 -------------------
 drivers/staging/vc04_services/Makefile             | 12 ------
 15 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f79e377ad707ca65fe01f9882c95f8ab1aaa755..fc74a9e2e5a47b8c82cf68ef7c1fe3d37e2fe89b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4753,6 +4753,7 @@ S:	Maintained
 T:	git https://github.com/broadcom/stblinux.git
 F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:	drivers/pci/controller/pcie-brcmstb.c
+F:	drivers/platform/raspberrypi/vchiq-interface
 F:	drivers/staging/vc04_services
 F:	include/linux/raspberrypi/vchiq*
 N:	bcm2711
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
index 960fd6a82450a4c7b97d51ea3bc29795ee74efd1..324c69c63f76d90643736d00d056382f396adbca 100644
--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -18,3 +18,5 @@ source "drivers/platform/surface/Kconfig"
 source "drivers/platform/x86/Kconfig"
 
 source "drivers/platform/arm64/Kconfig"
+
+source "drivers/platform/raspberrypi/Kconfig"
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index 19ac54648586eb617af0f8a69e3205bd83e8c35b..b97c54e12459fb8c6395d66bd28235b05a729e82 100644
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_CHROME_PLATFORMS)	+= chrome/
 obj-$(CONFIG_CZNIC_PLATFORMS)	+= cznic/
 obj-$(CONFIG_SURFACE_PLATFORMS)	+= surface/
 obj-$(CONFIG_ARM64_PLATFORM_DEVICES)	+= arm64/
+obj-$(CONFIG_BCM_VIDEOCORE)	+= raspberrypi/
diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..9085e7464ec348fce5ec9f41a9019ab12eee964b
--- /dev/null
+++ b/drivers/platform/raspberrypi/Kconfig
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: GPL-2.0
+
+menuconfig BCM_VIDEOCORE
+	tristate "Broadcom VideoCore support"
+	depends on OF
+	depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
+	default y
+	help
+		Support for Broadcom VideoCore services including
+		the BCM2835 family of products which is used
+		by the Raspberry PI.
+
+if BCM_VIDEOCORE
+
+config BCM2835_VCHIQ
+	tristate "BCM2835 VCHIQ"
+	depends on HAS_DMA
+	imply VCHIQ_CDEV
+	help
+		Broadcom BCM2835 and similar SoCs have a VPU called VideoCore.
+		This config enables the VCHIQ driver, which implements a
+		messaging interface between the kernel and the firmware running
+		on VideoCore. Other drivers use this interface to communicate to
+		the VPU. More specifically, the VCHIQ driver is used by
+		audio/video and camera drivers as well as for implementing MMAL
+		API, which is in turn used by several multimedia services on the
+		BCM2835 family of SoCs.
+
+		Defaults to Y when the Broadcom Videocore services are included
+		in the build, N otherwise.
+
+if BCM2835_VCHIQ
+
+config VCHIQ_CDEV
+	bool "VCHIQ Character Driver"
+	help
+		Enable the creation of VCHIQ character driver. The cdev exposes
+		ioctls used by userspace libraries and testing tools to interact
+		with VideoCore, via the VCHIQ core driver (Check BCM2835_VCHIQ
+		for more info).
+
+		This can be set to 'N' if the VideoCore communication is not
+		needed by userspace but only by other kernel modules
+		(like bcm2835-audio).
+
+		If not sure, set this to 'Y'.
+
+endif
+
+endif
diff --git a/drivers/platform/raspberrypi/Makefile b/drivers/platform/raspberrypi/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a807571c59a47bb418cbb1dfcc389219d0d0ff22
--- /dev/null
+++ b/drivers/platform/raspberrypi/Makefile
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_BCM2835_VCHIQ)	+= vchiq.o
+
+vchiq-objs := \
+   vchiq-interface/vchiq_core.o  \
+   vchiq-interface/vchiq_arm.o \
+   vchiq-interface/vchiq_bus.o \
+   vchiq-interface/vchiq_debugfs.o \
+
+ifdef CONFIG_VCHIQ_CDEV
+vchiq-objs += vchiq-interface/vchiq_dev.o
+endif
+
diff --git a/drivers/staging/vc04_services/interface/TESTING b/drivers/platform/raspberrypi/vchiq-interface/TESTING
similarity index 100%
rename from drivers/staging/vc04_services/interface/TESTING
rename to drivers/platform/raspberrypi/vchiq-interface/TESTING
diff --git a/drivers/staging/vc04_services/interface/TODO b/drivers/platform/raspberrypi/vchiq-interface/TODO
similarity index 100%
rename from drivers/staging/vc04_services/interface/TODO
rename to drivers/platform/raspberrypi/vchiq-interface/TODO
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_debugfs.c
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_debugfs.c
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/platform/raspberrypi/vchiq-interface/vchiq_ioctl.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
rename to drivers/platform/raspberrypi/vchiq-interface/vchiq_ioctl.h
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index ccc8e15886482e8caa4aeb12440036183fc9b80c..f599f36c54062416305f49a9bba076c3f91c06d3 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,51 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-menuconfig BCM_VIDEOCORE
-	tristate "Broadcom VideoCore support"
-	depends on OF
-	depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
-	default y
-	help
-		Support for Broadcom VideoCore services including
-		the BCM2835 family of products which is used
-		by the Raspberry PI.
-
 if BCM_VIDEOCORE
 
-config BCM2835_VCHIQ
-	tristate "BCM2835 VCHIQ"
-	depends on HAS_DMA
-	imply VCHIQ_CDEV
-	help
-		Broadcom BCM2835 and similar SoCs have a VPU called VideoCore.
-		This config enables the VCHIQ driver, which implements a
-		messaging interface between the kernel and the firmware running
-		on VideoCore. Other drivers use this interface to communicate to
-		the VPU. More specifically, the VCHIQ driver is used by
-		audio/video and camera drivers as well as for implementing MMAL
-		API, which is in turn used by several multimedia services on the
-		BCM2835 family of SoCs.
-
-		Defaults to Y when the Broadcom Videocore services are included
-		in the build, N otherwise.
-
-if BCM2835_VCHIQ
-
-config VCHIQ_CDEV
-	bool "VCHIQ Character Driver"
-	help
-		Enable the creation of VCHIQ character driver. The cdev exposes
-		ioctls used by userspace libraries and testing tools to interact
-		with VideoCore, via the VCHIQ core driver (Check BCM2835_VCHIQ
-		for more info).
-
-		This can be set to 'N' if the VideoCore communication is not
-		needed by userspace but only by other kernel modules
-		(like bcm2835-audio).
-
-		If not sure, set this to 'Y'.
-
-endif
-
 source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
 
 source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index dad3789522b80420f1f72ca8f740c816fb3d9843..51c9466ec7a28141cf66508f602f43cd89ad408b 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -1,16 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_BCM2835_VCHIQ)	+= vchiq.o
-
-vchiq-objs := \
-   interface/vchiq_arm/vchiq_core.o  \
-   interface/vchiq_arm/vchiq_arm.o \
-   interface/vchiq_arm/vchiq_bus.o \
-   interface/vchiq_arm/vchiq_debugfs.o \
-
-ifdef CONFIG_VCHIQ_CDEV
-vchiq-objs += interface/vchiq_arm/vchiq_dev.o
-endif
-
 obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
 obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
 obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/

-- 
2.50.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver
  2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
                   ` (2 preceding siblings ...)
  2025-09-07  8:56 ` [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface Jai Luthra
@ 2025-09-07  8:56 ` Jai Luthra
  2025-09-08  4:19   ` Jai Luthra
  2025-09-20  9:19   ` Stefan Wahren
  2025-09-08  5:48 ` [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Dan Carpenter
  4 siblings, 2 replies; 11+ messages in thread
From: Jai Luthra @ 2025-09-07  8:56 UTC (permalink / raw)
  To: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart,
	Jai Luthra

Destage the VCHIQ MMAL driver to drivers/platform/broadcom.

Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
---
 MAINTAINERS                                                             | 2 +-
 drivers/platform/raspberrypi/Kconfig                                    | 2 ++
 drivers/platform/raspberrypi/Makefile                                   | 1 +
 .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig  | 0
 .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h     | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h  | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h   | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h        | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c      | 0
 .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h      | 0
 drivers/staging/vc04_services/Kconfig                                   | 2 --
 drivers/staging/vc04_services/Makefile                                  | 1 -
 16 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index fc74a9e2e5a47b8c82cf68ef7c1fe3d37e2fe89b..856a2a489afbc95780769a708540444aa5aa983a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4753,7 +4753,7 @@ S:	Maintained
 T:	git https://github.com/broadcom/stblinux.git
 F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:	drivers/pci/controller/pcie-brcmstb.c
-F:	drivers/platform/raspberrypi/vchiq-interface
+F:	drivers/platform/raspberrypi/vchiq-*
 F:	drivers/staging/vc04_services
 F:	include/linux/raspberrypi/vchiq*
 N:	bcm2711
diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig
index 9085e7464ec348fce5ec9f41a9019ab12eee964b..2c928440a47c08e4d452fe838fe4105c608995a4 100644
--- a/drivers/platform/raspberrypi/Kconfig
+++ b/drivers/platform/raspberrypi/Kconfig
@@ -47,4 +47,6 @@ config VCHIQ_CDEV
 
 endif
 
+source "drivers/platform/raspberrypi/vchiq-mmal/Kconfig"
+
 endif
diff --git a/drivers/platform/raspberrypi/Makefile b/drivers/platform/raspberrypi/Makefile
index a807571c59a47bb418cbb1dfcc389219d0d0ff22..2a7c9511e5d8bbe11c05680eea016ef40796b648 100644
--- a/drivers/platform/raspberrypi/Makefile
+++ b/drivers/platform/raspberrypi/Makefile
@@ -12,3 +12,4 @@ ifdef CONFIG_VCHIQ_CDEV
 vchiq-objs += vchiq-interface/vchiq_dev.o
 endif
 
+obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/platform/raspberrypi/vchiq-mmal/Kconfig
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/Kconfig
rename to drivers/platform/raspberrypi/vchiq-mmal/Kconfig
diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/platform/raspberrypi/vchiq-mmal/Makefile
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/Makefile
rename to drivers/platform/raspberrypi/vchiq-mmal/Makefile
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
similarity index 100%
rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index b9e6f369f54c3af6225f181e08ac14e3de044062..2f6d1aaffdb2c1f11ec27e0fb8050fef56e6a875 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -3,7 +3,5 @@ if BCM_VIDEOCORE
 
 source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
 
-source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
-
 endif
 
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index 7a716a5c781530b673027b9f82ec94ebfd615f8a..ba15ec663af0fabaf0060456fc997deb5e5e0533 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
-obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
 

-- 
2.50.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver
  2025-09-07  8:56 ` [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver Jai Luthra
@ 2025-09-08  4:19   ` Jai Luthra
  2025-09-20  9:19   ` Stefan Wahren
  1 sibling, 0 replies; 11+ messages in thread
From: Jai Luthra @ 2025-09-08  4:19 UTC (permalink / raw)
  To: Broadcom internal kernel review list, Florian Fainelli,
	Greg Kroah-Hartman, Ray Jui, Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Stefan Wahren, Dave Stevenson, Laurent Pinchart

Quoting Jai Luthra (2025-09-07 14:26:25)
> Destage the VCHIQ MMAL driver to drivers/platform/broadcom.

s/broadcom/raspberrypi in the commit description and title as well

Will fix in next version

> 
> Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
> ---
>  MAINTAINERS                                                             | 2 +-
>  drivers/platform/raspberrypi/Kconfig                                    | 2 ++
>  drivers/platform/raspberrypi/Makefile                                   | 1 +
>  .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig  | 0
>  .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h     | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h  | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h   | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h        | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c      | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h      | 0
>  drivers/staging/vc04_services/Kconfig                                   | 2 --
>  drivers/staging/vc04_services/Makefile                                  | 1 -
>  16 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fc74a9e2e5a47b8c82cf68ef7c1fe3d37e2fe89b..856a2a489afbc95780769a708540444aa5aa983a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4753,7 +4753,7 @@ S:        Maintained
>  T:     git https://github.com/broadcom/stblinux.git
>  F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
>  F:     drivers/pci/controller/pcie-brcmstb.c
> -F:     drivers/platform/raspberrypi/vchiq-interface
> +F:     drivers/platform/raspberrypi/vchiq-*
>  F:     drivers/staging/vc04_services
>  F:     include/linux/raspberrypi/vchiq*
>  N:     bcm2711
> diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig
> index 9085e7464ec348fce5ec9f41a9019ab12eee964b..2c928440a47c08e4d452fe838fe4105c608995a4 100644
> --- a/drivers/platform/raspberrypi/Kconfig
> +++ b/drivers/platform/raspberrypi/Kconfig
> @@ -47,4 +47,6 @@ config VCHIQ_CDEV
>  
>  endif
>  
> +source "drivers/platform/raspberrypi/vchiq-mmal/Kconfig"
> +
>  endif
> diff --git a/drivers/platform/raspberrypi/Makefile b/drivers/platform/raspberrypi/Makefile
> index a807571c59a47bb418cbb1dfcc389219d0d0ff22..2a7c9511e5d8bbe11c05680eea016ef40796b648 100644
> --- a/drivers/platform/raspberrypi/Makefile
> +++ b/drivers/platform/raspberrypi/Makefile
> @@ -12,3 +12,4 @@ ifdef CONFIG_VCHIQ_CDEV
>  vchiq-objs += vchiq-interface/vchiq_dev.o
>  endif
>  
> +obj-$(CONFIG_BCM2835_VCHIQ_MMAL)       += vchiq-mmal/
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/platform/raspberrypi/vchiq-mmal/Kconfig
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/Kconfig
> rename to drivers/platform/raspberrypi/vchiq-mmal/Kconfig
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/platform/raspberrypi/vchiq-mmal/Makefile
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/Makefile
> rename to drivers/platform/raspberrypi/vchiq-mmal/Makefile
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
> diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
> index b9e6f369f54c3af6225f181e08ac14e3de044062..2f6d1aaffdb2c1f11ec27e0fb8050fef56e6a875 100644
> --- a/drivers/staging/vc04_services/Kconfig
> +++ b/drivers/staging/vc04_services/Kconfig
> @@ -3,7 +3,5 @@ if BCM_VIDEOCORE
>  
>  source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
>  
> -source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
> -
>  endif
>  
> diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
> index 7a716a5c781530b673027b9f82ec94ebfd615f8a..ba15ec663af0fabaf0060456fc997deb5e5e0533 100644
> --- a/drivers/staging/vc04_services/Makefile
> +++ b/drivers/staging/vc04_services/Makefile
> @@ -1,4 +1,3 @@
>  # SPDX-License-Identifier: GPL-2.0
>  obj-$(CONFIG_SND_BCM2835)              += bcm2835-audio/
> -obj-$(CONFIG_BCM2835_VCHIQ_MMAL)       += vchiq-mmal/
>  
> 
> -- 
> 2.50.1
>


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL
  2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
                   ` (3 preceding siblings ...)
  2025-09-07  8:56 ` [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver Jai Luthra
@ 2025-09-08  5:48 ` Dan Carpenter
  2025-09-08 11:15   ` Jai Luthra
  4 siblings, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2025-09-08  5:48 UTC (permalink / raw)
  To: Jai Luthra
  Cc: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden, linux-rpi-kernel,
	linux-arm-kernel, linux-staging, linux-kernel, kernel-list,
	Stefan Wahren, Dave Stevenson, Laurent Pinchart, Umang Jain

It's really hard to review the code when it's just sigle line like
this:

>  .../raspberrypi/vchiq-interface}/vchiq_arm.c       |    9 +-

It's also a head ache to do a cat -n filename and then copy and paste
it into an email message...  I thought there was a trick to make the
diff show up in the email?

regards,
dan carpenter



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL
  2025-09-08  5:48 ` [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Dan Carpenter
@ 2025-09-08 11:15   ` Jai Luthra
  2025-09-08 13:35     ` Laurent Pinchart
  0 siblings, 1 reply; 11+ messages in thread
From: Jai Luthra @ 2025-09-08 11:15 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Florian Fainelli, Broadcom internal kernel review list,
	Greg Kroah-Hartman, Ray Jui, Scott Branden, linux-rpi-kernel,
	linux-arm-kernel, linux-staging, linux-kernel, kernel-list,
	Stefan Wahren, Dave Stevenson, Laurent Pinchart, Umang Jain

Hi Dan,

Quoting Dan Carpenter (2025-09-08 11:18:25)
> It's really hard to review the code when it's just sigle line like
> this:
> 
> >  .../raspberrypi/vchiq-interface}/vchiq_arm.c       |    9 +-
> 
> It's also a head ache to do a cat -n filename and then copy and paste
> it into an email message...  I thought there was a trick to make the
> diff show up in the email?
> 

I am not sure how to configure b4 to give the full file path instead of
shortening it after the first file in a list.

Does git-format-patch already have some option? I can use that to ease
reviews till b4 adds support for this feature.

Or did I misunderstand your problem?

> regards,
> dan carpenter
>

Thanks,
    Jai


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL
  2025-09-08 11:15   ` Jai Luthra
@ 2025-09-08 13:35     ` Laurent Pinchart
  0 siblings, 0 replies; 11+ messages in thread
From: Laurent Pinchart @ 2025-09-08 13:35 UTC (permalink / raw)
  To: Jai Luthra
  Cc: Dan Carpenter, Florian Fainelli,
	Broadcom internal kernel review list, Greg Kroah-Hartman, Ray Jui,
	Scott Branden, linux-rpi-kernel, linux-arm-kernel, linux-staging,
	linux-kernel, kernel-list, Stefan Wahren, Dave Stevenson,
	Umang Jain

On Mon, Sep 08, 2025 at 04:45:46PM +0530, Jai Luthra wrote:
> Quoting Dan Carpenter (2025-09-08 11:18:25)
> > It's really hard to review the code when it's just sigle line like
> > this:
> > 
> > >  .../raspberrypi/vchiq-interface}/vchiq_arm.c       |    9 +-
> > 
> > It's also a head ache to do a cat -n filename and then copy and paste
> > it into an email message...  I thought there was a trick to make the
> > diff show up in the email?
> > 
> 
> I am not sure how to configure b4 to give the full file path instead of
> shortening it after the first file in a list.
> 
> Does git-format-patch already have some option? I can use that to ease
> reviews till b4 adds support for this feature.

--stat=-1 should help. I don't know if -1 happens to work or is the
official way to remove the limit. --stat=65535 should be big enough too
:-)

> Or did I misunderstand your problem?

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface
  2025-09-07  8:56 ` [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface Jai Luthra
@ 2025-09-20  9:14   ` Stefan Wahren
  0 siblings, 0 replies; 11+ messages in thread
From: Stefan Wahren @ 2025-09-20  9:14 UTC (permalink / raw)
  To: Jai Luthra, Florian Fainelli,
	Broadcom internal kernel review list, Greg Kroah-Hartman, Ray Jui,
	Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Dave Stevenson, Laurent Pinchart

Hi Jai,

Am 07.09.25 um 10:56 schrieb Jai Luthra:
> Destage the VCHIQ interface driver to drivers/platform/raspberrypi.
could you please adjust the commit subject to raspberrypi, too?
> There is still the remaining TODO item of improving the documentation,
> which can be handled post destaging.
I'm fine with this change, but I don't if it is necessary to have the 
IOCTL documented yet.
Currently I don't know when I've the time to proceed with this [1]. Sorry.

Best regards

[1] - 
https://lore.kernel.org/linux-staging/20250509221152.13564-3-wahrenst@gmx.net/
>
> Secondly, multimedia drivers like codec and ISP that rely on this
> interface need to be upstreamed. And lastly, the drivers that facilitate
> the shared memory between VideoCore and Linux, like the vc-sm-cma driver
> and vc_mem char driver also need to be upstreamed.
>
> Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
> ---


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver
  2025-09-07  8:56 ` [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver Jai Luthra
  2025-09-08  4:19   ` Jai Luthra
@ 2025-09-20  9:19   ` Stefan Wahren
  1 sibling, 0 replies; 11+ messages in thread
From: Stefan Wahren @ 2025-09-20  9:19 UTC (permalink / raw)
  To: Jai Luthra, Florian Fainelli,
	Broadcom internal kernel review list, Greg Kroah-Hartman, Ray Jui,
	Scott Branden
  Cc: linux-rpi-kernel, linux-arm-kernel, linux-staging, linux-kernel,
	kernel-list, Dave Stevenson, Laurent Pinchart

Hi Jai,

Am 07.09.25 um 10:56 schrieb Jai Luthra:
> Destage the VCHIQ MMAL driver to drivers/platform/broadcom.
>
> Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
> ---
>   MAINTAINERS                                                             | 2 +-
>   drivers/platform/raspberrypi/Kconfig                                    | 2 ++
>   drivers/platform/raspberrypi/Makefile                                   | 1 +
>   .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig  | 0
>   .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h     | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h  | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h   | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h        | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c      | 0
>   .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h      | 0
>   drivers/staging/vc04_services/Kconfig                                   | 2 --
>   drivers/staging/vc04_services/Makefile                                  | 1 -
>   16 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fc74a9e2e5a47b8c82cf68ef7c1fe3d37e2fe89b..856a2a489afbc95780769a708540444aa5aa983a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4753,7 +4753,7 @@ S:	Maintained
>   T:	git https://github.com/broadcom/stblinux.git
>   F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
>   F:	drivers/pci/controller/pcie-brcmstb.c
> -F:	drivers/platform/raspberrypi/vchiq-interface
> +F:	drivers/platform/raspberrypi/vchiq-*
could you please apply this pattern already in patch 3, so we don't have 
to modify the MAINTAINER file here?

Best regards
>   F:	drivers/staging/vc04_services
>   F:	include/linux/raspberrypi/vchiq*
>   N:	bcm2711
> diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig
> index 9085e7464ec348fce5ec9f41a9019ab12eee964b..2c928440a47c08e4d452fe838fe4105c608995a4 100644
> --- a/drivers/platform/raspberrypi/Kconfig
> +++ b/drivers/platform/raspberrypi/Kconfig
> @@ -47,4 +47,6 @@ config VCHIQ_CDEV
>   
>   endif
>   
> +source "drivers/platform/raspberrypi/vchiq-mmal/Kconfig"
> +
>   endif
> diff --git a/drivers/platform/raspberrypi/Makefile b/drivers/platform/raspberrypi/Makefile
> index a807571c59a47bb418cbb1dfcc389219d0d0ff22..2a7c9511e5d8bbe11c05680eea016ef40796b648 100644
> --- a/drivers/platform/raspberrypi/Makefile
> +++ b/drivers/platform/raspberrypi/Makefile
> @@ -12,3 +12,4 @@ ifdef CONFIG_VCHIQ_CDEV
>   vchiq-objs += vchiq-interface/vchiq_dev.o
>   endif
>   
> +obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/platform/raspberrypi/vchiq-mmal/Kconfig
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/Kconfig
> rename to drivers/platform/raspberrypi/vchiq-mmal/Kconfig
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/platform/raspberrypi/vchiq-mmal/Makefile
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/Makefile
> rename to drivers/platform/raspberrypi/vchiq-mmal/Makefile
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
> similarity index 100%
> rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
> rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h
> diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
> index b9e6f369f54c3af6225f181e08ac14e3de044062..2f6d1aaffdb2c1f11ec27e0fb8050fef56e6a875 100644
> --- a/drivers/staging/vc04_services/Kconfig
> +++ b/drivers/staging/vc04_services/Kconfig
> @@ -3,7 +3,5 @@ if BCM_VIDEOCORE
>   
>   source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
>   
> -source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
> -
>   endif
>   
> diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
> index 7a716a5c781530b673027b9f82ec94ebfd615f8a..ba15ec663af0fabaf0060456fc997deb5e5e0533 100644
> --- a/drivers/staging/vc04_services/Makefile
> +++ b/drivers/staging/vc04_services/Makefile
> @@ -1,4 +1,3 @@
>   # SPDX-License-Identifier: GPL-2.0
>   obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
> -obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
>   
>



^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2025-09-20  9:19 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-07  8:56 [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Jai Luthra
2025-09-07  8:56 ` [PATCH v2 1/5] include: linux: Destage VCHIQ interface headers Jai Luthra
2025-09-07  8:56 ` [PATCH v2 2/5] staging: vc04_services: Cleanup VCHIQ TODO entries Jai Luthra
2025-09-07  8:56 ` [PATCH v2 3/5] platform/broadcom: Destage VCHIQ interface Jai Luthra
2025-09-20  9:14   ` Stefan Wahren
2025-09-07  8:56 ` [PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver Jai Luthra
2025-09-08  4:19   ` Jai Luthra
2025-09-20  9:19   ` Stefan Wahren
2025-09-08  5:48 ` [PATCH v2 0/5] staging: Destage VCHIQ interface and MMAL Dan Carpenter
2025-09-08 11:15   ` Jai Luthra
2025-09-08 13:35     ` Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox