From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC78914C59A for ; Fri, 4 Oct 2024 23:35:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728084917; cv=none; b=qwjZyNSoKoVgb69cHEqb/8orH3VsZO4DY0VB+Q7vYwLz1xqRaMUgOvanjjtAA+D/4xOvMy4YBgGgxOOyVJ/DcgKgUHg4rvc9ToHBvnKV/BPwvcb3bWLh+S3COm3VPa6+j6PyIr1B5uru68wbndHvZqn+F6P+H4mxhQYFINO2yoA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728084917; c=relaxed/simple; bh=u/USC17pHUortTirKRiIh3RMsXF9oTaNDGIrQjHb5yM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=JFwSre0j74pcp7VKH4M+KYBjSOzhDmI6sbWTKn0IRyvYGIRXrPByZzW0orNvbTdpzxnZdPSLIo8FBXQDxCR4qkdEzfnINxOH6bRmy3fe4MVkphVoUQq3dcMxRjDqTfgL/tEahDdwTUG5y/tMs4aXvW4W+DhOKPgOUKwzEfQx58w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=VJSymVwZ; arc=none smtp.client-ip=209.85.160.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="VJSymVwZ" Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4585721f6edso19622731cf.2 for ; Fri, 04 Oct 2024 16:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1728084914; x=1728689714; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=hKYbbOABatoyuBU1BWtZRr4vEsuYzufp4lEveztahrw=; b=VJSymVwZNQfNIj6kwISwA5cNUDZSaIK/IxGsQykRRXQjp5NayyugHMgN+gTTFj9yhv hJQN1z9wZBH56MCUS82gyZmi1DqyBiYzZVuhdEFaXT9Vbf+rzMR0ksXYX18FstBpjLzt JCOWefSvH64dVVEAqaX+A1/snTZYY9awFtU20= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728084914; x=1728689714; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hKYbbOABatoyuBU1BWtZRr4vEsuYzufp4lEveztahrw=; b=u+m4VXWOiamiCPMnxv5XUweB4KbAam91CulxVsCvog77BBa/dZ0BXvPeDmpjk887+f l/w0y4aKuRDg3fKyRLFO/wHPIJ0m3zcIvazZjHT/tgjP/9mTv8Fqg+YQbXUzD9nJ98wK GHbaCfwL/UEyYytu+bdajHol4gGnpIS9+BujQi6lMmqKIAj84hSH0RtZksRUoI/Tm8jP LQ3d40Up82Z7Py9q07vhxlu2S+HlnLHHjyGAxMVUvu8XwtjZ9dYZnS/3VnzJLnIv0HUB 4v2Laf3sKRoH+OHwXt88dwQOUl5VId8HOLXtD1ePnweAi3JkM6tS3IgJThjA0i32Ez+6 KXIA== X-Forwarded-Encrypted: i=1; AJvYcCWQkBjdChVonK/cfaIigAsdFM7aQI5aIctPjxuSqRg5TaJLzTNldeDxLJAvkfp5TXdsRQ4WMu4Mt3Ku0Ik=@vger.kernel.org X-Gm-Message-State: AOJu0YyccZywr1dLZHMlgrmzx1Vc+vXDN3x+kOqgPyoL+6mOy9BepHLz pcgvz0ZJTSTl7YA3hVvfMjjqL7/HF2OqVspkRHs8YoAIlsmJGxM7gPRX8ZL3Og== X-Google-Smtp-Source: AGHT+IEdQp0vbLdDEVD1SsVczqzBVkAXWm3GWgE9r+fQqgk6/iYe29ynRyHRk2iETRVBXVZSc0A7lQ== X-Received: by 2002:a05:622a:11d0:b0:458:2d4a:d670 with SMTP id d75a77b69052e-45d9bb346f2mr55714791cf.60.1728084913610; Fri, 04 Oct 2024 16:35:13 -0700 (PDT) Received: from [10.69.74.64] ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da75fec33sm3392631cf.69.2024.10.04.16.35.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Oct 2024 16:35:13 -0700 (PDT) Message-ID: <054d62af-721d-40dd-9e95-e43d0579def5@broadcom.com> Date: Fri, 4 Oct 2024 16:35:11 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/2] phy: usb: update Broadcom driver table to use designated initializers To: Sam Edwards , Al Cooper Cc: Broadcom internal kernel review list , Vinod Koul , Kishon Vijay Abraham I , Florian Fainelli , linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org References: <20241004034131.1363813-1-CFSworks@gmail.com> <20241004034131.1363813-3-CFSworks@gmail.com> Content-Language: en-US From: Justin Chen In-Reply-To: <20241004034131.1363813-3-CFSworks@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/3/24 8:41 PM, Sam Edwards wrote: > 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. > Historically, this table was just kept carefully in sync with the > "selector" enum every time the latter changed to ensure consistency. > However, a recent commit [1] introduced two new enumerators but did not > adjust the array for BCM4908, thus breaking the xHCI controller (and > boot process) on this platform and revealing the fragility of this > approach. > > Since these arrays are a little sparse (many elements are zero) and the > position of the array elements is significant only insofar as they agree > with the enumerators, designated initializers are a better fit than > positional initializers here. Convert this table accordingly. > > [1] 4536fe9640b6 ("phy: usb: suppress OC condition for 7439b2") > > Signed-off-by: Sam Edwards Reviewed-by: Justin Chen > --- > drivers/phy/broadcom/phy-brcm-usb-init.c | 435 +++++++++++------------ > 1 file changed, 215 insertions(+), 220 deletions(-) > > diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.c b/drivers/phy/broadcom/phy-brcm-usb-init.c > index 5ebb3a616115..da23078878a9 100644 > --- a/drivers/phy/broadcom/phy-brcm-usb-init.c > +++ b/drivers/phy/broadcom/phy-brcm-usb-init.c > @@ -193,256 +193,251 @@ static const u32 > usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = { > /* 3390B0 */ > [BRCM_FAMILY_3390A0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR] = > + USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 4908 */ > [BRCM_FAMILY_4908] = { > - 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */ > - 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */ > - 0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */ > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */ > - 0, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > }, > /* 7250b0 */ > [BRCM_FAMILY_7250B0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > - 0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR] = > + USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7271a0 */ > [BRCM_FAMILY_7271A0] = { > - 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */ > - 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */ > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > - USB_CTRL_USB_PM_SOFT_RESET_MASK, > - USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK, > - USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK, > - USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR] = > + USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > + [USB_CTRL_USB_PM_SOFT_RESET_SELECTOR] = > + USB_CTRL_USB_PM_SOFT_RESET_MASK, > + [USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_SELECTOR] = > + USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK, > + [USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7364a0 */ > [BRCM_FAMILY_7364A0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > - 0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR] = > + USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7366c0 */ > [BRCM_FAMILY_7366C0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_VAR_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 74371A0 */ > [BRCM_FAMILY_74371A0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK, > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK */ > - 0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */ > - USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */ > - USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB30_CTL1_USB3_IOC_MASK, > - USB_CTRL_USB30_CTL1_USB3_IPP_MASK, > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_MASK */ > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK, > + [USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR] = > + USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > + [USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB30_CTL1_USB3_IOC_SELECTOR] = > + USB_CTRL_USB30_CTL1_USB3_IOC_MASK, > + [USB_CTRL_USB30_CTL1_USB3_IPP_SELECTOR] = > + USB_CTRL_USB30_CTL1_USB3_IPP_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7439B0 */ > [BRCM_FAMILY_7439B0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR] = > + USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7445d0 */ > [BRCM_FAMILY_7445D0] = { > - USB_CTRL_SETUP_SCB1_EN_MASK, > - USB_CTRL_SETUP_SCB2_EN_MASK, > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK, > - 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > - 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB_PM_USB_PWRDN_MASK */ > - USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK, > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ > - 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SCB1_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB1_EN_MASK, > + [USB_CTRL_SETUP_SCB2_EN_SELECTOR] = > + USB_CTRL_SETUP_SCB2_EN_MASK, > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR] = > + USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK, > + [USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7260a0 */ > [BRCM_FAMILY_7260A0] = { > - 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */ > - 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */ > - USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > - USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > - USB_CTRL_USB_PM_SOFT_RESET_MASK, > - USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK, > - USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK, > - USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > - ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR] = > + USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK, > + [USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR] = > + USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > + [USB_CTRL_USB_PM_SOFT_RESET_SELECTOR] = > + USB_CTRL_USB_PM_SOFT_RESET_MASK, > + [USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_SELECTOR] = > + USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK, > + [USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK, > + [USB_CTRL_USB_PM_USB20_HC_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, > + [USB_CTRL_SETUP_ENDIAN_SELECTOR] = ENDIAN_SETTINGS, > }, > /* 7278a0 */ > [BRCM_FAMILY_7278A0] = { > - 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */ > - 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */ > - 0, /*USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */ > - USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > - USB_CTRL_SETUP_OC3_DISABLE_MASK, > - 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ > - USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > - USB_CTRL_USB_PM_USB_PWRDN_MASK, > - 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ > - 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ > - USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > - USB_CTRL_USB_PM_SOFT_RESET_MASK, > - 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ > - 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ > - 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_MASK */ > - 0, /* USB_CTRL_SETUP ENDIAN bits */ > + [USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR] = > + USB_CTRL_SETUP_STRAP_IPP_SEL_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK, > + [USB_CTRL_SETUP_OC3_DISABLE_SELECTOR] = > + USB_CTRL_SETUP_OC3_DISABLE_MASK, > + [USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_XHC_SOFT_RESETB_SELECTOR] = > + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, > + [USB_CTRL_USB_PM_USB_PWRDN_SELECTOR] = > + USB_CTRL_USB_PM_USB_PWRDN_MASK, > + [USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_SELECTOR] = > + USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK, > + [USB_CTRL_USB_PM_SOFT_RESET_SELECTOR] = > + USB_CTRL_USB_PM_SOFT_RESET_MASK, > }, > }; >