Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp6200202pxb; Mon, 14 Feb 2022 18:30:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRfJEX2Wbf9h11x5yLkN2s2wfF1dzrBsDSlHZquk6VKtAVqK+10GminQqIFFYJqt+taCtv X-Received: by 2002:a17:906:5d0f:: with SMTP id g15mr1218561ejt.169.1644892245993; Mon, 14 Feb 2022 18:30:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644892245; cv=none; d=google.com; s=arc-20160816; b=S3P+jmG9ty8Xnk7ZIW7M8Mpm/IY7sojzJBpa3jgZCMoORVs6gSpyds6uIveMWwLmcP uDxuGyiH83n+yeF1GrActf0fr+iaWvJ5eV4q1/4oQ4fJ+Cw91DmRVoWY/lHuLkOlrvxv ZoQKyfD3kjzqL0rnbPza1HLFqQrpnVTw9R2t8KDyqyV00USI7ajXagWKFyY8ao6CTiFO DfsBziSigmrfvz65lWc+/wn4ku4fg7SHYsvUIUmH/fmbDD2VRmSnTS2UuAT9o5R7NftH v1FLwmH4A2sCk47LeJLgxPXQ6VC/ZTIbRRjr4lXxDQcAIaZQHW/TDvIyMromS7baazFG R5AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gPwrPAgNGK0ENjZaVwmkgXwqjgAIhSwb6KNoN1gsLaE=; b=gGhe4Y0K74TjqGW+2uIOccBZZFjcBCxswe50Lk5rk5BeQFCJOWBQ17qxppBDbfK7UR evJcUcvVGaIhcOd9JwFIRTJzazaFj/Sobr4tk12nyzVPDUV0SfF3Gr+HWh8kVwRALo6z DbPxdH49GV02ufvHq+sW8rB2cdxAOsozQcdPESINSsWThgS8Sw0KTjAv2wPooWmI/6/o YKhFphkOF+ZdRvQNX+Pq0XGJFRMBEppitgGqwAgbb6yaZLwy+tZK95r9evU/lWjq+/xD gMxTXPGAX/S9VJhVMBfquz2eCLWvhnc6rqNs0TeGtOVRkTROEGfT+KO7+8c8F/3zOO/r C35Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=nHXkNQHU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h16si21402552edj.304.2022.02.14.18.30.23; Mon, 14 Feb 2022 18:30:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alliedtelesis.co.nz header.s=mail181024 header.b=nHXkNQHU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=alliedtelesis.co.nz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232426AbiBOAIs (ORCPT + 99 others); Mon, 14 Feb 2022 19:08:48 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232439AbiBOAIl (ORCPT ); Mon, 14 Feb 2022 19:08:41 -0500 Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EAD497BAC for ; Mon, 14 Feb 2022 16:08:29 -0800 (PST) Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id A4B572C0C53; Tue, 15 Feb 2022 00:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1644883703; bh=gPwrPAgNGK0ENjZaVwmkgXwqjgAIhSwb6KNoN1gsLaE=; h=From:To:Cc:Subject:Date:From; b=nHXkNQHU3yHsMfbmdO7V0bciwBRugsWCDiwoJlrIXNwSmKH9w49K5xfBXx2n2NrQF KqcW2yApjY67AAGQmH44LBBmhima1RSwWIHSZe9KfP/E1QPz7Zf0KbJ8Bw6JIbUoEa yphVDggtmjZLh2pEbqLW4HT5eUFmJuGaDXQSupSQnt3SjC8SRX+GzfKlXqLPggkt9N 2WXdoomxUcRbbzrrejmGLkh3gMuH2vKMpVESZXFP2DHy9tAj4amR6Kx65jcJKFpDcT R/5O0zBWe1xsdGNbEEyVMlC1Ysx5ofUglUYRK6+qduI1q+iC9iajnTx04p2kgF8Vev BnkV3LPoWw3pw== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Tue, 15 Feb 2022 13:08:23 +1300 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by pat.atlnz.lc (Postfix) with ESMTP id 750BA13EE1E; Tue, 15 Feb 2022 13:08:23 +1300 (NZDT) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 1B9132A00D0; Tue, 15 Feb 2022 13:08:19 +1300 (NZDT) From: Chris Packham To: stern@rowland.harvard.edu, gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Packham Subject: [PATCH] usb: host: ehci-platform: Update brcm, xgs-iproc-ehci workaround Date: Tue, 15 Feb 2022 13:08:13 +1300 Message-Id: <20220215000813.1779032-1-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.3 cv=c43Vvi1l c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=oGFeUVbbRNcA:10 a=PL-y3ZX0Tm02xq-3140A:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The original workaround was added prior to commit e4788edc730a ("USB: EHCI: Add alias for Broadcom INSNREG"). Now that brcm_insnreg exists in struct ehci_regs we can use that instead of having a local definition. Signed-off-by: Chris Packham --- drivers/usb/host/ehci-platform.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-pla= tform.c index c3dc906274d9..1115431a255d 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -43,7 +43,6 @@ #define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)= ->priv) =20 #define BCM_USB_FIFO_THRESHOLD 0x00800040 -#define bcm_iproc_insnreg01 hostpc[0] =20 struct ehci_platform_priv { struct clk *clks[EHCI_MAX_CLKS]; @@ -81,7 +80,7 @@ static int ehci_platform_reset(struct usb_hcd *hcd) =20 if (of_device_is_compatible(pdev->dev.of_node, "brcm,xgs-iproc-ehci")) ehci_writel(ehci, BCM_USB_FIFO_THRESHOLD, - &ehci->regs->bcm_iproc_insnreg01); + &ehci->regs->brcm_insnreg[1]); =20 return 0; } --=20 2.35.1