From: Jagan Teki <jagan@openedev.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v6 17/21] i.MX6: SabreSD: Enable DM_ETH
Date: Thu, 18 May 2017 16:30:27 +0530 [thread overview]
Message-ID: <1495105231-1723-18-git-send-email-jagan@openedev.com> (raw)
In-Reply-To: <1495105231-1723-1-git-send-email-jagan@openedev.com>
From: Jagan Teki <jagan@amarulasolutions.com>
(1) Enable DM_ETH
(2) Droped board_eth_init
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
---
arch/arm/cpu/armv7/mx6/Kconfig | 1 +
board/freescale/mx6sabresd/mx6sabresd.c | 45 ++-------------------------------
2 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index fa55cc0..db7172f 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -214,6 +214,7 @@ config TARGET_MX6SABRESD
select BOARD_LATE_INIT
select OF_CONTROL
select DM
+ select DM_ETH
select DM_I2C
select DM_GPIO
select DM_MMC
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 1761a14..a30cf0d 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -16,7 +16,6 @@
#include <asm/imx-common/boot_mode.h>
#include <asm/imx-common/video.h>
#include <miiphy.h>
-#include <netdev.h>
#include <asm/arch/mxc_hdmi.h>
#include <asm/arch/crm_regs.h>
#include <asm/io.h>
@@ -28,9 +27,6 @@ DECLARE_GLOBAL_DATA_PTR;
PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \
PAD_CTL_SRE_FAST | PAD_CTL_HYS)
-#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
- PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
-
#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
@@ -47,37 +43,6 @@ static iomux_v3_cfg_t const uart1_pads[] = {
IOMUX_PADS(PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
};
-static iomux_v3_cfg_t const enet_pads[] = {
- IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
- /* AR8031 PHY Reset */
- IOMUX_PADS(PAD_ENET_CRS_DV__GPIO1_IO25 | MUX_PAD_CTRL(NO_PAD_CTRL)),
-};
-
-static void setup_iomux_enet(void)
-{
- SETUP_IOMUX_PADS(enet_pads);
-
- /* Reset AR8031 PHY */
- gpio_direction_output(IMX_GPIO_NR(1, 25) , 0);
- mdelay(10);
- gpio_set_value(IMX_GPIO_NR(1, 25), 1);
- udelay(100);
-}
-
static iomux_v3_cfg_t const ecspi1_pads[] = {
IOMUX_PADS(PAD_KEY_COL0__ECSPI1_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL)),
IOMUX_PADS(PAD_KEY_COL1__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL)),
@@ -344,14 +309,6 @@ int overwrite_console(void)
return 1;
}
-int board_eth_init(bd_t *bis)
-{
- setup_iomux_enet();
- setup_pcie();
-
- return cpu_eth_init(bis);
-}
-
int board_early_init_f(void)
{
setup_iomux_uart();
@@ -371,6 +328,8 @@ int board_init(void)
setup_spi();
#endif
+ setup_pcie();
+
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2017-05-18 11:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-18 11:00 [U-Boot] [PATCH v6 00/21] ARM: i.MX6: SabreSD: Add dts support Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 01/21] mx6sabresd: MAINTAINERS: Remove invalid defconfigs F: list Jagan Teki
2017-05-18 12:16 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 02/21] mx6sabresd: README: Fix to add space on dd command Jagan Teki
2017-05-18 12:17 ` Fabio Estevam
2017-05-18 15:41 ` Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 03/21] ARM: i.MX6: sabresd: Remove SPL_I2C_SUPPORT Jagan Teki
2017-05-18 12:18 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 04/21] ARM: dts: i.MX6: Add imx6qdl-sabresd.dtsi Jagan Teki
2017-05-18 12:20 ` Fabio Estevam
2017-05-22 16:51 ` Jagan Teki
2017-05-22 17:01 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 05/21] ARM: dts: i.MX6: Add imx6q-sabresd.dts Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 06/21] ARM: dts: i.MX6: Add imx6dl-sabresd.dts Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 07/21] ARM: dts: i.MX6: Add imx6qp.dtsi Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 08/21] ARM: dts: i.MX6: Add imx6qp-sabresd.dts Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 09/21] sabresd: i.MX6Q: Add initial dts support Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 10/21] sabresd: i.MX6QP: " Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 11/21] SabreSD: i.MX6DL: " Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 12/21] SabreSD: Move CONFIG_SYS_I2C_MXC to defconfigs Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 13/21] SabreSD: Enable DM_I2C and DM_PMIC Jagan Teki
2017-05-18 12:22 ` Fabio Estevam
2017-05-18 12:41 ` Fabio Estevam
2017-05-22 14:38 ` Jagan Teki
2017-05-22 14:48 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 14/21] SabreSD: Enable CONFIG_DM_REGULATOR Jagan Teki
2017-05-18 12:23 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 15/21] SabreSD: Enable DM_USB Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 16/21] i.MX6: Sabre: Move CONFIG_FEC_MXC to defconfigs Jagan Teki
2017-05-18 11:00 ` Jagan Teki [this message]
2017-05-18 12:26 ` [U-Boot] [PATCH v6 17/21] i.MX6: SabreSD: Enable DM_ETH Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 18/21] i.MX6: sabresd: Drop checkboard Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 19/21] i.MX6: SabreSD: Cleanup board code Jagan Teki
2017-05-18 11:00 ` [U-Boot] [PATCH v6 20/21] i.MX6: SabreSD: mx6sabresd_spl_defconfig => mx6sabresd_defconfig Jagan Teki
2017-05-18 12:27 ` Fabio Estevam
2017-05-18 11:00 ` [U-Boot] [PATCH v6 21/21] SabreSD: README: Update with dtb changes Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1495105231-1723-18-git-send-email-jagan@openedev.com \
--to=jagan@openedev.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox