On 09/25/2018 08:31 AM, Ooi, Joyce wrote:

Additional sgmii phymode is added in socfpga_phymode_setup() along with a minor fix for maximum number of GMACs.

Signed-off-by: Ooi, Joyce joyce.ooi@intel.com

CCing Ley and Dinh.

Applied, thanks.

---

arch/arm/mach-socfpga/misc_s10.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c index 918baac..e599362 100644 --- a/arch/arm/mach-socfpga/misc_s10.c +++ b/arch/arm/mach-socfpga/misc_s10.c @@ -36,7 +36,8 @@ static u32 socfpga_phymode_setup(u32 gmac_index, const char *phymode) if (!phymode) return -EINVAL;

• if (!strcmp(phymode, "mii") || !strcmp(phymode, "gmii"))

• 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;

@@ -58,7 +59,7 @@ static int socfpga_set_phymode(void) struct fdtdec_phandle_args args; const char *phy_mode; u32 gmac_index;

• int nodes[2]; /* Max. 3 GMACs */

• int nodes[3]; /* Max. 3 GMACs */ int ret, count; int i, node;