git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 8dda85398458dc330758ef5e1408d66995ffa068 Mon Sep 17 00:00:00 2001
   2 From: Dom Cobley <popcornmix@gmail.com>
   3 Date: Thu, 7 May 2020 18:16:09 +0100
   4 Subject: [PATCH] vc4_hdmi: Remove cec_available flag as always
   5  supported
   6
   7 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
   8 ---
   9  drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ----
  10  drivers/gpu/drm/vc4/vc4_hdmi.h | 3 ---
  11  2 files changed, 7 deletions(-)
  12
  13 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  14 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  15 @@ -1488,9 +1488,6 @@ static int vc4_hdmi_cec_init(struct vc4_
  16         u32 value;
  17         int ret;
  18
  19 -       if (!vc4_hdmi->variant->cec_available)
  20 -               return 0;
  21 -
  22         vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
  23                                                   vc4_hdmi, "vc4",
  24                                                   CEC_CAP_DEFAULTS |
  25 @@ -1910,7 +1907,6 @@ static const struct vc4_hdmi_variant bcm
  26         .debugfs_name           = "hdmi_regs",
  27         .card_name              = "vc4-hdmi",
  28         .max_pixel_clock        = 162000000,
  29 -       .cec_available          = true,
  30         .registers              = vc4_hdmi_fields,
  31         .num_registers          = ARRAY_SIZE(vc4_hdmi_fields),
  32
  33 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
  34 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
  35 @@ -43,9 +43,6 @@ struct vc4_hdmi_variant {
  36         /* Filename to expose the registers in debugfs */
  37         const char *debugfs_name;
  38
  39 -       /* Set to true when the CEC support is available */
  40 -       bool cec_available;
  41 -
  42         /* Maximum pixel clock supported by the controller (in Hz) */
  43         unsigned long long max_pixel_clock;
  44