kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0336-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
1 From 16422635ebace7f01b42412e5c0d889f5ad7512e Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Wed, 6 Nov 2019 13:57:58 +0000
4 Subject: [PATCH] staging: vchiq_arm: Register bcm2835-codec as a
5  platform driver
6
7 Following the same pattern as bcm2835-camera and bcm2835-audio,
8 register the V4L2 codec driver as a platform driver
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
11 ---
12  drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++
13  1 file changed, 3 insertions(+)
14
15 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
16 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
17 @@ -140,6 +140,7 @@ static struct class  *vchiq_class;
18  static DEFINE_SPINLOCK(msg_queue_spinlock);
19  static struct platform_device *bcm2835_camera;
20  static struct platform_device *bcm2835_audio;
21 +static struct platform_device *bcm2835_codec;
22  static struct platform_device *vcsm_cma;
23  
24  static struct vchiq_drvdata bcm2835_drvdata = {
25 @@ -3252,6 +3253,7 @@ static int vchiq_probe(struct platform_d
26                 MAJOR(vchiq_devid), MINOR(vchiq_devid));
27  
28         vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
29 +       bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
30         bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
31         bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
32  
33 @@ -3268,6 +3270,7 @@ static int vchiq_remove(struct platform_
34  {
35         if (!IS_ERR(bcm2835_camera))
36                 platform_device_unregister(bcm2835_camera);
37 +       platform_device_unregister(bcm2835_codec);
38         platform_device_unregister(vcsm_cma);
39         vchiq_debugfs_deinit();
40         device_destroy(vchiq_class, vchiq_devid);