From 2dc0ca2639fb806df031dc4bb2a1bca655f97b08 Mon Sep 17 00:00:00 2001
From: John Haechten john.haechten@microsemi.com Date: Mon, 14 Nov 2016 08:50:48 -0800 Subject: [PATCH 2/2] Fix patman alignment issues in Add MSCC PHY:VSC8530/VSC8531/VSC8540/VSC8541 (C) Copyright 2016 Microsemi Corporation, MIT License (MIT) Author: John Haechten john.haechten@microsemi.com Signed-off-by:John Haechten john.haechten@microsemi.com; Reviewed-by:Howard Hicks howard.hicks@microsemi.com; Series-to:u-boot;phy; Cc:Allan Nielsen Allan.Nielsen@microsemi.com Tested-by:Howard Hicks Howard.Hicks@microsemi.com Series-name:Add Support for MSCC PHY:VSC8530/VSC8531/VSC8540/VSC8541 Cover-letter: Add u-boot support for MSCC 1G Phy family: VSC8530/VSC8531/VSC8540/VSC8541 END Series-notes: Tested using BeagleBoneBlack, bb.org-overlays, v2016.11-rc3, with 0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch applied END
Signed-off-by: John Haechten john.haechten@microsemi.com ---
drivers/net/phy/mscc.c | 2 +- drivers/net/phy/phy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index e6d8fcd..8070e8a 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -385,7 +385,7 @@ static int vsc8541_config(struct phy_device *phydev) break; default: printf("PHY 8541 MAC i/f config Error: mac i/f = 0x%x\n", - phydev->interface); + phydev->interface); return -EINVAL; }
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 539abee..8db6574 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -513,7 +513,7 @@ int phy_init(void) phy_xilinx_init(); #endif #ifdef CONFIG_PHY_MSCC - phy_mscc_init(); + phy_mscc_init(); #endif
return 0; -- 1.9.1