From patchwork Mon Feb 11 06:59:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1039669 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="AvETkYvi"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43ycDJ758cz9s4Z for ; Mon, 11 Feb 2019 18:02:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 752A9C21FED; Mon, 11 Feb 2019 07:00:36 +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 7164AC21FA1; Mon, 11 Feb 2019 07:00:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 52C8EC2200D; Mon, 11 Feb 2019 06:59:59 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id DB9CBC21F4E for ; Mon, 11 Feb 2019 06:59:54 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id y10so2420538plp.0 for ; Sun, 10 Feb 2019 22:59:54 -0800 (PST) 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=AesKy4Ks1Momy0D7dpMwN5jhKqgcb6aluwBwJ/h0xQE=; b=AvETkYviVLpO+UDA+4NCvbW373Bc8523+zqtX5tUBGqs1zgqx2oZI2Ak1tmxziO0yw WHyjx2c1JfJiuIBNqer0ZZhRcoBz+mRzCqQHHIqjf1xoA5ew8MV8nYH1eS/r8FTnR6Qg 6GjJXr3vyqDgXr0aoFj4R0gVSsbxRXMVr6Pq4= 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=AesKy4Ks1Momy0D7dpMwN5jhKqgcb6aluwBwJ/h0xQE=; b=cGxJhwizXEvv50SN9416ZYt5dqaY4H0BrKZrBPxm16F7DN/qULSF9jz5dERbsnCYKG y59wl+1ggHHatX8iMeqP47BjjRB/Fe+pFcugQIPtSBhTbCNL/GHb+9jsqmICTJgg27+P wtrIdSEDr14p9OGU2J1W/iPoI0XIQNB2FNP9h2UUAIEEYp7iscCv+93miut9eGF87PRc osP8TqlEZrnMyOyKpvltSbg6EcgfABS0bPPWQC3eO7YNBcdlJxQkbRkCYucusQbT33b5 H5oHhYaUdV0ax9IBbxhmr5E4GSfPWdFuteMqVIRAAJQMgWLuNajXS2iWo82xqmozXl/Y TPuA== X-Gm-Message-State: AHQUAuZWzD1l3J4SSVqRrgYTi5vIgDdECrZSrixyVWIzMezVZnMReUYo DALnsjiC2jIKw3Z8YMwT8E/7dA== X-Google-Smtp-Source: AHgI3Ib5g+HoVs6+5nNQ/1Smm5awf2R1YYk99tGytcV+VYgV0a16/ycpb7klGGrZ+Oa03QSIMML+9Q== X-Received: by 2002:a17:902:e307:: with SMTP id cg7mr36236970plb.255.1549868393408; Sun, 10 Feb 2019 22:59:53 -0800 (PST) Received: from localhost.localdomain ([115.97.184.151]) by smtp.gmail.com with ESMTPSA id t3sm81529pga.31.2019.02.10.22.59.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 22:59:52 -0800 (PST) From: Jagan Teki To: Maxime Ripard Date: Mon, 11 Feb 2019 12:29:26 +0530 Message-Id: <20190211065937.4875-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190211065937.4875-1-jagan@amarulasolutions.com> References: <20190211065937.4875-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Joe Hershberger Subject: [U-Boot] [PATCH v2 02/13] 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 ++++++++++++++++++++++------ image.map | 4 ++++ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 image.map diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 8dbd3c50c1..9a5f7fd3c7 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, "failed to get emac clock\n"); + return ret; + } + + ret = sunxi_emac_board_setup(priv); + if (ret) + return ret; return sunxi_emac_init_phy(priv, dev); } diff --git a/image.map b/image.map new file mode 100644 index 0000000000..a0b4894f93 --- /dev/null +++ b/image.map @@ -0,0 +1,4 @@ +ImagePos Offset Size Name +00000000 00000000 0007050a main-section +00000000 00000000 00006000 blob +00008000 00008000 0006850a u-boot-img