From patchwork Sun Jan 25 15:49:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Kuske X-Patchwork-Id: 432567 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 EA7ED1401EB for ; Mon, 26 Jan 2015 02:49:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752808AbbAYPti (ORCPT ); Sun, 25 Jan 2015 10:49:38 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:50223 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912AbbAYPta (ORCPT ); Sun, 25 Jan 2015 10:49:30 -0500 Received: by mail-wi0-f181.google.com with SMTP id fb4so5502515wid.2; Sun, 25 Jan 2015 07:49:28 -0800 (PST) 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=qm5sAdR+7sFdgyykAW64qi/eIVn9UCqlQ5gx+sAZOE0=; b=fRx09/Z1kcqUhT96H2Dyjf7nOWab8UQCoTBgJec4lHPlcEsKrURanGrnBQbSqjI0KH xIAbxgvHderzIKJW+5MUwsIK/9H29pJv3fD9F1Z8VqUuEBjt4Dy7jt6vyV9jqsuLbDXU zXghmharufjTOQSUbAyQocJ23wkhmf7frL7WxVwpGeJx5PPk6Wo8OfvPkAAZy6I2jjUM S0gHV8CfuVpN3wq1dwEHqQxef8ql4AJ6bPI+JpqNrP80lyC7Z+ujjMjwp6PrPMZCmIwN uGhdIF7oodrZf4BEbU+r2mJyrW6ubIzb/rp40jLXYy3Z3LdX6hGMeohUshUd83mUBkEo /YBQ== X-Received: by 10.194.85.106 with SMTP id g10mr34392948wjz.39.1422200968630; Sun, 25 Jan 2015 07:49:28 -0800 (PST) Received: from jens-lin.localdomain (p5B2EA102.dip0.t-ipconnect.de. [91.46.161.2]) by mx.google.com with ESMTPSA id h8sm10241190wiy.4.2015.01.25.07.49.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Jan 2015 07:49:28 -0800 (PST) From: Jens Kuske To: Maxime Ripard , Lee Jones , netdev@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen-Yu Tsai , linux-sunxi@googlegroups.com, Jens Kuske Subject: [PATCH 3/3] net: allwinner: sun4i-emac: fix emac SRAM mapping Date: Sun, 25 Jan 2015 16:49:19 +0100 Message-Id: <1422200959-1717-4-git-send-email-jenskuske@gmail.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1422200959-1717-1-git-send-email-jenskuske@gmail.com> References: <1422200959-1717-1-git-send-email-jenskuske@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The EMAC needs SRAM block A3_A4 being mapped to EMAC peripheral to work. This is done by the bootloader most of the time, but U-Boot Falcon Mode, for example, skips emac initialization and SRAM would stay mapped to the CPU. Signed-off-by: Jens Kuske --- drivers/net/ethernet/allwinner/Kconfig | 1 + drivers/net/ethernet/allwinner/sun4i-emac.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig index d8d95d4..508a288 100644 --- a/drivers/net/ethernet/allwinner/Kconfig +++ b/drivers/net/ethernet/allwinner/Kconfig @@ -28,6 +28,7 @@ config SUN4I_EMAC select MII select PHYLIB select MDIO_SUN4I + select MFD_SYSCON ---help--- Support for Allwinner A10 EMAC ethernet driver. diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 1fcd556..86c891d 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include #include @@ -28,6 +30,7 @@ #include #include #include +#include #include "sun4i-emac.h" @@ -78,6 +81,7 @@ struct emac_board_info { struct phy_device *phy_dev; struct device_node *phy_node; + struct regmap *sc; unsigned int link; unsigned int speed; unsigned int duplex; @@ -862,6 +866,18 @@ static int emac_probe(struct platform_device *pdev) goto out; } + /* Map SRAM_A3_A4 to EMAC */ + db->sc = syscon_regmap_lookup_by_compatible( + "allwinner,sun4i-a10-syscon"); + if (IS_ERR(db->sc)) { + dev_err(&pdev->dev, "failed to find syscon regmap\n"); + ret = PTR_ERR(db->sc); + goto out; + } + + regmap_update_bits(db->sc, SUN4I_SC1, SUN4I_SC1_SRAM_A3_A4_MAP_MASK, + SUN4I_SC1_SRAM_A3_A4_MAP_EMAC); + /* Read MAC-address from DT */ mac_addr = of_get_mac_address(np); if (mac_addr) @@ -910,7 +926,9 @@ out: static int emac_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); + struct emac_board_info *db = netdev_priv(ndev); + regmap_update_bits(db->sc, SUN4I_SC1, SUN4I_SC1_SRAM_A3_A4_MAP_MASK, 0); unregister_netdev(ndev); free_netdev(ndev);