1 files changed, 1 insertions, 17 deletions

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 8f677df2d4c4..fd2446d995ad 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <linux/pinctrl/machine.h>
 #include <mach/common.h>
 #include <mach/r8a7740.h>
 #include <asm/mach/arch.h>
@@ -119,12 +118,6 @@
  *      usbhsf_power_ctrl()
  */
 
-static const struct pinctrl_map eva_pinctrl_map[] = {
-        /* SCIFA1 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
-                                  "scifa1_data", "scifa1"),
-};
-
 static void __init eva_clock_init(void)
 {
         struct clk *system      = clk_get(NULL, "system_clk");
@@ -165,27 +158,18 @@ clock_error:
  */
 static void __init eva_init(void)
 {
-
         r8a7740_clock_init(MD_CK0 | MD_CK2);
         eva_clock_init();
 
-        pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
-        r8a7740_pinmux_init();
-
         r8a7740_meram_workaround();
 
-        /*
-         * Touchscreen
-         * TODO: Move reset GPIO over to .dts when we can reference it
-         */
-        gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
-
 #ifdef CONFIG_CACHE_L2X0
         /* Early BRESP enable, Shared attribute override enable, 32K*8way */
         l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
         r8a7740_add_standard_devices_dt();
+
         r8a7740_pm_init();
 }