target/linux/bcm4908/patches-5.4/088-v5.18-phy-phy-brcm-usb-fixup-BCM4908-support.patch

   1 From 32942d33d63d27714ed16a4176e5a99547adb6e0 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Fri, 18 Feb 2022 18:24:59 +0100
   4 Subject: [PATCH] phy: phy-brcm-usb: fixup BCM4908 support
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Just like every other family BCM4908 should get its own enum value. That
  10 is required to properly handle it in chipset conditional code.
  11
  12 The real change is excluding BCM4908 from the PLL reprogramming code
  13 (see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908
  14 reference clock frequency but:
  15 1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL
  16 2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices
  17
  18 This change makes USB 3.0 PHY recognize e.g.:
  19 1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode)
  20 2. 1058:259f - Western Digital My Passport 259F
  21
  22 Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that
  23 allow reading chip family and product ids. Such a block & register is
  24 missing on BCM4908 so this commit introduces "compatible" string
  25 specific binding.
  26
  27 Fixes: 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on the BCM4908")
  28 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  29 Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
  30 Link: https://lore.kernel.org/r/20220218172459.10431-1-zajec5@gmail.com
  31 Signed-off-by: Vinod Koul <vkoul@kernel.org>
  32 ---
  33  drivers/phy/broadcom/phy-brcm-usb-init.c | 36 ++++++++++++++++++++++++
  34  drivers/phy/broadcom/phy-brcm-usb-init.h |  1 +
  35  drivers/phy/broadcom/phy-brcm-usb.c      | 11 +++++++-
  36  3 files changed, 47 insertions(+), 1 deletion(-)
  37
  38 --- a/drivers/phy/broadcom/phy-brcm-usb-init.c
  39 +++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
  40 @@ -79,6 +79,7 @@
  41
  42  enum brcm_family_type {
  43         BRCM_FAMILY_3390A0,
  44 +       BRCM_FAMILY_4908,
  45         BRCM_FAMILY_7250B0,
  46         BRCM_FAMILY_7271A0,
  47         BRCM_FAMILY_7364A0,
  48 @@ -96,6 +97,7 @@ enum brcm_family_type {
  49
  50  static const char *family_names[BRCM_FAMILY_COUNT] = {
  51         USB_BRCM_FAMILY(3390A0),
  52 +       USB_BRCM_FAMILY(4908),
  53         USB_BRCM_FAMILY(7250B0),
  54         USB_BRCM_FAMILY(7271A0),
  55         USB_BRCM_FAMILY(7364A0),
  56 @@ -203,6 +205,27 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT
  57                 USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK,
  58                 ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */
  59         },
  60 +       /* 4908 */
  61 +       [BRCM_FAMILY_4908] = {
  62 +               0, /* USB_CTRL_SETUP_SCB1_EN_MASK */
  63 +               0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
  64 +               0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */
  65 +               0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
  66 +               0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */
  67 +               0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
  68 +               0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
  69 +               USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK,
  70 +               USB_CTRL_USB_PM_USB_PWRDN_MASK,
  71 +               0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */
  72 +               0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */
  73 +               0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */
  74 +               0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */
  75 +               0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */
  76 +               0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */
  77 +               0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */
  78 +               0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */
  79 +               0, /* USB_CTRL_SETUP ENDIAN bits */
  80 +       },
  81         /* 7250b0 */
  82         [BRCM_FAMILY_7250B0] = {
  83                 USB_CTRL_SETUP_SCB1_EN_MASK,
  84 @@ -559,6 +582,7 @@ static void brcmusb_usb3_pll_54mhz(struc
  85          */
  86         switch (params->selected_family) {
  87         case BRCM_FAMILY_3390A0:
  88 +       case BRCM_FAMILY_4908:
  89         case BRCM_FAMILY_7250B0:
  90         case BRCM_FAMILY_7366C0:
  91         case BRCM_FAMILY_74371A0:
  92 @@ -1004,6 +1028,18 @@ static const struct brcm_usb_init_ops bc
  93         .set_dual_select = usb_set_dual_select,
  94  };
  95
  96 +void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params)
  97 +{
  98 +       int fam;
  99 +
 100 +       fam = BRCM_FAMILY_4908;
 101 +       params->selected_family = fam;
 102 +       params->usb_reg_bits_map =
 103 +               &usb_reg_bits_map_table[fam][0];
 104 +       params->family_name = family_names[fam];
 105 +       params->ops = &bcm7445_ops;
 106 +}
 107 +
 108  void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params)
 109  {
 110         int fam;
 111 --- a/drivers/phy/broadcom/phy-brcm-usb-init.h
 112 +++ b/drivers/phy/broadcom/phy-brcm-usb-init.h
 113 @@ -64,6 +64,7 @@ struct  brcm_usb_init_params {
 114         bool suspend_with_clocks;
 115  };
 116
 117 +void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params);
 118  void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params);
 119  void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params);
 120  void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params);
 121 --- a/drivers/phy/broadcom/phy-brcm-usb.c
 122 +++ b/drivers/phy/broadcom/phy-brcm-usb.c
 123 @@ -253,6 +253,15 @@ static const struct attribute_group brcm
 124         .attrs = brcm_usb_phy_attrs,
 125  };
 126
 127 +static const struct match_chip_info chip_info_4908 = {
 128 +       .init_func = &brcm_usb_dvr_init_4908,
 129 +       .required_regs = {
 130 +               BRCM_REGS_CTRL,
 131 +               BRCM_REGS_XHCI_EC,
 132 +               -1,
 133 +       },
 134 +};
 135 +
 136  static const struct match_chip_info chip_info_7216 = {
 137         .init_func = &brcm_usb_dvr_init_7216,
 138         .required_regs = {
 139 @@ -288,7 +297,7 @@ static const struct match_chip_info chip
 140  static const struct of_device_id brcm_usb_dt_ids[] = {
 141         {
 142                 .compatible = "brcm,bcm4908-usb-phy",
 143 -               .data = &chip_info_7445,
 144 +               .data = &chip_info_4908,
 145         },
 146         {
 147                 .compatible = "brcm,bcm7216-usb-phy",