Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

include: linux: Destage VCHIQ interface headers

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.

Co-developed-by: Umang Jain <umang.jain@ideasonboard.com>
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>
Link: https://patch.msgid.link/20251029-vchiq-destage-v3-4-da8d6c83c2c5@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jai Luthra and committed by
Greg Kroah-Hartman
bf9f0b00 3d2115ea

+28 -24
+1
MAINTAINERS
··· 4829 4829 F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml 4830 4830 F: drivers/pci/controller/pcie-brcmstb.c 4831 4831 F: drivers/staging/vc04_services 4832 + F: include/linux/raspberrypi/vchiq* 4832 4833 N: bcm2711 4833 4834 N: bcm2712 4834 4835 N: bcm283*
+3 -2
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
··· 4 4 #include <linux/slab.h> 5 5 #include <linux/module.h> 6 6 #include <linux/completion.h> 7 + 8 + #include <linux/raspberrypi/vchiq_arm.h> 9 + 7 10 #include "bcm2835.h" 8 11 #include "vc_vchi_audioserv_defs.h" 9 - 10 - #include "../interface/vchiq_arm/vchiq_arm.h" 11 12 12 13 struct bcm2835_audio_instance { 13 14 struct device *dev;
+2 -1
drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
··· 6 6 #include <linux/slab.h> 7 7 #include <linux/module.h> 8 8 9 - #include "../interface/vchiq_arm/vchiq_bus.h" 9 + #include <linux/raspberrypi/vchiq_bus.h> 10 + 10 11 #include "bcm2835.h" 11 12 12 13 static bool enable_hdmi;
+1 -2
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
··· 5 5 #define __SOUND_ARM_BCM2835_H 6 6 7 7 #include <linux/device.h> 8 + #include <linux/raspberrypi/vchiq.h> 8 9 #include <linux/wait.h> 9 10 #include <sound/core.h> 10 11 #include <sound/pcm.h> 11 12 #include <sound/pcm-indirect.h> 12 - 13 - #include "../include/linux/raspberrypi/vchiq.h" 14 13 15 14 #define MAX_SUBSTREAMS (8) 16 15 #define AVAIL_SUBSTREAMS_MASK (0xff)
drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h include/linux/raspberrypi/vchiq.h
+5 -4
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
··· 30 30 #include <linux/uaccess.h> 31 31 #include <soc/bcm2835/raspberrypi-firmware.h> 32 32 33 - #include "vchiq_core.h" 33 + #include <linux/raspberrypi/vchiq_core.h> 34 + #include <linux/raspberrypi/vchiq_arm.h> 35 + #include <linux/raspberrypi/vchiq_bus.h> 36 + #include <linux/raspberrypi/vchiq_debugfs.h> 37 + 34 38 #include "vchiq_ioctl.h" 35 - #include "vchiq_arm.h" 36 - #include "vchiq_bus.h" 37 - #include "vchiq_debugfs.h" 38 39 39 40 #define DEVICE_NAME "vchiq" 40 41
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h include/linux/raspberrypi/vchiq_arm.h
+2 -2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
··· 11 11 #include <linux/slab.h> 12 12 #include <linux/string.h> 13 13 14 - #include "vchiq_arm.h" 15 - #include "vchiq_bus.h" 14 + #include <linux/raspberrypi/vchiq_arm.h> 15 + #include <linux/raspberrypi/vchiq_bus.h> 16 16 17 17 static int vchiq_bus_type_match(struct device *dev, const struct device_driver *drv) 18 18 {
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h include/linux/raspberrypi/vchiq_bus.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h include/linux/raspberrypi/vchiq_cfg.h
+2 -2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
··· 15 15 #include <linux/rcupdate.h> 16 16 #include <linux/sched/signal.h> 17 17 18 - #include "vchiq_arm.h" 19 - #include "vchiq_core.h" 18 + #include <linux/raspberrypi/vchiq_arm.h> 19 + #include <linux/raspberrypi/vchiq_core.h> 20 20 21 21 #define VCHIQ_SLOT_HANDLER_STACK 8192 22 22
+1 -1
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h include/linux/raspberrypi/vchiq_core.h
··· 15 15 #include <linux/spinlock_types.h> 16 16 #include <linux/wait.h> 17 17 18 - #include "../../include/linux/raspberrypi/vchiq.h" 18 + #include "vchiq.h" 19 19 #include "vchiq_cfg.h" 20 20 21 21 /* Do this so that we can test-build the code on non-rpi systems */
+3 -3
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
··· 5 5 */ 6 6 7 7 #include <linux/debugfs.h> 8 - #include "vchiq_core.h" 9 - #include "vchiq_arm.h" 10 - #include "vchiq_debugfs.h" 8 + #include <linux/raspberrypi/vchiq_core.h> 9 + #include <linux/raspberrypi/vchiq_arm.h> 10 + #include <linux/raspberrypi/vchiq_debugfs.h> 11 11 12 12 #ifdef CONFIG_DEBUG_FS 13 13
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h include/linux/raspberrypi/vchiq_debugfs.h
+4 -3
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
··· 11 11 #include <linux/compat.h> 12 12 #include <linux/miscdevice.h> 13 13 14 - #include "vchiq_core.h" 14 + #include <linux/raspberrypi/vchiq_core.h> 15 + #include <linux/raspberrypi/vchiq_arm.h> 16 + #include <linux/raspberrypi/vchiq_debugfs.h> 17 + 15 18 #include "vchiq_ioctl.h" 16 - #include "vchiq_arm.h" 17 - #include "vchiq_debugfs.h" 18 19 19 20 static const char *const ioctl_names[] = { 20 21 "CONNECT",
+1 -2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
··· 5 5 #define VCHIQ_IOCTLS_H 6 6 7 7 #include <linux/ioctl.h> 8 - 9 - #include "../../include/linux/raspberrypi/vchiq.h" 8 + #include <linux/raspberrypi/vchiq.h> 10 9 11 10 #define VCHIQ_IOC_MAGIC 0xc4 12 11 #define VCHIQ_INVALID_HANDLE (~0)
+3 -2
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
··· 22 22 #include <linux/mm.h> 23 23 #include <linux/slab.h> 24 24 #include <linux/completion.h> 25 + #include <linux/raspberrypi/vchiq.h> 25 26 #include <linux/vmalloc.h> 26 27 #include <media/videobuf2-vmalloc.h> 27 28 28 - #include "../include/linux/raspberrypi/vchiq.h" 29 - #include "../interface/vchiq_arm/vchiq_arm.h" 29 + #include <linux/raspberrypi/vchiq_arm.h> 30 + 30 31 #include "mmal-common.h" 31 32 #include "mmal-vchiq.h" 32 33 #include "mmal-msg.h"