arm: socfpga: soc64: Remove PHY interface setup from misc arch init
Subsystems (3)
PATCH 1/1 arm: socfpga: soc64: Remove PHY interface setup from misc arch init
'dwmac_socfpga' driver will setup the PHY interface during probe. PHY interface setup in arch_misc_init() is no longer needed.
--- arch/arm/mach-socfpga/misc_s10.c | 84 +------------------------------- 1 file changed, 1 insertion(+), 83 deletions(-)
arch/arm/mach-socfpga/misc_s10.c +1 -83
@@ -8,20 +8,12 @@#include <common.h> #include <env.h> #include <errno.h> -#include <fdtdec.h> #include <init.h> #include <log.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/io.h> -#include <asm/arch/reset_manager.h> -#include <asm/arch/system_manager.h> #include <asm/arch/misc.h> -#include <asm/pl310.h> -#include <linux/libfdt.h> #include <asm/arch/mailbox_s10.h> - -#include <dt-bindings/reset/altr,rst-mgr-s10.h> +#include <asm/arch/reset_manager.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -45,79 +37,6 @@ static Altera_desc altera_fpga[] = { }, }; -/* -* DesignWare Ethernet initialization -*/ -#ifdef CONFIG_ETH_DESIGNWARE - -static u32 socfpga_phymode_setup (u32 gmac_index,const char *phymode) -{ -u32 modereg; - -if (!phymode) -return -EINVAL ; - -if (!strcmp (phymode,"mii" ) || !strcmp (phymode,"gmii" ) || - !strcmp (phymode,"sgmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII ; -else if (!strcmp (phymode,"rgmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII ; -else if (!strcmp (phymode,"rmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII ; -else -return -EINVAL ; - -clrsetbits_le32 (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_EMAC0 + - (gmac_index *sizeof (u32)), -SYSMGR_EMACGRP_CTRL_PHYSEL_MASK , modereg); - -return 0 ; -} - -static int socfpga_set_phymode (void ) -{ -const void *fdt = gd->fdt_blob; -struct fdtdec_phandle_args args; -const char *phy_mode; -u32 gmac_index; -int nodes[3 ];/* Max. 3 GMACs */ -int ret, count; -int i, node; - - count =fdtdec_find_aliases_for_id (fdt,"ethernet" , -COMPAT_ALTERA_SOCFPGA_DWMAC , - nodes,ARRAY_SIZE (nodes)); -for (i =0 ; i < count; i++) { - node = nodes[i]; -if (node <=0 ) -continue ; - - ret =fdtdec_parse_phandle_with_args (fdt, node,"resets" , -"#reset-cells" ,1 ,0 , - &args); -if (ret || args.args_count !=1 ) { -debug ("GMAC%i: Failed to parse DT 'resets'!\n" , i); -continue ; - } - - gmac_index = args.args[0 ] -EMAC0_RESET ; - - phy_mode =fdt_getprop (fdt, node,"phy-mode" ,NULL ); - ret =socfpga_phymode_setup (gmac_index, phy_mode); -if (ret) { -debug ("GMAC%i: Failed to parse DT 'phy-mode'!\n" , i); -continue ; - } - } - -return 0 ; -} -#else -static int socfpga_set_phymode (void ) -{ -return 0 ; -}; -#endif /* * Print CPU information
@@ -139,7 +58,6 @@ int arch_misc_init(void)sprintf (qspi_string,"<0x%08x>" ,cm_get_qspi_controller_clk_hz ());env_set ("qspi_clock" , qspi_string); -socfpga_set_phymode (); return 0; }#endif
Signature · 1 line
2.19.0
Tan
PATCH 1/1 arm: socfpga: soc64: Remove PHY interface setup from misc arch init
Quoted 13 lines
-----Original Message-----
From: Ang, Chee Hong <[email protected]>
Sent: Friday, July 10, 2020 11:53 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Simon Goldschmidt <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Ang, Chee Hong <[email protected]>
Subject: [PATCH] arm: socfpga: soc64: Remove PHY interface setup from misc arch init
Quoted 5 lines
'
dwmac_socfpga' driver will setup the PHY interface during probe. PHY interface setup inarch_misc_init()is no longer needed.Signed-off-by Chee Hong Ang <[email protected]>---