From patchwork Fri Aug 10 06:07:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 955976 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=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="BuoxA231"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41mwHY2BC6z9s7Q for ; Fri, 10 Aug 2018 16:31:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F1B5AC21C51; Fri, 10 Aug 2018 06:27:05 +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=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 4AA5CC21EB4; Fri, 10 Aug 2018 06:17:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ABC8CC21ED5; Fri, 10 Aug 2018 06:10:50 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by lists.denx.de (Postfix) with ESMTPS id 2D62BC21EC2 for ; Fri, 10 Aug 2018 06:10:32 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id f14-v6so3879802pgv.13 for ; Thu, 09 Aug 2018 23:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QF8KGL1H9BAavJg2Qqm1kHQNh3c5QGit3aYBvz7PNkM=; b=BuoxA231wMPxOeFIKcAzgz/rMCrCfBJ46FfCNqmms6+H4Lve/9mDUtWvJpe6RO+PJN iUvOnR+X8RHD/tCbKJVtcAcAoP5OI8a1D5UxmlYwFF6hrLNQwaWC5/rInj77c3iv8sP/ tVXdIF7/T4EMvkrZfyZPE/SIt0WWCPeu+6FoQ= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QF8KGL1H9BAavJg2Qqm1kHQNh3c5QGit3aYBvz7PNkM=; b=AdnmsIfcWjHfPbeBsY3wJCWWH0LGwBW+AqFWtkX97qSbL5duDpDj1pexJv83/P3T5Z Xr5aOTu6k6dfi7yvX5KfRkIOHImtXfrBhQjbajPO1h4AW5LXApotH98CiSTKK2oBnoVn uYwHw0/QjeX/5Ugs4EI3OzDcSPXAWFHdMW2Jg7oFpR0CJ94/H6au46ciYmvsZHbOqC7C T0msEKwApmaPHe92pLBzL2EhARkXTaOcqG1PS5FS+D9V2VrUdNPYqkxWeE/ZGjhlV8pP FJMApPnoTJAT1W36mraLYQ41VjTMulEKozubqqTnynT2E9V6aycNFpDjXM3SOj02SIs7 MqGg== X-Gm-Message-State: AOUpUlEgAsgQrjQwuumI0lYFWhjqGc9V8I+f+gHQN+uk/bw0v+EkQHTf cArLWqq1qYU19/pIhuLqODeNeH8sJh8= X-Google-Smtp-Source: AA+uWPw/SwT71l6uCPSXEBsW70E4LQdDBUeZw6fFMZGe44AnLjkuk0KlllEb4SBAoTd93pKZCp5tyg== X-Received: by 2002:a63:8f03:: with SMTP id n3-v6mr5112619pgd.166.1533881430789; Thu, 09 Aug 2018 23:10:30 -0700 (PDT) Received: from localhost.localdomain ([183.82.228.250]) by smtp.gmail.com with ESMTPSA id r23-v6sm16880975pfj.5.2018.08.09.23.10.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 23:10:30 -0700 (PDT) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Icenowy Zheng Date: Fri, 10 Aug 2018 11:37:03 +0530 Message-Id: <20180810060711.6547-46-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20180810060711.6547-1-jagan@amarulasolutions.com> References: <20180810060711.6547-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: Joe Hershberger , Tom Rini , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v2 45/53] net: sunxi_emac: Add CLK support 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add CLk support for sunxi_emac to enable AHB_EMAC clock via CLK framework. Cc: Joe Hershberger Signed-off-by: Jagan Teki --- drivers/net/sunxi_emac.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 8dbd3c50c1..4d152b0ca0 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -157,6 +158,7 @@ struct sunxi_sramc_regs { struct emac_eth_dev { struct emac_regs *regs; + struct clk clk; struct mii_dev *bus; struct phy_device *phydev; int link_printed; @@ -500,14 +502,12 @@ static int _sunxi_emac_eth_send(struct emac_eth_dev *priv, void *packet, return 0; } -static void sunxi_emac_board_setup(struct emac_eth_dev *priv) +static int sunxi_emac_board_setup(struct emac_eth_dev *priv) { - struct sunxi_ccm_reg *const ccm = - (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_sramc_regs *sram = (struct sunxi_sramc_regs *)SUNXI_SRAMC_BASE; struct emac_regs *regs = priv->regs; - int pin; + int pin, ret; /* Map SRAM to EMAC */ setbits_le32(&sram->ctrl1, 0x5 << 2); @@ -517,10 +517,16 @@ static void sunxi_emac_board_setup(struct emac_eth_dev *priv) sunxi_gpio_set_cfgpin(pin, SUNXI_GPA_EMAC); /* Set up clock gating */ - setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_EMAC); + ret = clk_enable(&priv->clk); + if (ret) { + dev_err(dev, "failed to enable emac clock\n"); + return ret; + } /* Set MII clock */ clrsetbits_le32(®s->mac_mcfg, 0xf << 2, 0xd << 2); + + return 0; } static int sunxi_emac_eth_start(struct udevice *dev) @@ -557,9 +563,19 @@ static int sunxi_emac_eth_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct emac_eth_dev *priv = dev_get_priv(dev); + int ret; priv->regs = (struct emac_regs *)pdata->iobase; - sunxi_emac_board_setup(priv); + + ret = clk_get_by_index(dev, 0, &priv->clk); + if (ret) { + dev_err(dev, "falied to get emac clock\n"); + return ret; + } + + ret = sunxi_emac_board_setup(priv); + if (ret) + return ret; return sunxi_emac_init_phy(priv, dev); }