Skip to content

Commit bf9f0b0

Browse files
jailuthragregkh
jailuthra
authored and
gregkh
committed
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>
1 parent 3d2115e commit bf9f0b0

17 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4829,6 +4829,7 @@ T: git https://github.com/broadcom/stblinux.git
48294829
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
48304830
F: drivers/pci/controller/pcie-brcmstb.c
48314831
F: drivers/staging/vc04_services
4832+
F: include/linux/raspberrypi/vchiq*
48324833
N: bcm2711
48334834
N: bcm2712
48344835
N: bcm283*

‎drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
#include <linux/slab.h>
55
#include <linux/module.h>
66
#include <linux/completion.h>
7+
8+
#include <linux/raspberrypi/vchiq_arm.h>
9+
710
#include "bcm2835.h"
811
#include "vc_vchi_audioserv_defs.h"
912

10-
#include "../interface/vchiq_arm/vchiq_arm.h"
11-
1213
struct bcm2835_audio_instance {
1314
struct device *dev;
1415
unsigned int service_handle;

‎drivers/staging/vc04_services/bcm2835-audio/bcm2835.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <linux/slab.h>
77
#include <linux/module.h>
88

9-
#include "../interface/vchiq_arm/vchiq_bus.h"
9+
#include <linux/raspberrypi/vchiq_bus.h>
10+
1011
#include "bcm2835.h"
1112

1213
static bool enable_hdmi;

‎drivers/staging/vc04_services/bcm2835-audio/bcm2835.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
#define __SOUND_ARM_BCM2835_H
66

77
#include <linux/device.h>
8+
#include <linux/raspberrypi/vchiq.h>
89
#include <linux/wait.h>
910
#include <sound/core.h>
1011
#include <sound/pcm.h>
1112
#include <sound/pcm-indirect.h>
1213

13-
#include "../include/linux/raspberrypi/vchiq.h"
14-
1514
#define MAX_SUBSTREAMS (8)
1615
#define AVAIL_SUBSTREAMS_MASK (0xff)
1716

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@
3030
#include <linux/uaccess.h>
3131
#include <soc/bcm2835/raspberrypi-firmware.h>
3232

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+
3438
#include "vchiq_ioctl.h"
35-
#include "vchiq_arm.h"
36-
#include "vchiq_bus.h"
37-
#include "vchiq_debugfs.h"
3839

3940
#define DEVICE_NAME "vchiq"
4041

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <linux/slab.h>
1212
#include <linux/string.h>
1313

14-
#include "vchiq_arm.h"
15-
#include "vchiq_bus.h"
14+
#include <linux/raspberrypi/vchiq_arm.h>
15+
#include <linux/raspberrypi/vchiq_bus.h>
1616

1717
static int vchiq_bus_type_match(struct device *dev, const struct device_driver *drv)
1818
{

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <linux/rcupdate.h>
1616
#include <linux/sched/signal.h>
1717

18-
#include "vchiq_arm.h"
19-
#include "vchiq_core.h"
18+
#include <linux/raspberrypi/vchiq_arm.h>
19+
#include <linux/raspberrypi/vchiq_core.h>
2020

2121
#define VCHIQ_SLOT_HANDLER_STACK 8192
2222

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
#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>
1111

1212
#ifdef CONFIG_DEBUG_FS
1313

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
#include <linux/compat.h>
1212
#include <linux/miscdevice.h>
1313

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+
1518
#include "vchiq_ioctl.h"
16-
#include "vchiq_arm.h"
17-
#include "vchiq_debugfs.h"
1819

1920
static const char *const ioctl_names[] = {
2021
"CONNECT",

‎drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
#define VCHIQ_IOCTLS_H
66

77
#include <linux/ioctl.h>
8-
9-
#include "../../include/linux/raspberrypi/vchiq.h"
8+
#include <linux/raspberrypi/vchiq.h>
109

1110
#define VCHIQ_IOC_MAGIC 0xc4
1211
#define VCHIQ_INVALID_HANDLE (~0)

0 commit comments

Comments
 (0)