From patchwork Tue Aug 16 09:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 659592 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sD7214CPFz9t1t for ; Tue, 16 Aug 2016 19:52:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EhMBmkBv; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 834F1A756B; Tue, 16 Aug 2016 11:52:16 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I_zBYBbcSmHs; Tue, 16 Aug 2016 11:52:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AF9CA756E; Tue, 16 Aug 2016 11:52:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EFDF1A753A for ; Tue, 16 Aug 2016 11:52:00 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9X7iBIncQrqe for ; Tue, 16 Aug 2016 11:52:00 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by theia.denx.de (Postfix) with ESMTPS id 09476A7558 for ; Tue, 16 Aug 2016 11:51:55 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id i138so15397836wmf.3 for ; Tue, 16 Aug 2016 02:51:55 -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=scGnbFgfQUI4h3+/BbqxYnkdCPQu2Ib8bFJCHbxw3OA=; b=EhMBmkBvOv45INOm1b8A6pEWSsTwFEEr5ALra4LbycJYK1329zxOcn0rsx1DF4bZQs n7q2Wrz741EWAlA6/2qiK/Um+d5PSbLCDLLpGM7GJisYtxlEsr8lcN9hHYMIJOZwuWBJ 8i3TVjcReH6A7wa/fRB8fgZ1H0hIqoSyPMCl6LQTy7FeSjAKaYM3J1Ty2S7D2gm58b9m Qp7Zng+Z5PsKi/5b6uH3P348jARN3yAtUa+s6bKsiu25PCUHSQyvKhpySAkSkfa/YOse leR68G3ugBqM8y0bmdeL8TS9N//mDHb8hhPtRNsm1xDqKMXj5eT3R9H7HEwevFKLC8UN HaCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=scGnbFgfQUI4h3+/BbqxYnkdCPQu2Ib8bFJCHbxw3OA=; b=itb7TVS/zB9Kp2STIjBLaybRmnOlBhDcSD+vC4cW3VFT5oOcyjjUhciXKSJ+KXcf5J iVoDBcVvZ8HXa2DcJs4fQOgqJ0r6KZi4Yr6Bir9j+o7GRbeu17IEx2bDueX/hHEmMoUz BkF0SWXwKoFA9i6rqMYkEkvWExkfISQaQ9l8C23ViHza+9QL5SwEGrKvcNgRd02acSrd YNXp276Cf6sBksAB5ZiwVvQY6ACs2iXrkll6/+MEn0rTXB9HDAwW4dhFKy6c/+/DxRf/ +NaS7Mgi+enzVYwmphZMDnd/rOIoIhuInL1yUzFB9vXEgkv8mDKlJuyvjL7+dExJuziI rjmA== X-Gm-Message-State: AEkoouuMXjfz83VgPQoBIx5D6THGsTEjPTGUjR7l49o/Gg+QazwXTzQMdyajNVh52FrNoA== X-Received: by 10.28.135.133 with SMTP id j127mr20891265wmd.9.1471341115050; Tue, 16 Aug 2016 02:51:55 -0700 (PDT) Received: from sark.fritz.box (host26-103-dynamic.31-79-r.retail.telecomitalia.it. [79.31.103.26]) by smtp.gmail.com with ESMTPSA id a2sm25812796wjg.46.2016.08.16.02.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 02:51:54 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Tue, 16 Aug 2016 11:49:50 +0200 Message-Id: <1471340990-16247-5-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471340990-16247-1-git-send-email-b.galvani@gmail.com> References: <1471340990-16247-1-git-send-email-b.galvani@gmail.com> Cc: Tom Rini , Joe Hershberger , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH 4/4] meson: odroid-c2: enable Ethernet support through the device tree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Remove the device definition from board file, update the driver with the new compatible property and update config with necessary options. Signed-off-by: Beniamino Galvani Reviewed-by: Simon Glass --- arch/arm/include/asm/arch-meson/gxbb.h | 3 --- board/amlogic/odroid-c2/odroid-c2.c | 13 ------------- configs/odroid-c2_defconfig | 3 +++ drivers/net/designware.c | 1 + 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/arch-meson/gxbb.h b/arch/arm/include/asm/arch-meson/gxbb.h index f90f632..ce41349 100644 --- a/arch/arm/include/asm/arch-meson/gxbb.h +++ b/arch/arm/include/asm/arch-meson/gxbb.h @@ -20,9 +20,6 @@ #define GXBB_GPIO_IN(n) GXBB_PERIPHS_ADDR(_GXBB_GPIO_OFF(n) + 1) #define GXBB_GPIO_OUT(n) GXBB_PERIPHS_ADDR(_GXBB_GPIO_OFF(n) + 2) -/* Pinmux registers 0 to 12 */ -#define GXBB_PINMUX(n) GXBB_PERIPHS_ADDR(0x2c + (n)) - #define GXBB_ETH_REG_0 GXBB_PERIPHS_ADDR(0x50) #define GXBB_ETH_REG_1 GXBB_PERIPHS_ADDR(0x51) diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/odroid-c2/odroid-c2.c index bd72100..b61daaa 100644 --- a/board/amlogic/odroid-c2/odroid-c2.c +++ b/board/amlogic/odroid-c2/odroid-c2.c @@ -21,24 +21,11 @@ int board_init(void) return 0; } -static const struct eth_pdata gxbb_eth_pdata = { - .iobase = GXBB_ETH_BASE, - .phy_interface = PHY_INTERFACE_MODE_RGMII, -}; - -U_BOOT_DEVICE(meson_eth) = { - .name = "eth_designware", - .platdata = &gxbb_eth_pdata, -}; - int misc_init_r(void) { u8 mac_addr[EFUSE_MAC_SIZE]; ssize_t len; - /* Select Ethernet function */ - setbits_le32(GXBB_PINMUX(6), 0x3fff); - /* Set RGMII mode */ setbits_le32(GXBB_ETH_REG_0, GXBB_ETH_REG_0_PHY_INTF | GXBB_ETH_REG_0_TX_PHASE(1) | diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 808bbc2..3e9ef68 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -14,6 +14,9 @@ CONFIG_HUSH_PARSER=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_MESON_GXBB=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_MESON=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 8ba72e3..9e6d726 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -737,6 +737,7 @@ static int designware_eth_ofdata_to_platdata(struct udevice *dev) static const struct udevice_id designware_eth_ids[] = { { .compatible = "allwinner,sun7i-a20-gmac" }, { .compatible = "altr,socfpga-stmmac" }, + { .compatible = "amlogic,meson6-dwmac" }, { } };