From patchwork Fri Jul 13 08:45:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943349 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="IQv5Ys8q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Rmc22HHpz9s2M for ; Fri, 13 Jul 2018 18:45:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8583FC21C8B; Fri, 13 Jul 2018 08:45:49 +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_H2, 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 3563DC21C8B; Fri, 13 Jul 2018 08:45:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A1555C21C8B; Fri, 13 Jul 2018 08:45:45 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id DFC6CC21C57 for ; Fri, 13 Jul 2018 08:45:42 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id g12-v6so23983319edi.9 for ; Fri, 13 Jul 2018 01:45:42 -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=o09DM0TXVYhYg1b2+W715rejyq8yUZzm0ev6iqSaXp8=; b=IQv5Ys8qdHgzZq14Cdda2BjK/8GG7S/MkSHst9y7AbtSDe1SQ12WDZ9eWJt/wFfNvn Q7Qi6eq+bs2ylO0Q1+O/Owc7rG16Nc8mK0URXqsB4PXAvb/Jw5ijIMl4n1/ZHiZCTd/j P2cL1UPO2NQtTMYdoGoY5TpoO6ZtQuP84DZF5LP2bz+y0324sNuXojHKgUOEEf/f8STo vk5J4EHuWYWD7gyUx/PQyGUmN+izCipRB0+pzik95ksl/o85GiBhUqNsO+Xk5FRV0rz4 5a5fn/o3A2G0y7PJgKih+K2r2taPy7IHDgPNq+A6+EXSOL/HuNz1stSPaVLID/f/h6Ik 68sA== 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=o09DM0TXVYhYg1b2+W715rejyq8yUZzm0ev6iqSaXp8=; b=PUO5oUHik5z4Sxy2rsUdtqG/DCcNpFBRsaaq1/F/7Ofu9B07r5itcGd8yNUZL0xvqY F1PNHaLiiqjeM6oyadw17UdQ4SpWX1pfCpaW2rW6dZikkJoYzV2tzGAd2Os0uyOfs33c 3YhPn6uS43H5BKSN8bkbuZ5pfrWwmF4pvUyvjPJHppaHV4a2Vtta0MDLUmHgEMXIcUMS E9GbvVffcMubLEIJAHDTlXeOPphRxI3knird86xIgtxtYbCAXO9v/CYPaTFZirRDdhrq a8v02F3qkmlXu/fmjzdIItQkEani0B9HnessUEEIc9N2mIMPGKjo6oFVUWDfnbDsAcxA ACbA== X-Gm-Message-State: AOUpUlHPioMAb6iPsY75TZKkTnkUIGEMxYi/9W67LuFuV3n/9J/Sfkuv 9Tc9H9fMo/437f7Mptx/EVytwvNn X-Google-Smtp-Source: AAOMgpflhL+6B+inxX6ojQxmrTYXRJKzdzoBjwwVg7V29PE1GM3hOhowfqXpTdS1maNQLD0lsvxDZQ== X-Received: by 2002:a50:c211:: with SMTP id n17-v6mr6202398edf.11.1531471542400; Fri, 13 Jul 2018 01:45:42 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:41 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:25 +0200 Message-Id: <20180713084530.13029-1-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 1/6] sunxi: R40: add gigabit ethernet clocks 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" Add clock control entries for the gigabit interface of the Allwinner R40/V40 CPU Acked-by: Maxime Ripard Reviewed-by: Joe Hershberger Reviewed-by: Jagan Teki Tested-by: Jagan Teki Signed-off-by: Lothar Felten --- Changelog: new in v2 v2->v3->4->v5->v6: none --- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 3a59016955..ee387127f3 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -60,7 +60,11 @@ struct sunxi_ccm_reg { u32 reserved11; u32 sata_clk_cfg; /* 0xc8 SATA clock control (R40 only) */ u32 usb_clk_cfg; /* 0xcc USB clock control */ - u32 gmac_clk_cfg; /* 0xd0 GMAC clock control */ +#ifdef CONFIG_MACH_SUN8I_R40 + u32 cir0_clk_cfg; /* 0xd0 CIR0 clock control (R40 only) */ +#else + u32 gmac_clk_cfg; /* 0xd0 GMAC clock control (not for R40) */ +#endif u32 reserved12[7]; u32 mdfs_clk_cfg; /* 0xf0 MDFS clock control */ u32 dram_clk_cfg; /* 0xf4 DRAM configuration clock control */ @@ -103,7 +107,11 @@ struct sunxi_ccm_reg { u32 mtc_clk_cfg; /* 0x158 MTC module clock */ u32 mbus0_clk_cfg; /* 0x15c MBUS0 module clock */ u32 mbus1_clk_cfg; /* 0x160 MBUS1 module clock */ +#ifdef CONFIG_MACH_SUN8I_R40 + u32 gmac_clk_cfg; /* 0x164 GMAC clock control (R40 only) */ +#else u32 reserved16; +#endif u32 mipi_dsi_clk_cfg; /* 0x168 MIPI DSI clock control */ u32 mipi_csi_clk_cfg; /* 0x16c MIPI CSI clock control */ u32 reserved17[4]; From patchwork Fri Jul 13 08:45:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943350 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="HxWeTCEz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmcX4LyFz9s2M for ; Fri, 13 Jul 2018 18:46:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4ACACC21E6A; Fri, 13 Jul 2018 08:46:10 +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_H2, 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 D93DDC21EF1; Fri, 13 Jul 2018 08:45:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 87570C21FDE; Fri, 13 Jul 2018 08:45:52 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id E013BC21E7E for ; Fri, 13 Jul 2018 08:45:47 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id u11-v6so23989335eds.10 for ; Fri, 13 Jul 2018 01:45: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:in-reply-to:references; bh=ipLlnagfu8I/YK4wGq8K0GAmfXLZKN5ICfGDvDcgFbs=; b=HxWeTCEzrZedpPtgjGB43CYfqn6oJxM8FNyVTxHxvpz4fQ8P9BeNcyVKHpoc9SRMhb C8JIMPF+4Ofb4SItHx7sqvPc4g6Je/MQFwGAqxqzFAmmGDj+eLP+BghOPxpZox7G0h+d cWPBVvgtI7gqH5FbI1HIwScocKn5fhc4PHlM6u8gh4bliMugLa2fgb0N0RTxD8EBmLqx 8GZB4nv+Evvg8ljfjMOK0u2gv9vRNiDGwS/ykF2J02VIy83fW4/JuxtN9C3mM8CqT9dR bOAsu+I6g69RRbapAtDMkI1Kfts1atsyVkT09N4GDOrZuzcbzJPOKOVnwU+pGxw4FQvv 4HNQ== 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; bh=ipLlnagfu8I/YK4wGq8K0GAmfXLZKN5ICfGDvDcgFbs=; b=jZ3CU5NLOB+iZrjv/0Kwtsodgb1KOo63Ft5KONN1PXrUkf740fkBfSvs78+KVoI7t6 00hGAOVEZL7j6/Hr/PZOcW3aaExb2oxyswgchTykLnFyLhbaR3SbIUYBaqQq/1007Sl6 ycaiR+UJ0aDblVDnt4wYi3KWa7egpXnhtBWUBogfDQuaCow7doGJFZAiMx4eBOpkEjix oINHN/SO9bbQUaXOG006vekhCiiNidPW/QDdi2FZIVWms5+tQudR5/7MTL31CQgZwuPS aYdoQl0Tn9c+84KBJonwzdJ01Xy088BqyAGZWHwx8eeolU//3uyXN4oOPYSjJmQKn7QY GDNA== X-Gm-Message-State: AOUpUlEwI5RWePalKlCDqGVERkVN1xgPCA8SazDC6AahKPtdRvYQGdo3 zXwz/tdMSqvN5nKemsxroklaHAPF X-Google-Smtp-Source: AAOMgpf9zCSNoHbJOCdP4EdjKgJbBZ0TDOdp3IdBolOe6MWT+a+v6+HgmTwATp3ciktsjcXoMjH3Rg== X-Received: by 2002:aa7:c4cf:: with SMTP id p15-v6mr6146440edr.240.1531471547445; Fri, 13 Jul 2018 01:45:47 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:46 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:26 +0200 Message-Id: <20180713084530.13029-2-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 2/6] net: sun8i-emac: fix printing NULL character 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" If the variant is not set and therefore NULL, do not attempt to print the variant. Signed-off-by: Lothar Felten Acked-by: Maxime Ripard Acked-by: Joe Hershberger Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- Changelog: new in v4 v4->v5->v6 none --- drivers/net/sun8i_emac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 1f5c630e02..23c4d68f77 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -843,8 +843,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) priv->variant = dev_get_driver_data(dev); if (!priv->variant) { - printf("%s: Missing variant '%s'\n", __func__, - (char *)priv->variant); + printf("%s: Missing variant\n", __func__); return -EINVAL; } From patchwork Fri Jul 13 08:45:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943351 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="g3rG5iAq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmdM04Lyz9s2M for ; Fri, 13 Jul 2018 18:47:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9B2A0C21E7D; Fri, 13 Jul 2018 08:46:30 +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_H2, 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 0F244C21C57; Fri, 13 Jul 2018 08:46:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7EB99C21E6A; Fri, 13 Jul 2018 08:45:57 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by lists.denx.de (Postfix) with ESMTPS id 7B400C21E0D for ; Fri, 13 Jul 2018 08:45:52 +0000 (UTC) Received: by mail-ed1-f49.google.com with SMTP id v22-v6so23987485edq.4 for ; Fri, 13 Jul 2018 01:45:52 -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:in-reply-to:references; bh=LUQPNpWzMolYXthl3c8RualQ5XxD4fjwbiFaaXpQpME=; b=g3rG5iAqpomJ3VYZJNnRBJgtAXsE2+usMxowuS/ul8poiIxLxk2f7Np9/lSXv40Toz sl3mPnQ2Dly6TtTQqia1Xz+mmfI9BVD8rMVCb02JXJ5B1GmnCAkosGKRxBymlnD2VPBK tg2ezExkm1FUpRvj/uVdhtniH+oUtg0wkzXh/TGDphv41enBsfIu3JIy40hQ6KBnFFUl pQ0AUrEoHw66TMGm5KthewIdpIID7e3lPcPX7KF8DH+vk2yFrnGHO4mUWTny8+H3tTaF rcfUzxE/JMB9aZzsRWBD3P8KXZwE5/Xw2AUwGsPvtFojKZUJZG5bWVHsRpRmDm8T1H5E CRfg== 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; bh=LUQPNpWzMolYXthl3c8RualQ5XxD4fjwbiFaaXpQpME=; b=WMNU43f1QfxG5rz5craZxPSJYdD5+4x+auekKlYSD6DXNvC+tkB1CXYlgb6lSW6AUl ddAYRiUBv3mCxJaiYWeznMGAlvkGuuSiKtNY4AJ0ZkyXpzPL25uICVik9JVn0f8XyhSt upUJEy6lShPP+yMbo3e1SfIjkwdEA/PFNfVsuNW1ERo8Wc1MpcaIMWGAk3Jpxy80tyZS ym0wJpQXSVp6wtUTL2QwrVFTqGOON+BBikBYiMLz6xqSaRZVz+Gr+1gf2XI3+vKUBywx VSx+1U2WaHTNUXU8tDMOLhkfRT2hWhz2pVBEeGB2XADyklYr96VNiwZRN87hrNaGItU4 5TAA== X-Gm-Message-State: AOUpUlHrlOpt3d87ClKs0nbVnnJVZHw6OF7CqKafHiHwrcyIBi7DOmHN g1DR6bpICgGGLJ55OOLFXdokEDd1 X-Google-Smtp-Source: AAOMgpcKDSFu+TBFhQdy4fs52v+B3VM7XQf/GPybvuqFPE8tA90jP1jGZTxn1biC4/Dz9e9km70zag== X-Received: by 2002:aa7:d993:: with SMTP id u19-v6mr5977389eds.125.1531471552017; Fri, 13 Jul 2018 01:45:52 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:51 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:27 +0200 Message-Id: <20180713084530.13029-3-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 3/6] net: sun8i-emac: set mux and clock by driver data 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" Use driver data->variant information to select device specific pin mux and phy clock settings. Suggested by Jagan Teki Reviewed-by: Jagan Teki Tested-by: Jagan Teki Signed-off-by: Lothar Felten --- Changelog: new in v3 v3 -> v4 use driver data to distinguish between variants v4 -> v5 -> v6 none --- drivers/net/sun8i_emac.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 23c4d68f77..ee3b2aa7f4 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -65,11 +65,9 @@ #define AHB_GATE_OFFSET_EPHY 0 -#if defined(CONFIG_MACH_SUNXI_H3_H5) -#define SUN8I_GPD8_GMAC 2 -#else -#define SUN8I_GPD8_GMAC 4 -#endif +/* IO mux settings */ +#define SUN8I_IOMUX_H3 2 +#define SUN8I_IOMUX 4 /* H3/A64 EMAC Register's offset */ #define EMAC_CTL0 0x00 @@ -453,6 +451,7 @@ static int _sun8i_emac_eth_init(struct emac_eth_dev *priv, u8 *enetaddr) static int parse_phy_pins(struct udevice *dev) { + struct emac_eth_dev *priv = dev_get_priv(dev); int offset; const char *pin_name; int drive, pull = SUN4I_PINCTRL_NO_PULL, i; @@ -494,7 +493,11 @@ static int parse_phy_pins(struct udevice *dev) if (pin < 0) continue; - sunxi_gpio_set_cfgpin(pin, SUN8I_GPD8_GMAC); + if (priv->variant == H3_EMAC) + sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX_H3); + else + sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX); + if (drive != ~0) sunxi_gpio_set_drv(pin, drive); if (pull != ~0) @@ -618,16 +621,18 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv) { struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; -#ifdef CONFIG_MACH_SUNXI_H3_H5 - /* Only H3/H5 have clock controls for internal EPHY */ - if (priv->use_internal_phy) { - /* Set clock gating for ephy */ - setbits_le32(&ccm->bus_gate4, BIT(AHB_GATE_OFFSET_EPHY)); - - /* Deassert EPHY */ - setbits_le32(&ccm->ahb_reset2_cfg, BIT(AHB_RESET_OFFSET_EPHY)); + if (priv->variant == H3_EMAC) { + /* Only H3/H5 have clock controls for internal EPHY */ + if (priv->use_internal_phy) { + /* Set clock gating for ephy */ + setbits_le32(&ccm->bus_gate4, + BIT(AHB_GATE_OFFSET_EPHY)); + + /* Deassert EPHY */ + setbits_le32(&ccm->ahb_reset2_cfg, + BIT(AHB_RESET_OFFSET_EPHY)); + } } -#endif /* Set clock gating for emac */ setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); From patchwork Fri Jul 13 08:45:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943353 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="dxNTYkK0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmgG2BTWz9s2M for ; Fri, 13 Jul 2018 18:48:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 032B9C21EF1; Fri, 13 Jul 2018 08:46:49 +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_H2, 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 EFAEEC21FEF; Fri, 13 Jul 2018 08:46:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 85463C21FD9; Fri, 13 Jul 2018 08:45:58 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id 275FFC21E1D for ; Fri, 13 Jul 2018 08:45:55 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id s24-v6so7795207edr.8 for ; Fri, 13 Jul 2018 01:45:55 -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:in-reply-to:references; bh=DowfOz4Ssu5c1jCDocTZ42u6I19aYQIU/o8kQCQJSJg=; b=dxNTYkK0QwRkOnxy9v08J2VLyUGNaoaOgQzM52Vr8mlhj6rfaaPy+mFHTfGLT8CRl9 j4as4mSEiiUa3ZuYEyceMxa0Qe2kGfP6ICB/G8vkJQZ4s/99dxcFj8DZ7TT4KeGwRmrp ykwVatR2faUh0CnDftAcWgjCCQYrE1iEUc1EralQWWL67l5VnfGUrRRtqo5LHzRK3Re3 6MD4pTwvy1TXl5kOmGXdB/pxSLmNwpHzxDuqoZqAhsID8aDPCRBruFQzF31DimoABLUz hZxtDKQxUEpx9dJGxZ5JJYnKay1BAgWXpt+ZPT9G2xZyOEKsx6+hep9kDX8XqDxH5aKp DeVA== 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; bh=DowfOz4Ssu5c1jCDocTZ42u6I19aYQIU/o8kQCQJSJg=; b=XrOk51fPUwN5TBBwrx9YpkjK7W+7cWCvBhPbCxm70rosTncD3IbVCVpqaDqvFYR5NZ 1MPXStQTXxT2Gi6r13tX3FVpXb0mGItjQeSqobzzFotsRMHQDQget/V7sUV+pKvuBXfn Fyy/tRGPNxo+WZ82Ue7gNrKpIdC/HzBwo38yy47z1a9qsfSBROo3CGB+uL2h9UfYtu6r T3nqxGuQP0YmYw5Rk0u1LYAxYZTx3Ai+PdwoohaTtLB8nrKRenjSr3fOZ/y0qbXP60EC kpn+iOiF2ljfhtFOT33EVhfMDdyyoAJwAneetyjPf6C7QzklUqkPpNMylsS3KSIF71HZ w+uw== X-Gm-Message-State: AOUpUlFHnRHRrrswNkVsR+Dd2fH4cfakNe5rBhwW4eui5T2r88nOp84+ kHoLx11VYjbyPEJAUz7u52fl1VzM X-Google-Smtp-Source: AAOMgpex3gCXpgNYoiv/AkBZ0EzTrkqeqZ/2jc8bIGIcPUYXVBrnJeNuDwf6l/ByifoVXABb9ijIww== X-Received: by 2002:a50:bb41:: with SMTP id y59-v6mr6366821ede.10.1531471554661; Fri, 13 Jul 2018 01:45:54 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:53 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:28 +0200 Message-Id: <20180713084530.13029-4-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 4/6] net: sun8i-emac: support R40 GMAC 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" Add support for the GMAC found in the Allwinner R40/V40 SoC. The R40 GMAC interface is not controlled by the syscon register but has a separate configuration register in the CCU. The clock gate and reset bits are in a different register compared to the other SoCs supported by this driver. The driver uses the -gmac suffix for the R40 because the R40 also has a different 100 MBit MAC (EMAC). Signed-off-by: Lothar Felten Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- Changelog: new in v3 v3 -> v4 use driver data to distinguish between variants v4 -> v5 -> v6 none --- drivers/net/sun8i_emac.c | 79 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 26 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index ee3b2aa7f4..3ba3a1ff8b 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -67,6 +67,7 @@ /* IO mux settings */ #define SUN8I_IOMUX_H3 2 +#define SUN8I_IOMUX_R40 5 #define SUN8I_IOMUX 4 /* H3/A64 EMAC Register's offset */ @@ -97,6 +98,7 @@ enum emac_variant { A83T_EMAC = 1, H3_EMAC, A64_EMAC, + R40_GMAC, }; struct emac_dma_desc { @@ -278,6 +280,9 @@ static int sun8i_emac_set_syscon(struct emac_eth_dev *priv) reg = readl(priv->sysctl_reg + 0x30); + if (priv->variant == R40_GMAC) + return 0; + if (priv->variant == H3_EMAC) { ret = sun8i_emac_set_syscon_ephy(priv, ®); if (ret) @@ -495,6 +500,8 @@ static int parse_phy_pins(struct udevice *dev) if (priv->variant == H3_EMAC) sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX_H3); + else if (priv->variant == R40_GMAC) + sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX_R40); else sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX); @@ -634,11 +641,26 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv) } } - /* Set clock gating for emac */ - setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); - - /* De-assert EMAC */ - setbits_le32(&ccm->ahb_reset0_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + if (priv->variant == R40_GMAC) { + /* Set clock gating for emac */ + setbits_le32(&ccm->ahb_reset1_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + + /* De-assert EMAC */ + setbits_le32(&ccm->ahb_gate1, BIT(AHB_GATE_OFFSET_GMAC)); + + /* Select RGMII for R40 */ + setbits_le32(&ccm->gmac_clk_cfg, + CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII | + CCM_GMAC_CTRL_GPIT_RGMII); + setbits_le32(&ccm->gmac_clk_cfg, + CCM_GMAC_CTRL_TX_CLK_DELAY(CONFIG_GMAC_TX_DELAY)); + } else { + /* Set clock gating for emac */ + setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); + + /* De-assert EMAC */ + setbits_le32(&ccm->ahb_reset0_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + } } #if defined(CONFIG_DM_GPIO) @@ -805,22 +827,32 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); - if (offset < 0) { - debug("%s: cannot find syscon node\n", __func__); - return -EINVAL; - } - reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL); - if (!reg) { - debug("%s: cannot find reg property in syscon node\n", - __func__); + priv->variant = dev_get_driver_data(dev); + + if (!priv->variant) { + printf("%s: Missing variant\n", __func__); return -EINVAL; } - priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, - offset, reg); - if (priv->sysctl_reg == FDT_ADDR_T_NONE) { - debug("%s: Cannot find syscon base address\n", __func__); - return -EINVAL; + + if (priv->variant != R40_GMAC) { + offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); + if (offset < 0) { + debug("%s: cannot find syscon node\n", __func__); + return -EINVAL; + } + reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL); + if (!reg) { + debug("%s: cannot find reg property in syscon node\n", + __func__); + return -EINVAL; + } + priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, + offset, reg); + if (priv->sysctl_reg == FDT_ADDR_T_NONE) { + debug("%s: Cannot find syscon base address\n", + __func__); + return -EINVAL; + } } pdata->phy_interface = -1; @@ -845,13 +877,6 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - priv->variant = dev_get_driver_data(dev); - - if (!priv->variant) { - printf("%s: Missing variant\n", __func__); - return -EINVAL; - } - if (priv->variant == H3_EMAC) { int parent = fdt_parent_offset(gd->fdt_blob, offset); @@ -892,6 +917,8 @@ static const struct udevice_id sun8i_emac_eth_ids[] = { .data = (uintptr_t)A64_EMAC }, {.compatible = "allwinner,sun8i-a83t-emac", .data = (uintptr_t)A83T_EMAC }, + {.compatible = "allwinner,sun8i-r40-gmac", + .data = (uintptr_t)R40_GMAC }, { } }; From patchwork Fri Jul 13 08:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943354 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="t3BQM+ex"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmgY07yyz9s2M for ; Fri, 13 Jul 2018 18:48:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B483CC21FEA; Fri, 13 Jul 2018 08:47:24 +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_H2, 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 F0A94C22008; Fri, 13 Jul 2018 08:46:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 06362C21FB0; Fri, 13 Jul 2018 08:46:03 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 9BDE9C21D8E for ; Fri, 13 Jul 2018 08:45:57 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id b10-v6so23993220edi.2 for ; Fri, 13 Jul 2018 01:45:57 -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:in-reply-to:references; bh=C61JGkhTtG4w99HtzOmg51BKwRbfExiTviB0FnxtKzo=; b=t3BQM+exldVK6kT19ICVVKBhTOhH+103SEIJ5LueGag/BLKfi+Fr7Kg/OFUkaFv18g qXmNpPCZGJT188YcsoZNndRDGre6OBI6Gqy5KBobftLk/W8a1mJr5BTfyiPW7yaSa5u8 CU81iiq58MFTeobdw2/HRG8sbbn4VHAHWOxYgyrD/BApdSyQ6NYOcf4d7PoHTtVqVhcZ k4uF7SKpmMBlJHMcXASTBNHOxQcvtMvbo0eef3+XxjLJIJZ8hJlZTEYVZ7iphBwzD3xq xTn+k0Es3r63On+Fu/2Q49WChk2BMh7HFBufP3z0AdI5NvJFFBuE6/1KiorZmjWaMw0W kKgw== 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; bh=C61JGkhTtG4w99HtzOmg51BKwRbfExiTviB0FnxtKzo=; b=aCeo4VzryfzfQGLjECAf6I8fGTrG+Mml9OGMfoVMq/jmsMguKmFOejYYl40PIWowIF NLkRGM1JjKXZPA9dpflacZGXGsvkU2PRO2qsJhtr/XIE4q/lBYtwrcw4sbD6PeycRNgo 5Z8Oy86Pl4MCuULmwByEydK1xW1UBgXGwosWIu3nLSd3JyuuoVst1NuPyG6cDq9OtL2q bYHHa5B80Zx82chpPbi2/RHhpbsvervID5k3VK/GsEMTYPkpDhbpM4BTzllufEUvxpE5 g6KGWLTfqYMekzWVI8oVx0W/RNqc4dZODePoswM9mVW5wuDAs8WUZNokAfjFryfrZxjj 8kJw== X-Gm-Message-State: AOUpUlF4hlcfTT7WZnqbe05EPp0U0AdMJkQxhLS/Kx6oYfMlr6Tgs0Gz g6/N113l+MULmnhKts2lAptitJxA X-Google-Smtp-Source: AAOMgpetj3qtk+A0OK6jjjr0uXM+JruUZQE1CNEVSEMEknmDZo6XLsWmhhCwxSG982PkEtFAMlFuyw== X-Received: by 2002:a50:ce12:: with SMTP id y18-v6mr6299017edi.221.1531471557146; Fri, 13 Jul 2018 01:45:57 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:56 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:29 +0200 Message-Id: <20180713084530.13029-5-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 5/6] sunxi: R40: add gigabit ethernet devicetree node 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" Add a device tree node for the Allwinner R40/V40 GMAC gigabit ethernet interface. The R40 SoC does not use the syscon register for GMAC settings. The gigabit ethernet interface can only be routed to a fixed set of pins. Updated to match the Linux kernel's device tree. Signed-off-by: Lothar Felten Acked-by: Maxime Ripard Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- Changelog: new in v2 v2 -> v3 omit syscon node for R40 v3 -> v4 remove phy-mode from gmac node v4 -> v5 match Linux device tree suggested by Chen-Yu Tsai v5 -> v6 none --- arch/arm/dts/sun8i-r40.dtsi | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm/dts/sun8i-r40.dtsi b/arch/arm/dts/sun8i-r40.dtsi index 0aa76a2f10..2cdfb54282 100644 --- a/arch/arm/dts/sun8i-r40.dtsi +++ b/arch/arm/dts/sun8i-r40.dtsi @@ -161,6 +161,19 @@ #interrupt-cells = <3>; #gpio-cells = <3>; + gmac_rgmii_pins: gmac-rgmii-pins { + pins = "PA0", "PA1", "PA2", "PA3", + "PA4", "PA5", "PA6", "PA7", + "PA8", "PA10", "PA11", "PA12", + "PA13", "PA15", "PA16"; + function = "gmac"; + /* + * data lines in RGMII mode use DDR mode + * and need a higher signal drive strength + */ + drive-strength = <40>; + }; + i2c0_pins: i2c0_pins { pins = "PB0", "PB1"; function = "i2c0"; @@ -202,6 +215,27 @@ #size-cells = <0>; }; + gmac: ethernet@1c50000 { + compatible = "allwinner,sun8i-r40-gmac"; + syscon = <&ccu>; + reg = <0x01c50000 0x10000>; + interrupts = ; + interrupt-names = "macirq"; + resets = <&ccu RST_BUS_GMAC>; + reset-names = "stmmaceth"; + clocks = <&ccu CLK_BUS_GMAC>; + clock-names = "stmmaceth"; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + gmac_mdio: mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + gic: interrupt-controller@1c81000 { compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; reg = <0x01c81000 0x1000>, From patchwork Fri Jul 13 08:45:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943352 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="rkKQmsCh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmfY4d6Fz9s2M for ; Fri, 13 Jul 2018 18:48:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 592A5C21FCA; Fri, 13 Jul 2018 08:47:07 +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_H2, 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 25A35C21FAE; Fri, 13 Jul 2018 08:46:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6ABC0C21FE4; Fri, 13 Jul 2018 08:46:07 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id CD071C21FD5 for ; Fri, 13 Jul 2018 08:46:00 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id t2-v6so9391965edr.5 for ; Fri, 13 Jul 2018 01:46:00 -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:in-reply-to:references; bh=BmekzuR3CAU8jxM5EOwK1OYGDXNO9Ki+llQRvlAa6bg=; b=rkKQmsChaOGPmDlC+Fc52ATKnWhBaT554BC1y0+ANRs4L8qrewQB3YJsc//4Oe0PiP TlyS0W4BSfxGOCDFeOXE2RYTVW89rynIIV9DtqQMTmM/I+r2X56nQPfU5sjoHrayLQZO xESR5wQNoTnZemfnnjgtZ4U/xW+eRyyXSqQqqql7xr070TXyhtYnb1q53yhCmZxH586y CfloDxbo6CbtZPCretJ4SJ9K0U3P3HjhTt3X1ZpPBfCgHIZfhwwl3drSI16pJzZcWAzF d5ly+GCv7+7PiPwXdfSp5K5/SYgxUhh7aahtz5lTFPMDKfgIM/NlOzhjZ/erSfqbhsze yc+w== 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; bh=BmekzuR3CAU8jxM5EOwK1OYGDXNO9Ki+llQRvlAa6bg=; b=DHdmNk/I/0Y+d9pYXN3XiFHxjYUOKjN+iwfBrsS8jBGJsbVvfdGJTnFDo08m96Dv+W K6MNL6CyhAsgEk0wMempsYqAG6JyBQttAwKKjJ8G38HVSFr5ouGVocOjDxtuBrqK0JQV vhETcMsj4r7y0cn35A3tvyGLvfDd2FcPkannDe+k/BOu4cJ5OkBxsCMOTld77h2fQKnh x2f5PdgUOAowaPadmQVNILq1xclTeEEbUmSbFq2DgAQG2vQY8Q1kdvS4/+uSegIxNIF+ ADNabIx9zNUe6BT5mxL3x294mIsYl5HEx/7fxcqS3TqSNgj/1ioTp1X3tavXz47mmwym 9DLQ== X-Gm-Message-State: AOUpUlHWF3VxqJhPlAS/Ye+xtChcvzNFPnSEW9f5RFbH6LvldmqwsMyb MLgW3Ni20iYqphJOvXqDXjJowjNe X-Google-Smtp-Source: AAOMgpcC+nPtlAskDTEfEYlHhH6A0rXC+udV9k2sx3YVVxux93VkCZxN98S0ytyCJXtU90LS8ZswVA== X-Received: by 2002:a50:9a02:: with SMTP id o2-v6mr6146999edb.236.1531471560346; Fri, 13 Jul 2018 01:46:00 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:59 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:30 +0200 Message-Id: <20180713084530.13029-6-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 6/6] configs: Bananapi_M2_Ultra: enable gigabit ethernet 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" Enable the gigabit ethernet for the Bananapi M2 Ultra board. Tested on BananaPi M2 Berry (R40), custom board (V40) Reviewed-by: Joe Hershberger Signed-off-by: Lothar Felten Acked-by: Maxime Ripard Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- Changelog: new in v2 v2 -> v3 remove unused CONFIG_SUN7I_GMAC v3 -> v4 include device tree node, enable ALDO2 v4 -> v5 match Linux kernel device tree v5 -> v6 remove unused CONFIG_DM_GPIO --- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 16 ++++++++++++++++ configs/Bananapi_M2_Ultra_defconfig | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts index ab471ab0bf..28c9158302 100644 --- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -48,6 +48,7 @@ compatible = "sinovoip,bpi-m2-ultra", "allwinner,sun8i-r40"; aliases { + ethernet0 = &gmac; serial0 = &uart0; }; @@ -67,3 +68,18 @@ pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; + +&gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_rgmii_pins>; + phy-handle = <&phy1>; + phy-mode = "rgmii"; + status = "okay"; +}; + +&gmac_mdio { + phy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +}; diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig index 37cc2df5dc..edcbb16cf6 100644 --- a/configs/Bananapi_M2_Ultra_defconfig +++ b/configs/Bananapi_M2_Ultra_defconfig @@ -14,6 +14,10 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_FLASH is not set CONFIG_SCSI_AHCI=y CONFIG_AXP_DLDO4_VOLT=2500 +CONFIG_AXP_ALDO2_VOLT=2500 CONFIG_AXP_ELDO3_VOLT=1200 CONFIG_SCSI=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y +CONFIG_SUN8I_EMAC=y +CONFIG_RGMII=y +CONFIG_MACPWR="PA17"