summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/clk
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-13 16:24:26 (GMT)
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-02-22 23:37:56 (GMT)
commit784548efb2b76fdbfdb73f6a505a156f90bb1e55 (patch)
tree1e8457137b8933095298964f8a6cb3675cdedfc4 /arch/arm/mach-uniphier/clk
parent81c847bf3806f2cb275f8b084872b97508823462 (diff)
downloadu-boot-fsl-qoriq-784548efb2b76fdbfdb73f6a505a156f90bb1e55.tar.xz
ARM: uniphier: rework spl_boot_device() and related code
The current implementation has ugly switch statements here and there, and duplicates similar code. Rework it using table lookups for SoC data and reduce code duplication. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/clk')
-rw-r--r--arch/arm/mach-uniphier/clk/clk-ld11.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c
index 58069cb..b1e82a1 100644
--- a/arch/arm/mach-uniphier/clk/clk-ld11.c
+++ b/arch/arm/mach-uniphier/clk/clk-ld11.c
@@ -9,7 +9,6 @@
#include <linux/bitops.h>
#include <linux/io.h>
-#include "../boot-mode/boot-device.h"
#include "../init.h"
#include "../sc64-regs.h"
#include "../sg-regs.h"
@@ -18,7 +17,7 @@ void uniphier_ld11_clk_init(void)
{
/* 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) {
+ uniphier_boot_device_raw() != BOOT_DEVICE_USB) {
writel(1, SG_ETPHYPSHUT);
writel(1, SG_ETPHYCNT);