From patchwork Mon Mar 23 22:09:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 453644 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6A1631400F1 for ; Tue, 24 Mar 2015 09:11:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=nesL5jVx; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753721AbbCWWLX (ORCPT ); Mon, 23 Mar 2015 18:11:23 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:34883 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbbCWWLV (ORCPT ); Mon, 23 Mar 2015 18:11:21 -0400 Received: by pdbop1 with SMTP id op1so200397800pdb.2 for ; Mon, 23 Mar 2015 15:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IaZUZgg5t4P4wui7Tqic0X5EGyEokW0iODWNaS9libQ=; b=nesL5jVxFKGzePafvgO4BJIbmmJE22tfY3YS1R2SOv+t1e2g4X3cPZoxGVP1uWoLWJ /xUuPH5rjzLO4smQLD76Wn54SBcg+Er2S2tbTUCV+D4DZdVgGQeZFiBkE1gTBZZOzM9h dFGHNA45/lXzk6Qy7FlEs2z/tmbkrEpwAa1BhTPBYeQRBNAbIUNMVSpoavyS9FSnQXMx 2s6vdxznFDfwn3V2prKuaTrWyf/FItlv2XXxpw58Yj0zJTrnhqqoB8eK7u3qc5Uk5Mgi DBpHyFFt6W9e1zQ2KMCSF40Ugxgqrxa/EMRudWVQBRNembnVISaajIosGFoFuWdXWzTt O78A== X-Received: by 10.66.102.4 with SMTP id fk4mr1864550pab.111.1427148680590; Mon, 23 Mar 2015 15:11:20 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id ey1sm2034973pdb.30.2015.03.23.15.11.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 15:11:19 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli , jaedon.shin@gmail.com, pgynther@google.com Subject: [PATCH net-next v2 2/7] net: bcmgenet: update bcmgenet_ephy_power_up to clear CK25_DIS bit Date: Mon, 23 Mar 2015 15:09:52 -0700 Message-Id: <1427148597-28337-3-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427148597-28337-1-git-send-email-f.fainelli@gmail.com> References: <1427148597-28337-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CK25_DIS bit controls whether a 25Mhz clock is fed to the GPHY or not, in preparation for powering down the integrated GPHY when relevant, make sure we clear that bit. Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index 1ea838946318..a27ef777cc81 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -354,6 +354,7 @@ struct bcmgenet_mib_counters { #define EXT_GPHY_CTRL 0x1C #define EXT_CFG_IDDQ_BIAS (1 << 0) #define EXT_CFG_PWR_DOWN (1 << 1) +#define EXT_CK25_DIS (1 << 4) #define EXT_GPHY_RESET (1 << 5) /* DMA rings size */ diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 446889cc3c6a..f7d9d2753141 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -178,7 +178,7 @@ static void bcmgenet_ephy_power_up(struct net_device *dev) return; reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL); - reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN); + reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN | EXT_CK25_DIS); reg |= EXT_GPHY_RESET; bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL); mdelay(2);