git.librecmc.org Git - oweals/openwrt.git/blob

   1 From e16fae86cf012a933f785692052240e2d9863ef6 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Tue, 4 Dec 2018 19:40:12 +0000
   4 Subject: [PATCH 286/782] Revert "staging: vchiq_arm: Register a platform
   5  device for the audio driver"
   6
   7 This reverts commit ab59590ed562b89db51fe46cee5db96b9bc5abd8.
   8
   9 Issues have been observed in LibreElec as this was unconditionally
  10 loading the audio driver instead of having the DT parameter to
  11 enable it.
  12
  13 Includes a partial revert of 2147700eb7a1b9e55e0684f0749114ce35d61571
  14 which fixed up the error handling.
  15
  16 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  17 ---
  18  .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c    | 5 -----
  19  1 file changed, 5 deletions(-)
  20
  21 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
  22 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
  23 @@ -170,7 +170,6 @@ static struct class  *vchiq_class;
  24  static struct device *vchiq_dev;
  25  static DEFINE_SPINLOCK(msg_queue_spinlock);
  26  static struct platform_device *bcm2835_camera;
  27 -static struct platform_device *bcm2835_audio;
  28  static struct platform_device *bcm2835_codec;
  29  static struct platform_device *vcsm_cma;
  30
  31 @@ -3662,9 +3661,6 @@ static int vchiq_probe(struct platform_d
  32         bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  33         if (IS_ERR(bcm2835_camera))
  34                 bcm2835_camera = NULL;
  35 -       bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
  36 -       if (IS_ERR(bcm2835_audio))
  37 -               bcm2835_audio = NULL;
  38         bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
  39         if (IS_ERR(bcm2835_codec))
  40                 bcm2835_codec = NULL;
  41 @@ -3685,7 +3681,6 @@ failed_platform_init:
  42  static int vchiq_remove(struct platform_device *pdev)
  43  {
  44         platform_device_unregister(bcm2835_codec);
  45 -       platform_device_unregister(bcm2835_audio);
  46         platform_device_unregister(bcm2835_camera);
  47         platform_device_unregister(vcsm_cma);
  48         vchiq_debugfs_deinit();