From: Umang Jain <umang.jain@ideasonboard.com>
Move the VCHIQ headers from drivers/staging/vc04_services/include to
include/linux/vchiq
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/vchiq/ provides a central location to serve both
of these areas.
Signed-off-by: Umang Jain <umang.jain@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 +++--
.../include/linux/raspberrypi => include/linux/vchiq}/vchiq.h | 0
.../interface/vchiq_arm => include/linux/vchiq}/vchiq_arm.h | 0
.../interface/vchiq_arm => include/linux/vchiq}/vchiq_bus.h | 0
.../interface/vchiq_arm => include/linux/vchiq}/vchiq_cfg.h | 0
.../interface/vchiq_arm => include/linux/vchiq}/vchiq_core.h | 2 +-
.../interface/vchiq_arm => include/linux/vchiq}/vchiq_debugfs.h | 0
18 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index fe168477caa45799dfe07de2f54de6d6a1ce0615..f17ebb1fa51bd7e4dcb2ae1b0fced6d41685dc84 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/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..c49f2f7409b84ed6ebdd71787566efb1bc230f55 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/vchiq/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..5011720940715c12a2d2fe58b40ed84dcb2e6824 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/vchiq/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..7e63ef251c37269032fc20ae1237855245e5e0a7 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/vchiq/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..fcbbe1aa60b768e5a7a08a131f595a0457f4473a 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/vchiq/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..10138c1454dd7fdcbab6b95ea41f8e1ac2defc4b 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/vchiq/vchiq_core.h>
+#include <linux/vchiq/vchiq_arm.h>
+#include <linux/vchiq/vchiq_bus.h>
+#include <linux/vchiq/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..5d55dbff82150a84b15483e71718c48f5cb8caea 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/vchiq/vchiq_arm.h>
+#include <linux/vchiq/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..ac0379f5f45dfa331dc2fec8d580d176f931cf2b 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/vchiq/vchiq_arm.h>
+#include <linux/vchiq/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..b1a8f1abafc2fa83132b1a02ba343d71315950de 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/vchiq/vchiq_core.h>
+#include <linux/vchiq/vchiq_arm.h>
+#include <linux/vchiq/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..781d6dd64ee33816b52b62f1f25bcd33363d8e02 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/vchiq/vchiq_core.h>
+#include <linux/vchiq/vchiq_arm.h>
+#include <linux/vchiq/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..638469f18f859a0c7e738ef5bed7bf3c3ebebe59 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/vchiq/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..f5e141908b0f91ca4172d48aee37f0329d239d7c 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/vchiq/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/vchiq/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/vchiq/vchiq.h
similarity index 100%
rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
rename to include/linux/vchiq/vchiq.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/include/linux/vchiq/vchiq_arm.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
rename to include/linux/vchiq/vchiq_arm.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h b/include/linux/vchiq/vchiq_bus.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
rename to include/linux/vchiq/vchiq_bus.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/include/linux/vchiq/vchiq_cfg.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
rename to include/linux/vchiq/vchiq_cfg.h
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/include/linux/vchiq/vchiq_core.h
similarity index 99%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
rename to include/linux/vchiq/vchiq_core.h
index 9b4e766990a493d6e9d4e0604f2c84f4e7b77804..dbcb19e7a6d39b94967261c4ab23d6325e999249 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/include/linux/vchiq/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/vchiq/vchiq_debugfs.h
similarity index 100%
rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
rename to include/linux/vchiq/vchiq_debugfs.h
--
2.50.1Hi Jai,
Thank you for the patch.
On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote:
> From: Umang Jain <umang.jain@ideasonboard.com>
>
> Move the VCHIQ headers from drivers/staging/vc04_services/include to
> include/linux/vchiq
>
> 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/vchiq/ provides a central location to serve both
> of these areas.
Lots of SoC-specific headers are stored in include/linux/soc/$vendor/.
This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine
with include/linux/vchiq/ but other people may have a preference.
> Signed-off-by: Umang Jain <umang.jain@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 +++--
> .../include/linux/raspberrypi => include/linux/vchiq}/vchiq.h | 0
> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_arm.h | 0
> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_bus.h | 0
> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_cfg.h | 0
> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_core.h | 2 +-
> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_debugfs.h | 0
> 18 files changed, 30 insertions(+), 25 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fe168477caa45799dfe07de2f54de6d6a1ce0615..f17ebb1fa51bd7e4dcb2ae1b0fced6d41685dc84 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/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..c49f2f7409b84ed6ebdd71787566efb1bc230f55 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/vchiq/vchiq_arm.h>
You can group this with the other headers above (ideally in alphabetical
order when #include statements are already sorted). Same comment where
applicable below.
With that,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> +
> #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..5011720940715c12a2d2fe58b40ed84dcb2e6824 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/vchiq/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..7e63ef251c37269032fc20ae1237855245e5e0a7 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/vchiq/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..fcbbe1aa60b768e5a7a08a131f595a0457f4473a 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/vchiq/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..10138c1454dd7fdcbab6b95ea41f8e1ac2defc4b 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/vchiq/vchiq_core.h>
> +#include <linux/vchiq/vchiq_arm.h>
> +#include <linux/vchiq/vchiq_bus.h>
> +#include <linux/vchiq/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..5d55dbff82150a84b15483e71718c48f5cb8caea 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/vchiq/vchiq_arm.h>
> +#include <linux/vchiq/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..ac0379f5f45dfa331dc2fec8d580d176f931cf2b 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/vchiq/vchiq_arm.h>
> +#include <linux/vchiq/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..b1a8f1abafc2fa83132b1a02ba343d71315950de 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/vchiq/vchiq_core.h>
> +#include <linux/vchiq/vchiq_arm.h>
> +#include <linux/vchiq/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..781d6dd64ee33816b52b62f1f25bcd33363d8e02 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/vchiq/vchiq_core.h>
> +#include <linux/vchiq/vchiq_arm.h>
> +#include <linux/vchiq/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..638469f18f859a0c7e738ef5bed7bf3c3ebebe59 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/vchiq/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..f5e141908b0f91ca4172d48aee37f0329d239d7c 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/vchiq/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/vchiq/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/vchiq/vchiq.h
> similarity index 100%
> rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> rename to include/linux/vchiq/vchiq.h
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/include/linux/vchiq/vchiq_arm.h
> similarity index 100%
> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
> rename to include/linux/vchiq/vchiq_arm.h
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h b/include/linux/vchiq/vchiq_bus.h
> similarity index 100%
> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
> rename to include/linux/vchiq/vchiq_bus.h
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/include/linux/vchiq/vchiq_cfg.h
> similarity index 100%
> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
> rename to include/linux/vchiq/vchiq_cfg.h
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/include/linux/vchiq/vchiq_core.h
> similarity index 99%
> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> rename to include/linux/vchiq/vchiq_core.h
> index 9b4e766990a493d6e9d4e0604f2c84f4e7b77804..dbcb19e7a6d39b94967261c4ab23d6325e999249 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> +++ b/include/linux/vchiq/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/vchiq/vchiq_debugfs.h
> similarity index 100%
> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
> rename to include/linux/vchiq/vchiq_debugfs.h
>
--
Regards,
Laurent Pinchart
On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote:
> Hi Jai,
>
> Thank you for the patch.
>
> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote:
> > From: Umang Jain <umang.jain@ideasonboard.com>
> >
> > Move the VCHIQ headers from drivers/staging/vc04_services/include to
> > include/linux/vchiq
> >
> > 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/vchiq/ provides a central location to serve both
> > of these areas.
>
> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/.
> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine
> with include/linux/vchiq/ but other people may have a preference.
I agree with this point and I might have missed to notice the
include/linux/soc earlier. That's seems a better location to me since
it's actually broadcom-specific.
>
> > Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> > Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
And thanks for taking this over!
> > ---
> > 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 +++--
> > .../include/linux/raspberrypi => include/linux/vchiq}/vchiq.h | 0
> > .../interface/vchiq_arm => include/linux/vchiq}/vchiq_arm.h | 0
> > .../interface/vchiq_arm => include/linux/vchiq}/vchiq_bus.h | 0
> > .../interface/vchiq_arm => include/linux/vchiq}/vchiq_cfg.h | 0
> > .../interface/vchiq_arm => include/linux/vchiq}/vchiq_core.h | 2 +-
> > .../interface/vchiq_arm => include/linux/vchiq}/vchiq_debugfs.h | 0
> > 18 files changed, 30 insertions(+), 25 deletions(-)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index fe168477caa45799dfe07de2f54de6d6a1ce0615..f17ebb1fa51bd7e4dcb2ae1b0fced6d41685dc84 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/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..c49f2f7409b84ed6ebdd71787566efb1bc230f55 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/vchiq/vchiq_arm.h>
>
> You can group this with the other headers above (ideally in alphabetical
> order when #include statements are already sorted). Same comment where
> applicable below.
>
> With that,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> > +
> > #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..5011720940715c12a2d2fe58b40ed84dcb2e6824 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/vchiq/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..7e63ef251c37269032fc20ae1237855245e5e0a7 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/vchiq/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..fcbbe1aa60b768e5a7a08a131f595a0457f4473a 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/vchiq/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..10138c1454dd7fdcbab6b95ea41f8e1ac2defc4b 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/vchiq/vchiq_core.h>
> > +#include <linux/vchiq/vchiq_arm.h>
> > +#include <linux/vchiq/vchiq_bus.h>
> > +#include <linux/vchiq/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..5d55dbff82150a84b15483e71718c48f5cb8caea 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/vchiq/vchiq_arm.h>
> > +#include <linux/vchiq/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..ac0379f5f45dfa331dc2fec8d580d176f931cf2b 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/vchiq/vchiq_arm.h>
> > +#include <linux/vchiq/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..b1a8f1abafc2fa83132b1a02ba343d71315950de 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/vchiq/vchiq_core.h>
> > +#include <linux/vchiq/vchiq_arm.h>
> > +#include <linux/vchiq/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..781d6dd64ee33816b52b62f1f25bcd33363d8e02 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/vchiq/vchiq_core.h>
> > +#include <linux/vchiq/vchiq_arm.h>
> > +#include <linux/vchiq/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..638469f18f859a0c7e738ef5bed7bf3c3ebebe59 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/vchiq/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..f5e141908b0f91ca4172d48aee37f0329d239d7c 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/vchiq/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/vchiq/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/vchiq/vchiq.h
> > similarity index 100%
> > rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
> > rename to include/linux/vchiq/vchiq.h
> > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/include/linux/vchiq/vchiq_arm.h
> > similarity index 100%
> > rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
> > rename to include/linux/vchiq/vchiq_arm.h
> > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h b/include/linux/vchiq/vchiq_bus.h
> > similarity index 100%
> > rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
> > rename to include/linux/vchiq/vchiq_bus.h
> > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/include/linux/vchiq/vchiq_cfg.h
> > similarity index 100%
> > rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
> > rename to include/linux/vchiq/vchiq_cfg.h
> > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/include/linux/vchiq/vchiq_core.h
> > similarity index 99%
> > rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> > rename to include/linux/vchiq/vchiq_core.h
> > index 9b4e766990a493d6e9d4e0604f2c84f4e7b77804..dbcb19e7a6d39b94967261c4ab23d6325e999249 100644
> > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> > +++ b/include/linux/vchiq/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/vchiq/vchiq_debugfs.h
> > similarity index 100%
> > rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
> > rename to include/linux/vchiq/vchiq_debugfs.h
> >
>
> --
> Regards,
>
> Laurent Pinchart
Hi,
Am 27.08.25 um 16:33 schrieb Umang Jain:
> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote:
>> Hi Jai,
>>
>> Thank you for the patch.
>>
>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote:
>>> From: Umang Jain <umang.jain@ideasonboard.com>
>>>
>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to
>>> include/linux/vchiq
>>>
>>> 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/vchiq/ provides a central location to serve both
>>> of these areas.
>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/.
>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine
>> with include/linux/vchiq/ but other people may have a preference.
> I agree with this point and I might have missed to notice the
> include/linux/soc earlier. That's seems a better location to me since
> it's actually broadcom-specific.
I would expect that headers and source would be more related.
For example:
include/linux/soc/bcm
drivers/soc/bcm/
Just my 2 cents
>>> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
>>> Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com>
> And thanks for taking this over!
>
>>> ---
>>> 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 +++--
>>> .../include/linux/raspberrypi => include/linux/vchiq}/vchiq.h | 0
>>> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_arm.h | 0
>>> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_bus.h | 0
>>> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_cfg.h | 0
>>> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_core.h | 2 +-
>>> .../interface/vchiq_arm => include/linux/vchiq}/vchiq_debugfs.h | 0
>>> 18 files changed, 30 insertions(+), 25 deletions(-)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index fe168477caa45799dfe07de2f54de6d6a1ce0615..f17ebb1fa51bd7e4dcb2ae1b0fced6d41685dc84 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/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..c49f2f7409b84ed6ebdd71787566efb1bc230f55 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/vchiq/vchiq_arm.h>
>> You can group this with the other headers above (ideally in alphabetical
>> order when #include statements are already sorted). Same comment where
>> applicable below.
>>
>> With that,
>>
>> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>
>>> +
>>> #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..5011720940715c12a2d2fe58b40ed84dcb2e6824 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/vchiq/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..7e63ef251c37269032fc20ae1237855245e5e0a7 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/vchiq/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..fcbbe1aa60b768e5a7a08a131f595a0457f4473a 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/vchiq/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..10138c1454dd7fdcbab6b95ea41f8e1ac2defc4b 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/vchiq/vchiq_core.h>
>>> +#include <linux/vchiq/vchiq_arm.h>
>>> +#include <linux/vchiq/vchiq_bus.h>
>>> +#include <linux/vchiq/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..5d55dbff82150a84b15483e71718c48f5cb8caea 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/vchiq/vchiq_arm.h>
>>> +#include <linux/vchiq/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..ac0379f5f45dfa331dc2fec8d580d176f931cf2b 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/vchiq/vchiq_arm.h>
>>> +#include <linux/vchiq/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..b1a8f1abafc2fa83132b1a02ba343d71315950de 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/vchiq/vchiq_core.h>
>>> +#include <linux/vchiq/vchiq_arm.h>
>>> +#include <linux/vchiq/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..781d6dd64ee33816b52b62f1f25bcd33363d8e02 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/vchiq/vchiq_core.h>
>>> +#include <linux/vchiq/vchiq_arm.h>
>>> +#include <linux/vchiq/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..638469f18f859a0c7e738ef5bed7bf3c3ebebe59 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/vchiq/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..f5e141908b0f91ca4172d48aee37f0329d239d7c 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/vchiq/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/vchiq/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/vchiq/vchiq.h
>>> similarity index 100%
>>> rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
>>> rename to include/linux/vchiq/vchiq.h
>>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/include/linux/vchiq/vchiq_arm.h
>>> similarity index 100%
>>> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
>>> rename to include/linux/vchiq/vchiq_arm.h
>>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h b/include/linux/vchiq/vchiq_bus.h
>>> similarity index 100%
>>> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
>>> rename to include/linux/vchiq/vchiq_bus.h
>>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h b/include/linux/vchiq/vchiq_cfg.h
>>> similarity index 100%
>>> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
>>> rename to include/linux/vchiq/vchiq_cfg.h
>>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/include/linux/vchiq/vchiq_core.h
>>> similarity index 99%
>>> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
>>> rename to include/linux/vchiq/vchiq_core.h
>>> index 9b4e766990a493d6e9d4e0604f2c84f4e7b77804..dbcb19e7a6d39b94967261c4ab23d6325e999249 100644
>>> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
>>> +++ b/include/linux/vchiq/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/vchiq/vchiq_debugfs.h
>>> similarity index 100%
>>> rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
>>> rename to include/linux/vchiq/vchiq_debugfs.h
>>>
>> --
>> Regards,
>>
>> Laurent Pinchart
On 8/27/2025 12:05 PM, Stefan Wahren wrote: > Hi, > > Am 27.08.25 um 16:33 schrieb Umang Jain: >> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote: >>> Hi Jai, >>> >>> Thank you for the patch. >>> >>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote: >>>> From: Umang Jain <umang.jain@ideasonboard.com> >>>> >>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to >>>> include/linux/vchiq >>>> >>>> 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/vchiq/ provides a central location to serve both >>>> of these areas. >>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/. >>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine >>> with include/linux/vchiq/ but other people may have a preference. >> I agree with this point and I might have missed to notice the >> include/linux/soc earlier. That's seems a better location to me since >> it's actually broadcom-specific. > I would expect that headers and source would be more related. > > For example: > > include/linux/soc/bcm > > drivers/soc/bcm/ This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just like drivers/firmware/raspberrypi.c, we would need some namespacing here that reflects that, ideally. -- Florian
Hi Florian, Am 28.08.25 um 04:17 schrieb Florian Fainelli: > > > On 8/27/2025 12:05 PM, Stefan Wahren wrote: >> Hi, >> >> Am 27.08.25 um 16:33 schrieb Umang Jain: >>> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote: >>>> Hi Jai, >>>> >>>> Thank you for the patch. >>>> >>>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote: >>>>> From: Umang Jain <umang.jain@ideasonboard.com> >>>>> >>>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to >>>>> include/linux/vchiq >>>>> >>>>> 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/vchiq/ provides a central location to serve both >>>>> of these areas. >>>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/. >>>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine >>>> with include/linux/vchiq/ but other people may have a preference. >>> I agree with this point and I might have missed to notice the >>> include/linux/soc earlier. That's seems a better location to me since >>> it's actually broadcom-specific. >> I would expect that headers and source would be more related. >> >> For example: >> >> include/linux/soc/bcm >> >> drivers/soc/bcm/ > > This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just > like drivers/firmware/raspberrypi.c, we would need some namespacing > here that reflects that, ideally. The VCHIQ code originally comes from Broadcom, but the current implementation has been adapted and tested for Raspberry Pi. I'm not against a Raspberry Pi specific namespace. Should this also apply to the DT bindings? Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml Best regards
On 8/27/25 23:19, Stefan Wahren wrote: > Hi Florian, > > Am 28.08.25 um 04:17 schrieb Florian Fainelli: >> >> >> On 8/27/2025 12:05 PM, Stefan Wahren wrote: >>> Hi, >>> >>> Am 27.08.25 um 16:33 schrieb Umang Jain: >>>> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote: >>>>> Hi Jai, >>>>> >>>>> Thank you for the patch. >>>>> >>>>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote: >>>>>> From: Umang Jain <umang.jain@ideasonboard.com> >>>>>> >>>>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to >>>>>> include/linux/vchiq >>>>>> >>>>>> 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/vchiq/ provides a central location to serve both >>>>>> of these areas. >>>>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/. >>>>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine >>>>> with include/linux/vchiq/ but other people may have a preference. >>>> I agree with this point and I might have missed to notice the >>>> include/linux/soc earlier. That's seems a better location to me since >>>> it's actually broadcom-specific. >>> I would expect that headers and source would be more related. >>> >>> For example: >>> >>> include/linux/soc/bcm >>> >>> drivers/soc/bcm/ >> >> This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just >> like drivers/firmware/raspberrypi.c, we would need some namespacing >> here that reflects that, ideally. > The VCHIQ code originally comes from Broadcom, but the current > implementation has been adapted and tested for Raspberry Pi. I'm not > against a Raspberry Pi specific namespace. OK, that's a fair point, but it's not applicable to any other Broadcom SoC, more on that below. > > Should this also apply to the DT bindings? Ideally yes. -- Florian
Hi Florian, Stefan,
Quoting Stefan Wahren (2025-08-28 11:49:47)
> Hi Florian,
>
> Am 28.08.25 um 04:17 schrieb Florian Fainelli:
> >
> >
> > On 8/27/2025 12:05 PM, Stefan Wahren wrote:
> >> Hi,
> >>
> >> Am 27.08.25 um 16:33 schrieb Umang Jain:
> >>> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote:
> >>>> Hi Jai,
> >>>>
> >>>> Thank you for the patch.
> >>>>
> >>>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote:
> >>>>> From: Umang Jain <umang.jain@ideasonboard.com>
> >>>>>
> >>>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to
> >>>>> include/linux/vchiq
> >>>>>
> >>>>> 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/vchiq/ provides a central location to serve both
> >>>>> of these areas.
> >>>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/.
> >>>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine
> >>>> with include/linux/vchiq/ but other people may have a preference.
> >>> I agree with this point and I might have missed to notice the
> >>> include/linux/soc earlier. That's seems a better location to me since
> >>> it's actually broadcom-specific.
> >> I would expect that headers and source would be more related.
> >>
> >> For example:
> >>
> >> include/linux/soc/bcm
> >>
> >> drivers/soc/bcm/
> >
> > This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just
> > like drivers/firmware/raspberrypi.c, we would need some namespacing
> > here that reflects that, ideally.
> The VCHIQ code originally comes from Broadcom, but the current
> implementation has been adapted and tested for Raspberry Pi. I'm not
> against a Raspberry Pi specific namespace.
Thanks for the suggestions. For v2 I'll use:
include/linux/soc/raspberrypi
drivers/soc/raspberrypi
>
> Should this also apply to the DT bindings?
>
> Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
>
> Best regards
>
Thanks,
Jai
Am 03.09.25 um 15:48 schrieb Jai Luthra: > Hi Florian, Stefan, > > Quoting Stefan Wahren (2025-08-28 11:49:47) >> Hi Florian, >> >> Am 28.08.25 um 04:17 schrieb Florian Fainelli: >>> >>> On 8/27/2025 12:05 PM, Stefan Wahren wrote: >>>> Hi, >>>> >>>> Am 27.08.25 um 16:33 schrieb Umang Jain: >>>>> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote: >>>>>> Hi Jai, >>>>>> >>>>>> Thank you for the patch. >>>>>> >>>>>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote: >>>>>>> From: Umang Jain <umang.jain@ideasonboard.com> >>>>>>> >>>>>>> Move the VCHIQ headers from drivers/staging/vc04_services/include to >>>>>>> include/linux/vchiq >>>>>>> >>>>>>> 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/vchiq/ provides a central location to serve both >>>>>>> of these areas. >>>>>> Lots of SoC-specific headers are stored in include/linux/soc/$vendor/. >>>>>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also fine >>>>>> with include/linux/vchiq/ but other people may have a preference. >>>>> I agree with this point and I might have missed to notice the >>>>> include/linux/soc earlier. That's seems a better location to me since >>>>> it's actually broadcom-specific. >>>> I would expect that headers and source would be more related. >>>> >>>> For example: >>>> >>>> include/linux/soc/bcm >>>> >>>> drivers/soc/bcm/ >>> This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just >>> like drivers/firmware/raspberrypi.c, we would need some namespacing >>> here that reflects that, ideally. >> The VCHIQ code originally comes from Broadcom, but the current >> implementation has been adapted and tested for Raspberry Pi. I'm not >> against a Raspberry Pi specific namespace. > Thanks for the suggestions. For v2 I'll use: > > include/linux/soc/raspberrypi > drivers/soc/raspberrypi I'm fine with this. > >> Should this also apply to the DT bindings? >> >> Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml >> >> Best regards >> > Thanks, > Jai
On 9/3/25 08:03, Stefan Wahren wrote: > Am 03.09.25 um 15:48 schrieb Jai Luthra: >> Hi Florian, Stefan, >> >> Quoting Stefan Wahren (2025-08-28 11:49:47) >>> Hi Florian, >>> >>> Am 28.08.25 um 04:17 schrieb Florian Fainelli: >>>> >>>> On 8/27/2025 12:05 PM, Stefan Wahren wrote: >>>>> Hi, >>>>> >>>>> Am 27.08.25 um 16:33 schrieb Umang Jain: >>>>>> On Wed, Aug 27, 2025 at 02:40:16PM +0200, Laurent Pinchart wrote: >>>>>>> Hi Jai, >>>>>>> >>>>>>> Thank you for the patch. >>>>>>> >>>>>>> On Wed, Aug 27, 2025 at 11:54:08AM +0530, Jai Luthra wrote: >>>>>>>> From: Umang Jain <umang.jain@ideasonboard.com> >>>>>>>> >>>>>>>> Move the VCHIQ headers from drivers/staging/vc04_services/ >>>>>>>> include to >>>>>>>> include/linux/vchiq >>>>>>>> >>>>>>>> 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/vchiq/ provides a central location to serve both >>>>>>>> of these areas. >>>>>>> Lots of SoC-specific headers are stored in include/linux/soc/ >>>>>>> $vendor/. >>>>>>> This would be include/linux/soc/bcm/vchiq/ in this case. I'm also >>>>>>> fine >>>>>>> with include/linux/vchiq/ but other people may have a preference. >>>>>> I agree with this point and I might have missed to notice the >>>>>> include/linux/soc earlier. That's seems a better location to me since >>>>>> it's actually broadcom-specific. >>>>> I would expect that headers and source would be more related. >>>>> >>>>> For example: >>>>> >>>>> include/linux/soc/bcm >>>>> >>>>> drivers/soc/bcm/ >>>> This is not Broadcom code, it is Raspberry Pi AFAICT, therefore, just >>>> like drivers/firmware/raspberrypi.c, we would need some namespacing >>>> here that reflects that, ideally. >>> The VCHIQ code originally comes from Broadcom, but the current >>> implementation has been adapted and tested for Raspberry Pi. I'm not >>> against a Raspberry Pi specific namespace. >> Thanks for the suggestions. For v2 I'll use: >> >> include/linux/soc/raspberrypi >> drivers/soc/raspberrypi > I'm fine with this. Still is not properly name spaced IMHO. There is clearly a lot of cross pollination between Raspberry Pi and Broadcom on the BCM283x and BCM27xx SoCs, but ultimately, Broadcom makes the SoC and delivers it to Raspberry Pi. I would really rather that you used drivers/platform/raspberrypi and include/linux/raspberrypi than the previously suggested paths. -- Florian
© 2016 - 2025 Red Hat, Inc.