From patchwork Sun Apr 9 06:52:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 748722 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w14M45SSfz9s03 for ; Sun, 9 Apr 2017 17:14:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7BCC3C21D84; Sun, 9 Apr 2017 07:06:09 +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_H2 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 4180BC21D3B; Sun, 9 Apr 2017 07:06:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0E473C21D12; Sun, 9 Apr 2017 06:56:31 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 7725FC21D18 for ; Sun, 9 Apr 2017 06:56:26 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id o126so5493887pfb.1 for ; Sat, 08 Apr 2017 23:56:26 -0700 (PDT) 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=d0qvvYOoMQHez4F5Y/10pgPHIRFFPtTmE2LmgAylH00=; b=nd1Kc0ouY6UdAi4yb6GzJ+qbV40B1ozuCdeOLJofPvZMKA3Vp5vLDgxUzuiYDiuC5l /qr7XQGoJHt7i3cVxiacyuT4AXbiXpB1os+0SnJF/V0l15uQwqGQylfdKBL8xx5CtPrL y8fJ6AVsweBfe6WW3N5lEQjvp/5G5j7emnxN2oticGRs7GuaWOl5nKKqDqNEgiqfwB4h RqT10l2QnHKO8+AR0NeYrXkM8+SnB2zq/mln13I1skWnypw9nRJKoclnBbH92GT3BbpN kZgIjLwhqGpBqlqmV7ZGtf9ee7M/DMFD/yjq0FkeMWn7vcorFFW4EjoYJwzMNlWqd5Bt r7kw== X-Gm-Message-State: AFeK/H3lEgcQ4ARzbowVPAZHu7tHAaMwTS/0dwp5cb1gF2NMELT+ESm+bkvpmaE0TBCUHg== X-Received: by 10.98.78.8 with SMTP id c8mr47737018pfb.155.1491720985221; Sat, 08 Apr 2017 23:56:25 -0700 (PDT) Received: from localhost.localdomain ([117.254.77.247]) by smtp.gmail.com with ESMTPSA id e76sm17804207pfk.75.2017.04.08.23.56.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Apr 2017 23:56:24 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Sun, 9 Apr 2017 12:22:40 +0530 Message-Id: <1491720776-7445-20-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491720776-7445-1-git-send-email-jagan@openedev.com> References: <1491720776-7445-1-git-send-email-jagan@openedev.com> Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 19/35] ARM: i.MX6: sabresd: Enable DM_ETH 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" From: Jagan Teki Enable DM_ETH for dt supported sabresd config boards: - imx6q_sabresd_defconfig - imx6qp_sabresd_defconfig Cc: Stefano Babic Cc: Fabio Estevam Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v4, v3, v2: - none board/freescale/mx6sabresd/mx6sabresd.c | 6 ++++++ configs/imx6q_sabresd_spl_defconfig | 1 + configs/imx6qp_sabresd_spl_defconfig | 1 + 3 files changed, 8 insertions(+) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index a143dbb..10bc7c6 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -70,6 +70,7 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; +#ifndef CONFIG_OF_CONTROL static iomux_v3_cfg_t const enet_pads[] = { MX6_PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL), MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), @@ -100,6 +101,7 @@ static void setup_iomux_enet(void) gpio_set_value(IMX_GPIO_NR(1, 25), 1); udelay(100); } +#endif static iomux_v3_cfg_t const usdhc2_pads[] = { MX6_PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -222,6 +224,7 @@ static void setup_spi(void) imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); } +#ifndef CONFIG_OF_CONTROL iomux_v3_cfg_t const pcie_pads[] = { MX6_PAD_EIM_D19__GPIO3_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL), /* POWER */ MX6_PAD_GPIO_17__GPIO7_IO12 | MUX_PAD_CTRL(NO_PAD_CTRL), /* RESET */ @@ -231,6 +234,7 @@ static void setup_pcie(void) { imx_iomux_v3_setup_multiple_pads(pcie_pads, ARRAY_SIZE(pcie_pads)); } +#endif iomux_v3_cfg_t const di0_pads[] = { MX6_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK, /* DISP0_CLK */ @@ -507,6 +511,7 @@ int overwrite_console(void) return 1; } +#ifndef CONFIG_OF_CONTROL int board_eth_init(bd_t *bis) { setup_iomux_enet(); @@ -514,6 +519,7 @@ int board_eth_init(bd_t *bis) return cpu_eth_init(bis); } +#endif #if defined(CONFIG_USB_EHCI_MX6) && !defined(CONFIG_DM_USB) #define USB_OTHERREGS_OFFSET 0x800 diff --git a/configs/imx6q_sabresd_spl_defconfig b/configs/imx6q_sabresd_spl_defconfig index 377a489..8c7baee 100644 --- a/configs/imx6q_sabresd_spl_defconfig +++ b/configs/imx6q_sabresd_spl_defconfig @@ -52,6 +52,7 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y CONFIG_OF_CONTROL=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y diff --git a/configs/imx6qp_sabresd_spl_defconfig b/configs/imx6qp_sabresd_spl_defconfig index 13c2288..7568329 100644 --- a/configs/imx6qp_sabresd_spl_defconfig +++ b/configs/imx6qp_sabresd_spl_defconfig @@ -52,6 +52,7 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y CONFIG_OF_CONTROL=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y