target/linux/bcm27xx/patches-5.4/950-0612-drm-vc4-Add-audio-initialisation-for-Pi4.patch

   1 From 727b5180ec09faab313d7e2517e225001c967bb0 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Wed, 25 Mar 2020 18:16:14 +0000
   4 Subject: [PATCH] drm/vc4: Add audio initialisation for Pi4.
   5
   6 The audio configuration has changed for Pi4, so support the
   7 configuration functions via the variant tables.
   8
   9 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  10 ---
  11  drivers/gpu/drm/vc4/vc4_hdmi.c | 51 ++++++++++++++++++++++++++++------
  12  drivers/gpu/drm/vc4/vc4_hdmi.h |  6 ++++
  13  2 files changed, 49 insertions(+), 8 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  17 @@ -742,10 +742,44 @@ static const struct drm_encoder_helper_f
  18         .enable = vc4_hdmi_encoder_enable,
  19  };
  20
  21 +static u32 vc4_hdmi_get_hsm_clock(struct vc4_hdmi *vc4_hdmi)
  22 +{
  23 +       return clk_get_rate(vc4_hdmi->hsm_clock);
  24 +}
  25 +
  26 +static u32 vc5_hdmi_get_hsm_clock(struct vc4_hdmi *vc4_hdmi)
  27 +{
  28 +       return 108000000;
  29 +}
  30 +
  31 +static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
  32 +{
  33 +       int i;
  34 +       u32 channel_map = 0;
  35 +
  36 +       for (i = 0; i < 8; i++) {
  37 +               if (channel_mask & BIT(i))
  38 +                       channel_map |= i << (3 * i);
  39 +       }
  40 +       return channel_map;
  41 +}
  42 +
  43 +static u32 vc5_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
  44 +{
  45 +       int i;
  46 +       u32 channel_map = 0;
  47 +
  48 +       for (i = 0; i < 8; i++) {
  49 +               if (channel_mask & BIT(i))
  50 +                       channel_map |= i << (4 * i);
  51 +       }
  52 +       return channel_map;
  53 +}
  54 +
  55  /* HDMI audio codec callbacks */
  56  static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi)
  57  {
  58 -       u32 hsm_clock = clk_get_rate(vc4_hdmi->hsm_clock);
  59 +       u32 hsm_clock = vc4_hdmi->variant->get_hsm_clock(vc4_hdmi);
  60         unsigned long n, m;
  61
  62         rational_best_approximation(hsm_clock, vc4_hdmi->audio.samplerate,
  63 @@ -864,7 +898,7 @@ static int vc4_hdmi_audio_hw_params(stru
  64         struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);
  65         struct device *dev = &vc4_hdmi->pdev->dev;
  66         u32 audio_packet_config, channel_mask;
  67 -       u32 channel_map, i;
  68 +       u32 channel_map;
  69
  70         if (substream != vc4_hdmi->audio.substream)
  71                 return -EINVAL;
  72 @@ -916,12 +950,7 @@ static int vc4_hdmi_audio_hw_params(stru
  73                    VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
  74                    VC4_SET_FIELD(channel_mask, VC4_HDMI_MAI_CHANNEL_MASK));
  75
  76 -       channel_map = 0;
  77 -       for (i = 0; i < 8; i++) {
  78 -               if (channel_mask & BIT(i))
  79 -                       channel_map |= i << (3 * i);
  80 -       }
  81 -
  82 +       channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask);
  83         HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map);
  84         HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
  85         vc4_hdmi_set_n_cts(vc4_hdmi);
  86 @@ -1715,6 +1744,8 @@ static const struct vc4_hdmi_variant bcm
  87         .phy_disable            = vc4_hdmi_phy_disable,
  88         .phy_rng_enable         = vc4_hdmi_phy_rng_enable,
  89         .phy_rng_disable        = vc4_hdmi_phy_rng_disable,
  90 +       .get_hsm_clock          = vc4_hdmi_get_hsm_clock,
  91 +       .channel_map            = vc4_hdmi_channel_map,
  92  };
  93
  94  static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
  95 @@ -1736,6 +1767,8 @@ static const struct vc4_hdmi_variant bcm
  96         .phy_init               = vc5_hdmi_phy_init,
  97         .phy_rng_enable         = vc5_hdmi_phy_rng_enable,
  98         .phy_rng_disable        = vc5_hdmi_phy_rng_disable,
  99 +       .get_hsm_clock          = vc5_hdmi_get_hsm_clock,
 100 +       .channel_map            = vc5_hdmi_channel_map,
 101  };
 102
 103  static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
 104 @@ -1757,6 +1790,8 @@ static const struct vc4_hdmi_variant bcm
 105         .phy_init               = vc5_hdmi_phy_init,
 106         .phy_rng_enable         = vc5_hdmi_phy_rng_enable,
 107         .phy_rng_disable        = vc5_hdmi_phy_rng_disable,
 108 +       .get_hsm_clock          = vc5_hdmi_get_hsm_clock,
 109 +       .channel_map            = vc5_hdmi_channel_map,
 110  };
 111
 112  static const struct of_device_id vc4_hdmi_dt_match[] = {
 113 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 114 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 115 @@ -88,6 +88,12 @@ struct vc4_hdmi_variant {
 116
 117         /* Callback to disable the RNG in the PHY */
 118         void (*phy_rng_disable)(struct vc4_hdmi *vc4_hdmi);
 119 +
 120 +       /* Callback to get hsm clock */
 121 +       u32 (*get_hsm_clock)(struct vc4_hdmi *vc4_hdmi);
 122 +
 123 +       /* Callback to get channel map */
 124 +       u32 (*channel_map)(struct vc4_hdmi *vc4_hdmi, u32 channel_mask);
 125  };
 126
 127  /* HDMI audio information */