summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/sbc
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-04-28 15:37:16 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-05-01 01:13:45 +0900
commitbef4b024e9839ea7afe689b050fc95118eeb0b01 (patch)
treedc1c5f047d8b2dc01443ef4caceb920f334fe54a /arch/arm/mach-uniphier/sbc
parent5eb4150e84e55057a3504b2cb06d7f5c145c866f (diff)
downloadtalos-obmc-uboot-bef4b024e9839ea7afe689b050fc95118eeb0b01.tar.gz
talos-obmc-uboot-bef4b024e9839ea7afe689b050fc95118eeb0b01.zip
ARM: uniphier: move pin-mux code into pin_init function
The code in uniphier_sld3_sbc_init() is pin-muxing, so it would be a better fit in uniphier_sld3_early_pin_init(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/sbc')
-rw-r--r--arch/arm/mach-uniphier/sbc/Makefile2
-rw-r--r--arch/arm/mach-uniphier/sbc/sbc-sld3.c17
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
index 236f13691c..38da253975 100644
--- a/arch/arm/mach-uniphier/sbc/Makefile
+++ b/arch/arm/mach-uniphier/sbc/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_ARCH_UNIPHIER_SLD3) += sbc-admulti.o sbc-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3) += sbc-admulti.o
obj-$(CONFIG_ARCH_UNIPHIER_LD4) += sbc-savepin.o sbc-ld4.o
obj-$(CONFIG_ARCH_UNIPHIER_PRO4) += sbc-savepin.o
obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += sbc-savepin.o sbc-ld4.o
diff --git a/arch/arm/mach-uniphier/sbc/sbc-sld3.c b/arch/arm/mach-uniphier/sbc/sbc-sld3.c
deleted file mode 100644
index ac9d0301be..0000000000
--- a/arch/arm/mach-uniphier/sbc/sbc-sld3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sg-regs.h"
-
-int uniphier_sld3_sbc_init(const struct uniphier_board_data *bd)
-{
- sg_set_pinsel(99, 1, 4, 4); /* GPIO26 -> EA24 */
-
- return 0;
-}
OpenPOWER on IntegriCloud