diff options
| author | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/phy/marvell | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/phy/marvell')
| -rw-r--r-- | drivers/phy/marvell/comphy_a3700.c | 1 | ||||
| -rw-r--r-- | drivers/phy/marvell/comphy_core.c | 1 | ||||
| -rw-r--r-- | drivers/phy/marvell/comphy_cp110.c | 2 | ||||
| -rw-r--r-- | drivers/phy/marvell/comphy_mux.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c index c490dc69c69..bca325d1996 100644 --- a/drivers/phy/marvell/comphy_a3700.c +++ b/drivers/phy/marvell/comphy_a3700.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Marvell International Ltd. */ -#include <common.h> #include <fdt_support.h> #include <log.h> #include <asm/global_data.h> diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c index 7272dfb9fe8..a666a4e794e 100644 --- a/drivers/phy/marvell/comphy_core.c +++ b/drivers/phy/marvell/comphy_core.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Stefan Roese <[email protected]> */ -#include <common.h> #include <dm.h> #include <fdtdec.h> #include <asm/global_data.h> diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c index bb15fbaf347..b8cdedf6edf 100644 --- a/drivers/phy/marvell/comphy_cp110.c +++ b/drivers/phy/marvell/comphy_cp110.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Marvell International Ltd. */ -#include <common.h> #include <fdtdec.h> #include <log.h> #include <asm/global_data.h> @@ -12,6 +11,7 @@ #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <linux/delay.h> +#include <linux/errno.h> #include <linux/printk.h> #include "comphy_core.h" diff --git a/drivers/phy/marvell/comphy_mux.c b/drivers/phy/marvell/comphy_mux.c index 10981d25ec9..a8aa37fc46f 100644 --- a/drivers/phy/marvell/comphy_mux.c +++ b/drivers/phy/marvell/comphy_mux.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Marvell International Ltd. */ -#include <common.h> #include <log.h> #include <asm/io.h> |