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>pull/1354/merge
Jai Luthra
Greg Kroah-Hartman
parent
3d2115ea5d
commit
bf9f0b00bb
|
|
@ -4829,6 +4829,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*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
Loading…
Reference in New Issue