From patchwork Thu Jun 14 03:04:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 929218 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WEzKL3mC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 415pPy0prkz9s2g for ; Thu, 14 Jun 2018 13:04:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A4616C21DB3; Thu, 14 Jun 2018 03:04:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1F895C21C27; Thu, 14 Jun 2018 03:04:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8CB3BC21C27; Thu, 14 Jun 2018 03:04:48 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id D71A5C21BE5 for ; Thu, 14 Jun 2018 03:04:47 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id 31-v6so2669776plc.4 for ; Wed, 13 Jun 2018 20:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=MrJdkNYuEfcMD8AYan2ck7uZ02M8oO+HJ6yIF1o4klU=; b=WEzKL3mC/yv/aCvCbyDgk9ExwfdUww133iFCwCoBjffagar6luvWPiycx403S6PIQM veW7EOMK+Ni8qedhoBp2hIzBLNLJyJwuXbPTpGqfjzx6+gJHYmEGB028EHobbpDhMQFB MtIgYEIo71BrJMwrHZyK4VEgyLQV6hgXjzOdzrc39ApftSFiuVB0yz9QT77/Oq+VxzGP h7yjoiy1A61324E+ygiJ7wosna4IweMs1jP4pR1v2YTwX0MAySL8qUNmQW9DR0xxIp7N bpVhrcENUoCPtyYJ/5fYvJ+5a4Q2kOH1v/2pON8cIwspudFVQNpwKNl7VxrPHaYb7YGi 7irw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MrJdkNYuEfcMD8AYan2ck7uZ02M8oO+HJ6yIF1o4klU=; b=pgCXzaW3uENqe8zjFJv3TE/Jh3mBBekLlU1iSiYKTyoJZbEVwyQ48AgsyQ0ruW0zsy BAb6F+IM0OaMUHFwf2JRYxgyZEhoqBc/mcd/cWMJhc9o++Q7NLgPYcOPaS3dN6KzfpMD 7k8xluQEbWAYhoncRMiGq7tGhxQShc+5/mKgPIQlfGanuakyZBPgf7H0E8tEg1rrKjP4 IyI69gsrjBDzKgsh5Vaq6NTyfF2Iqs2gCAiYQMctagYPGdpZYUf/QnM8pkxh+YN/S3OB MR5hp8uft03AJS9c+vAUVtETOLFdxb6VV/jrU3yYzaRlT58byJyZsYtxtNRdodzvtCeN Y8oA== X-Gm-Message-State: APt69E1wi4VUkKKLA8vjdtN++t6BdkkCcNFIFmc3tiHIwC4NW+vjuWyY f5vUnkEV0gZortjBpO0YIGc= X-Google-Smtp-Source: ADUXVKIPbOZHl+ZmSPkCvmEfsUgAOfxbzyUFsK/GjQf1/2CLs1c1BqdM6cIzWAa8K7moqRqiofr2YQ== X-Received: by 2002:a17:902:a5:: with SMTP id a34-v6mr941241pla.80.1528945486449; Wed, 13 Jun 2018 20:04:46 -0700 (PDT) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id y23-v6sm7871226pfa.73.2018.06.13.20.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 20:04:45 -0700 (PDT) From: Vasily Khoruzhick To: Marek Vasut , Jagan Teki , Jun Nie , u-boot@lists.denx.de Date: Wed, 13 Jun 2018 20:04:41 -0700 Message-Id: <20180614030441.2771-1-anarsoul@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [U-Boot] [PATCH] usb: sunxi: don't touch reset bits in ccm if CONFIG_SUNXI_GEN_SUN6I is not defined X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" CCM in sun4i and sun5i doesn't have reset. Fixes commit 1ed9c1118 ("usb: sunxi: ehci: get rid of ifdefs") and commit 56830cee3 ("usb: sunxi: ohci: get rid of ifdefs") Signed-off-by: Vasily Khoruzhick --- drivers/usb/host/ehci-sunxi.c | 10 ++++++++-- drivers/usb/host/ohci-sunxi.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index 35fbe03331..f5b661ef12 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -85,9 +85,12 @@ no_phy: setbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask | extra_ahb_gate_mask); - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I setbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); +#endif + } hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); @@ -112,8 +115,11 @@ static int ehci_usb_remove(struct udevice *dev) if (ret) return ret; - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); +#endif + } clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask); return 0; diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c index 2b99169da6..c8c9e1d2fe 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -92,9 +92,12 @@ no_phy: priv->ahb_gate_mask | extra_ahb_gate_mask); setbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask); - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I setbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask | extra_ahb_gate_mask); +#endif + } return ohci_register(dev, regs); } @@ -116,8 +119,11 @@ static int ohci_usb_remove(struct udevice *dev) if (ret) return ret; - if (priv->cfg->has_reset) + if (priv->cfg->has_reset) { +#ifdef CONFIG_SUNXI_GEN_SUN6I clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask); +#endif + } clrbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask); clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);