summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/boot-device
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2020-07-09 15:08:20 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2020-07-11 21:30:21 +0900
commitd7877c985b1671a427f97f04ef12aa8ad25d6e0e (patch)
tree6bda0e091ccf8f3c8aa4de082783908cffd71da1 /arch/arm/mach-uniphier/boot-device
parent862274913f8fa7195691f303807a2569c0301ed9 (diff)
downloadu-boot-d7877c985b1671a427f97f04ef12aa8ad25d6e0e.tar.gz
u-boot-d7877c985b1671a427f97f04ef12aa8ad25d6e0e.tar.xz
u-boot-d7877c985b1671a427f97f04ef12aa8ad25d6e0e.zip
ARM: uniphier: remove sbc/ directory
Now that this directory contains only uniphier_sbc_boot_is_swapped(), move it to boot-device.c and delete the sbc/ directory entirely. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/boot-device')
-rw-r--r--arch/arm/mach-uniphier/boot-device/boot-device.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 69a35f5fb8..98ff34cfa7 100644
--- a/arch/arm/mach-uniphier/boot-device/boot-device.c
+++ b/arch/arm/mach-uniphier/boot-device/boot-device.c
@@ -14,11 +14,18 @@
#include <linux/log2.h>
#include "../init.h"
-#include "../sbc/sbc-regs.h"
#include "../sg-regs.h"
#include "../soc-info.h"
#include "boot-device.h"
+#define SBBASE0 0x58c00100
+#define SBBASE_BANK_ENABLE BIT(0)
+
+static int uniphier_sbc_boot_is_swapped(void)
+{
+ return !(readl(SBBASE0) & SBBASE_BANK_ENABLE);
+}
+
struct uniphier_boot_device_info {
unsigned int soc_id;
unsigned int boot_device_sel_shift;