V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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 <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-27 23:47:06 +09:00
parent 76466bd7be
commit 9c5313dc09
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-uniphier/clk/clk-ld11.c
View File

@ -5,18 +5,20 @@
*/ */
#include <common.h> #include <common.h>
#include <spl.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/io.h> #include <linux/io.h>
#include "../boot-mode/boot-device.h"
#include "../init.h" #include "../init.h"
#include "../sc64-regs.h" #include "../sc64-regs.h"
#include "../sg-regs.h" #include "../sg-regs.h"
void uniphier_ld11_clk_init(void) void uniphier_ld11_clk_init(void)
{ {
if (readl(SG_PINMON0) & BIT(27)) { /* if booted from a device other than USB, without stand-by MPU */
/* if booted without stand-by MPU */ if ((readl(SG_PINMON0) & BIT(27)) &&
spl_boot_device_raw() != BOOT_DEVICE_USB) {
writel(1, SG_ETPHYPSHUT); writel(1, SG_ETPHYPSHUT);
writel(1, SG_ETPHYCNT); writel(1, SG_ETPHYCNT);