imx: imx8mm/imx8mn_beacon: Remove redundant code
PATCH 1/1 imx: imx8mm/imx8mn_beacon: Remove redundant code
The Ethernet controller and PHY use the device tree info to configure themselves, so it's not necessary to manually do it in the board file. This permits the removal of a bunch of headers as well.
board/beacon/imx8mm/imx8mm_beacon.c +1 -40
@@ -1,52 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2020 Compass Electronics Group, LLC +* Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include <common.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/global_data.h> -#include <asm/arch/clock.h> -#include <asm/arch/sys_proto.h> -#include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR ; -#if IS_ENABLED (CONFIG_FEC_MXC ) -static int setup_fec (void ) -{ -struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR ; - -/* Use 125M anatop REF_CLK1 for ENET1, not from external */ -clrsetbits_le32 (&gpr->gpr[1 ],0x2000 ,0 ); - -return 0 ; -} - -int board_phy_config (struct phy_device *phydev) -{ -/* enable rgmii rxc skew and phy mode select to RGMII copper */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x1f ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x8 ); - -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x00 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x82ee ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x100 ); - -if (phydev->drv->config) - phydev->drv->config (phydev); -return 0 ; -} -#endif -int board_init (void ) { -if (IS_ENABLED (CONFIG_FEC_MXC )) -setup_fec (); -return 0 ; }
board/beacon/imx8mn/imx8mn_beacon.c +1 -40
53 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi Adam,
Quoted 7 lines · Adam Ford
The Ethernet controller and PHY use the device tree info to configure themselves, so it's not necessary to manually do it in the board file. This permits the removal of a bunch of headers as well.
Signed-off-by Adam Ford <[email protected]>
Nice code removal.
Quoted 6 lines · Adam Ford
The Ethernet controller and PHY use the device tree info to configure themselves, so it's not necessary to manually do it in the board file. This permits the removal of a bunch of headers as well.
Signed-off-by Adam Ford <[email protected]>
Quoted 118 lines
board/beacon/imx8mm/imx8mm_beacon.c +1
-40@@ -1,52 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2020 Compass Electronics Group, LLC +* Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include <common.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/global_data.h> -#include <asm/arch/clock.h> -#include <asm/arch/sys_proto.h> -#include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR ; -#if IS_ENABLED (CONFIG_FEC_MXC ) -static int setup_fec (void ) -{ -struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR ; - -/* Use 125M anatop REF_CLK1 for ENET1, not from external */ -clrsetbits_le32 (&gpr->gpr[1 ],0x2000 ,0 ); - -return 0 ; -} - -int board_phy_config (struct phy_device *phydev) -{ -/* enable rgmii rxc skew and phy mode select to RGMII copper */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x1f ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x8 ); - -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x00 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x82ee ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x100 ); - -if (phydev->drv->config) - phydev->drv->config (phydev); -return 0 ; -} -#endif -int board_init (void ) { -if (IS_ENABLED (CONFIG_FEC_MXC )) -setup_fec (); -return 0 ; }board/beacon/imx8mn/imx8mn_beacon.c +1
-40@@ -1,52 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2020 Compass Electronics Group, LLC +* Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include <common.h> -#include <miiphy.h> -#include <netdev.h> - -#include <asm/arch/clock.h> -#include <asm/arch/sys_proto.h> #include <asm/global_data.h> -#include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ; -#if IS_ENABLED (CONFIG_FEC_MXC ) -static int setup_fec (void ) -{ -struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR ; - -/* Use 125M anatop REF_CLK1 for ENET1, not from external */ -clrsetbits_le32 (&gpr->gpr[1 ],0x2000 ,0 ); - -return 0 ; -} - -int board_phy_config (struct phy_device *phydev) -{ -/* enable rgmii rxc skew and phy mode select to RGMII copper */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x1f ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x8 ); - -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x00 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x82ee ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x100 ); - -if (phydev->drv->config) - phydev->drv->config (phydev); -return 0 ; -} -#endif -int board_init (void ) { -if (IS_ENABLED (CONFIG_FEC_MXC )) -setup_fec (); -return 0 ; }
PATCH 1/1 imx: imx8mm/imx8mn_beacon: Remove redundant code
In reply to Adam FordQuoted 113 lines
The Ethernet controller and PHY use the device tree info to configure themselves, so it's not necessary to manually do it in the board file. This permits the removal of a bunch of headers as well.
Signed-off-by Adam Ford <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Acked-by Peng Fan <[email protected]>board/beacon/imx8mm/imx8mm_beacon.c +1
-40@@ -1,52 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2020 Compass Electronics Group, LLC +* Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include <common.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/global_data.h> -#include <asm/arch/clock.h> -#include <asm/arch/sys_proto.h> -#include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR ; -#if IS_ENABLED (CONFIG_FEC_MXC ) -static int setup_fec (void ) -{ -struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR ; - -/* Use 125M anatop REF_CLK1 for ENET1, not from external */ -clrsetbits_le32 (&gpr->gpr[1 ],0x2000 ,0 ); - -return 0 ; -} - -int board_phy_config (struct phy_device *phydev) -{ -/* enable rgmii rxc skew and phy mode select to RGMII copper */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x1f ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x8 ); - -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x00 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x82ee ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x100 ); - -if (phydev->drv->config) - phydev->drv->config (phydev); -return 0 ; -} -#endif -int board_init (void ) { -if (IS_ENABLED (CONFIG_FEC_MXC )) -setup_fec (); -return 0 ; }board/beacon/imx8mn/imx8mn_beacon.c +1
-34@@ -1,52 +1,13 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2020 Compass Electronics Group, LLC +* Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ -#include <common.h> -#include <miiphy.h> -#include <netdev.h> - -#include <asm/arch/clock.h> -#include <asm/arch/sys_proto.h> #include <asm/global_data.h> -#include <asm/io.h> DECLARE_GLOBAL_DATA_PTR ; -#if IS_ENABLED (CONFIG_FEC_MXC ) -static int setup_fec (void ) -{ -struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR ; - -/* Use 125M anatop REF_CLK1 for ENET1, not from external */ -clrsetbits_le32 (&gpr->gpr[1 ],0x2000 ,0 ); - -return 0 ; -} - -int board_phy_config (struct phy_device *phydev) -{ -/* enable rgmii rxc skew and phy mode select to RGMII copper */ -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x1f ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x8 ); - -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x00 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x82ee ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1d ,0x05 ); -phy_write (phydev,MDIO_DEVAD_NONE ,0x1e ,0x100 ); - -if (phydev->drv->config) - phydev->drv->config (phydev); -return 0 ;
board/beacon/imx8mn/imx8mn_beacon.c line 13
Quoted 10 lines
board/beacon/imx8mn/imx8mn_beacon.c +0
-6-} -#endif -int board_init (void ) { -if (IS_ENABLED (CONFIG_FEC_MXC )) -setup_fec (); -return 0 ; }
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================