target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-crtc-Rename-SoC-data-structures.patch

   1 From f071c70678b875d2e5411ead123015381647e9f9 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Thu, 26 Dec 2019 11:45:04 +0100
   4 Subject: [PATCH] drm/vc4: crtc: Rename SoC data structures
   5
   6 Since we're going to introduce pixelvalve data structures for other SoCs
   7 than the BCM2835, let's rename the structures defined in the code to
   8 make it obvious which SoC we're targetting.
   9
  10 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_crtc.c | 12 ++++++------
  13  1 file changed, 6 insertions(+), 6 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
  17 @@ -1056,7 +1056,7 @@ static const struct drm_crtc_helper_func
  18         .atomic_disable = vc4_crtc_atomic_disable,
  19  };
  20
  21 -static const struct vc4_crtc_data pv0_data = {
  22 +static const struct vc4_crtc_data bcm2835_pv0_data = {
  23         .hvs_channel = 0,
  24         .debugfs_name = "crtc0_regs",
  25         .encoder_types = {
  26 @@ -1065,7 +1065,7 @@ static const struct vc4_crtc_data pv0_da
  27         },
  28  };
  29
  30 -static const struct vc4_crtc_data pv1_data = {
  31 +static const struct vc4_crtc_data bcm2835_pv1_data = {
  32         .hvs_channel = 2,
  33         .debugfs_name = "crtc1_regs",
  34         .encoder_types = {
  35 @@ -1074,7 +1074,7 @@ static const struct vc4_crtc_data pv1_da
  36         },
  37  };
  38
  39 -static const struct vc4_crtc_data pv2_data = {
  40 +static const struct vc4_crtc_data bcm2835_pv2_data = {
  41         .hvs_channel = 1,
  42         .debugfs_name = "crtc2_regs",
  43         .encoder_types = {
  44 @@ -1084,9 +1084,9 @@ static const struct vc4_crtc_data pv2_da
  45  };
  46
  47  static const struct of_device_id vc4_crtc_dt_match[] = {
  48 -       { .compatible = "brcm,bcm2835-pixelvalve0", .data = &pv0_data },
  49 -       { .compatible = "brcm,bcm2835-pixelvalve1", .data = &pv1_data },
  50 -       { .compatible = "brcm,bcm2835-pixelvalve2", .data = &pv2_data },
  51 +       { .compatible = "brcm,bcm2835-pixelvalve0", .data = &bcm2835_pv0_data },
  52 +       { .compatible = "brcm,bcm2835-pixelvalve1", .data = &bcm2835_pv1_data },
  53 +       { .compatible = "brcm,bcm2835-pixelvalve2", .data = &bcm2835_pv2_data },
  54         {}
  55  };
  56