Skip to content

Commit cb4c7df

Browse files
CFSworksvinodkoul
authored andcommitted
phy: usb: Fix missing elements in BCM4908 USB init array
The Broadcom USB PHY driver contains a lookup table (`reg_bits_map_tables`) to resolve register bitmaps unique to certain versions of the USB PHY as found in various Broadcom chip families. A recent commit (see 'fixes' tag) introduced two new elements to each chip family in this table -- except for one: BCM4908. This resulted in the xHCI controller not being initialized correctly, causing a panic on boot. The next patch will update this table to use designated initializers in order to prevent this from happening again. For now, just add back the missing array elements to resolve the regression. Fixes: 4536fe9 ("phy: usb: suppress OC condition for 7439b2") Signed-off-by: Sam Edwards <[email protected]> Reviewed-by: Justin Chen <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 9852d85 commit cb4c7df

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/phy/broadcom/phy-brcm-usb-init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {
220220
0, /* USB_CTRL_SETUP_SCB2_EN_MASK */
221221
0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */
222222
0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */
223+
0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK */
224+
0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK */
223225
0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */
224226
0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */
225227
0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */

0 commit comments

Comments
 (0)