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>

diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index 769778c..e7eba75 100644 (file)
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -27,7 +27,6 @@ obj-y += fdt-fixup.o
 
 endif
 
 
 endif
 

-obj-y += sbc/

 obj-y += soc-info.o
 obj-y += boot-device/
 obj-y += clk/
 obj-y += soc-info.o
 obj-y += boot-device/
 obj-y += clk/

diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c
index 69a35f5..98ff34c 100644 (file)
--- 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 <linux/log2.h>
 
 #include "../init.h"

-#include "../sbc/sbc-regs.h"

 #include "../sg-regs.h"
 #include "../soc-info.h"
 #include "boot-device.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;
 struct uniphier_boot_device_info {
        unsigned int soc_id;
        unsigned int boot_device_sel_shift;

diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
deleted file mode 100644 (file)
index 1303c36..0000000
--- a/arch/arm/mach-uniphier/sbc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y                                  += sbc-boot.o

diff --git a/arch/arm/mach-uniphier/sbc/sbc-boot.c b/arch/arm/mach-uniphier/sbc/sbc-boot.c
deleted file mode 100644 (file)
index 4d04c97..0000000
--- a/arch/arm/mach-uniphier/sbc/sbc-boot.c
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-//
-// Copyright (C) 2011-2014 Panasonic Corporation
-// Copyright (C) 2015-2019 Socionext Inc.
-
-#include <linux/io.h>
-
-#define SBBASE0                        0x58c00100
-#define SBBASE_BANK_ENABLE     (0x00000001)
-
-int uniphier_sbc_boot_is_swapped(void)
-{
-       return !(readl(SBBASE0) & SBBASE_BANK_ENABLE);
-}

diff --git a/arch/arm/mach-uniphier/sbc/sbc-regs.h b/arch/arm/mach-uniphier/sbc/sbc-regs.h
deleted file mode 100644 (file)
index 3a54b0e..0000000
--- a/arch/arm/mach-uniphier/sbc/sbc-regs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * UniPhier SBC (System Bus Controller) registers
- *
- * Copyright (C) 2011-2014 Panasonic Corporation
- * Copyright (C) 2015-2016 Socionext Inc.
- */
-
-#ifndef ARCH_SBC_REGS_H
-#define ARCH_SBC_REGS_H
-
-int uniphier_sbc_boot_is_swapped(void);
-
-#endif /* ARCH_SBC_REGS_H */