From: Masahiro Yamada Date: Thu, 27 Oct 2016 14:47:06 +0000 (+0900) Subject: ARM: uniphier: do not run harmful code for USB boot mode of LD11 ES3 X-Git-Tag: v2016.11-rc3~20^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c5313dc095ccab69dc9a0e100cdbda62369d4fb;p=oweals%2Fu-boot.git ARM: uniphier: do not run harmful code for USB boot mode of LD11 ES3 The USB boot without the stand-by MPU is available on ES3 or later of LD11 SoC, but the code in this if-conditional block must not be run when booting from USB. Check if the boot device is USB, and skip the code in the case. Signed-off-by: Masahiro Yamada --- diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c index ca8737d2ff..58069cbf15 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld11.c +++ b/arch/arm/mach-uniphier/clk/clk-ld11.c @@ -5,18 +5,20 @@ */ #include +#include #include #include +#include "../boot-mode/boot-device.h" #include "../init.h" #include "../sc64-regs.h" #include "../sg-regs.h" void uniphier_ld11_clk_init(void) { - if (readl(SG_PINMON0) & BIT(27)) { - /* if booted without stand-by MPU */ - + /* if booted from a device other than USB, without stand-by MPU */ + if ((readl(SG_PINMON0) & BIT(27)) && + spl_boot_device_raw() != BOOT_DEVICE_USB) { writel(1, SG_ETPHYPSHUT); writel(1, SG_ETPHYCNT);