target/linux/bcm27xx/patches-5.4/950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch

   1 From 9367715671c271913278a4abb43276d02ff954d6 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 31 Jan 2020 09:33:40 +0000
   4 Subject: [PATCH] thermal: brcmstb_thermal: Correct SoC name
   5
   6 The Pi 4 SoC is called BCM2711, not BCM2838.
   7
   8 Fixes: "thermal: brcmstb_thermal: Add BCM2838 support"
   9
  10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  11 ---
  12  drivers/thermal/broadcom/brcmstb_thermal.c | 10 +++++-----
  13  1 file changed, 5 insertions(+), 5 deletions(-)
  14
  15 --- a/drivers/thermal/broadcom/brcmstb_thermal.c
  16 +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
  17 @@ -290,7 +290,7 @@ static const struct thermal_zone_of_devi
  18         .set_trips      = brcmstb_set_trips,
  19  };
  20
  21 -static const struct thermal_zone_of_device_ops bcm2838_thermal_of_ops = {
  22 +static const struct thermal_zone_of_device_ops bcm2711_thermal_of_ops = {
  23         .get_temp       = brcmstb_get_temp,
  24  };
  25
  26 @@ -301,8 +301,8 @@ static const struct brcmstb_thermal_of_d
  27         .status_data_shift = 1,
  28  };
  29
  30 -static const struct brcmstb_thermal_of_data bcm2838_thermal_of_data = {
  31 -       .of_ops = &bcm2838_thermal_of_ops,
  32 +static const struct brcmstb_thermal_of_data bcm2711_thermal_of_data = {
  33 +       .of_ops = &bcm2711_thermal_of_ops,
  34         .status_valid_mask = BIT(10),
  35         .status_data_mask = GENMASK(9, 0),
  36         .status_data_shift = 0,
  37 @@ -311,8 +311,8 @@ static const struct brcmstb_thermal_of_d
  38  static const struct of_device_id brcmstb_thermal_id_table[] = {
  39         { .compatible = "brcm,avs-tmon",
  40           .data = &bcm7445_thermal_of_data },
  41 -       { .compatible = "brcm,avs-tmon-bcm2838",
  42 -         .data = &bcm2838_thermal_of_data },
  43 +       { .compatible = "brcm,avs-tmon-bcm2711",
  44 +         .data = &bcm2711_thermal_of_data },
  45         {},
  46  };
  47  MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table);