| From 7cf7d0d64536e1e6caa5c27aecce7d365b48b39d Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Wed, 6 Nov 2013 09:41:09 +0900 |
| Subject: ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB |
| |
| Do not build the phy fixup unless CONFIG_PHYLIB is enabled. |
| |
| Other than not being useful it is also not possible to link |
| the code under this condition as phy_register_fixup_for_id(), |
| mdiobus_read() and mdiobus_write() are absent. |
| |
| arch/arm/mach-shmobile/built-in.o: In function `lager_ksz8041_fixup': |
| board-lager.c:(.text+0xb8): undefined reference to `mdiobus_read' |
| board-lager.c:(.text+0xd4): undefined reference to `mdiobus_write' |
| arch/arm/mach-shmobile/built-in.o: In function `lager_init': |
| board-lager.c:(.init.text+0xafc): undefined reference to `phy_register_fixup_for_id' |
| |
| This problem was introduced by 48c8b96f21817aad |
| ("ARM: shmobile: Lager: add Micrel KSZ8041 PHY fixup") |
| |
| Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 6802cdc58d4fe66cffd6cd04ee55e65dd61eeeeb) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-lager.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c |
| index 475a9a7b70e2..4301c3812a13 100644 |
| --- a/arch/arm/mach-shmobile/board-lager.c |
| +++ b/arch/arm/mach-shmobile/board-lager.c |
| @@ -245,7 +245,9 @@ static void __init lager_init(void) |
| { |
| lager_add_standard_devices(); |
| |
| - phy_register_fixup_for_id("r8a7790-ether-ff:01", lager_ksz8041_fixup); |
| + if (IS_ENABLED(CONFIG_PHYLIB)) |
| + phy_register_fixup_for_id("r8a7790-ether-ff:01", |
| + lager_ksz8041_fixup); |
| } |
| |
| static const char *lager_boards_compat_dt[] __initdata = { |
| -- |
| 1.8.5.rc3 |
| |
