diff mbox series

[06/10] ARM: uniphier: remove unused uniphier_sbc_init_admulti()

Message ID 20200709060820.121087-6-yamada.masahiro@socionext.com
State Accepted
Commit f95237bb024fe449da1bb5a16338a59017225b59
Headers show
Series [01/10] Revert "ARM: uniphier: add weird workaround code for LD20" | expand

Commit Message

Masahiro Yamada July 9, 2020, 6:08 a.m. UTC 
This was used by the old sLD3 SoC, the support of which was removed
by commit 00aa453ebf56 ("ARM: uniphier: remove sLD3 SoC support").

There is no more user of this function.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 arch/arm/mach-uniphier/init.h    |  5 -----
 arch/arm/mach-uniphier/sbc/sbc.c | 34 +++++---------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index 622303786c..ee4605487f 100644
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -35,16 +35,11 @@  int uniphier_pro5_init(const struct uniphier_board_data *bd);
 int uniphier_pxs2_init(const struct uniphier_board_data *bd);
 
 #if defined(CONFIG_MICRO_SUPPORT_CARD)
-void uniphier_sbc_init_admulti(void);
 void uniphier_sbc_init_savepin(void);
 void uniphier_ld4_sbc_init(void);
 void uniphier_pxs2_sbc_init(void);
 void uniphier_ld11_sbc_init(void);
 #else
-static inline void uniphier_sbc_init_admulti(void)
-{
-}
-
 static inline void uniphier_sbc_init_savepin(void)
 {
 }
diff --git a/arch/arm/mach-uniphier/sbc/sbc.c b/arch/arm/mach-uniphier/sbc/sbc.c
index 2100f49a08..04ed539819 100644
--- a/arch/arm/mach-uniphier/sbc/sbc.c
+++ b/arch/arm/mach-uniphier/sbc/sbc.c
@@ -11,14 +11,6 @@ 
 #include "../init.h"
 #include "sbc-regs.h"
 
-#define SBCTRL0_ADMULTIPLX_PERI_VALUE	0x33120000
-#define SBCTRL1_ADMULTIPLX_PERI_VALUE	0x03005500
-#define SBCTRL2_ADMULTIPLX_PERI_VALUE	0x14000020
-
-#define SBCTRL0_ADMULTIPLX_MEM_VALUE	0x33120000
-#define SBCTRL1_ADMULTIPLX_MEM_VALUE	0x03005500
-#define SBCTRL2_ADMULTIPLX_MEM_VALUE	0x14000010
-
 /* slower but LED works */
 #define SBCTRL0_SAVEPIN_PERI_VALUE	0x55450000
 #define SBCTRL1_SAVEPIN_PERI_VALUE	0x07168d00
@@ -46,22 +38,16 @@  int uniphier_sbc_is_enabled(void)
 	return fdtdec_get_is_enabled(fdt, offset);
 }
 
-static void __uniphier_sbc_init(int savepin)
+void uniphier_sbc_init_savepin(void)
 {
 	/*
 	 * Only CS1 is connected to support card.
 	 * BKSZ[1:0] should be set to "01".
 	 */
-	if (savepin) {
-		writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL10);
-		writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL11);
-		writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL12);
-		writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL14);
-	} else {
-		writel(SBCTRL0_ADMULTIPLX_MEM_VALUE, SBCTRL10);
-		writel(SBCTRL1_ADMULTIPLX_MEM_VALUE, SBCTRL11);
-		writel(SBCTRL2_ADMULTIPLX_MEM_VALUE, SBCTRL12);
-	}
+	writel(SBCTRL0_SAVEPIN_PERI_VALUE, SBCTRL10);
+	writel(SBCTRL1_SAVEPIN_PERI_VALUE, SBCTRL11);
+	writel(SBCTRL2_SAVEPIN_PERI_VALUE, SBCTRL12);
+	writel(SBCTRL4_SAVEPIN_PERI_VALUE, SBCTRL14);
 
 	if (uniphier_sbc_boot_is_swapped()) {
 		/*
@@ -83,13 +69,3 @@  static void __uniphier_sbc_init(int savepin)
 		writel(0x0200be01, SBBASE1);
 	}
 }
-
-void uniphier_sbc_init_admulti(void)
-{
-	__uniphier_sbc_init(0);
-}
-
-void uniphier_sbc_init_savepin(void)
-{
-	__uniphier_sbc_init(1);
-}