From patchwork Tue Feb 15 00:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 12746263 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 456FDC35271 for ; Tue, 15 Feb 2022 00:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1Npb1S85PZhibb3XXQBsr9EXU138OI2GUs/uhsO8e0g=; b=W2uOqTqnV/zgm8 0X0qnBR9qCCJ78iagSuCQBylFFYvRYjuDa3G4msCIJrDVOXzzwskzlyZZMH9BMKbBcExCOsJriXRG YZISFdWctCiAT7/yAsZDI9BfwaX7DYAvQUGytNCaTg0nbrkC1PA8fPUO7OaKff3NX+x+6QyvdAUCp oEt6EBEfz+oiz9kqF9qY5pWrd3nT85upc/wR9OjUnC4fAWTcc4sqim9X6/areba3zY6Ki8YdL1YYS PCjt8LtcrHs+OaxD8nlumSb2JuQleXKcbNpi60zod66jz7jhPnPw05+PdXjXrAFzVF0Y9NhIViRwK hpA4PrEVxtO+zNW7Nl5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJlOV-00HLgo-CD; Tue, 15 Feb 2022 00:08:35 +0000 Received: from gate2.alliedtelesis.co.nz ([2001:df5:b000:5::4]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJlOQ-00HLep-MV for linux-arm-kernel@lists.infradead.org; Tue, 15 Feb 2022 00:08:32 +0000 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220214_160831_086058_9719CDFF X-CRM114-Status: GOOD ( 10.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Acked-by: Alan Stern --- 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-platform.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) #define BCM_USB_FIFO_THRESHOLD 0x00800040 -#define bcm_iproc_insnreg01 hostpc[0] struct ehci_platform_priv { struct clk *clks[EHCI_MAX_CLKS]; @@ -81,7 +80,7 @@ static int ehci_platform_reset(struct usb_hcd *hcd) 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]); return 0; }