Revert "ARM: meson: Temporary fix for OdroidC4 SD card reboot issue"

This reverts commit 394a3fc1a2f2ab0eb61dc32231cb94e8ed55e845.

It will be replaced by a patch accepted in mainline uboot.

Change-Id: If335526aee08221fcbcd200fb7dbc4b7635d5415
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index a2bb0f94a0e71c0dfae05f17354646f260e5b19a..a69bf527537261cdf77ee9b08945436cd5592f1f 100644 (file)
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -11,7 +11,6 @@
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <asm/cache.h>
-#include <asm/gpio.h>
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
@@ -195,14 +194,6 @@ void reset_cpu(ulong addr)
 #else
 void reset_cpu(ulong addr)
 {
-#ifdef CONFIG_TIZEN_ODROID_C4
-       unsigned int gpio;
-       const char *str_gpio = "aobus-banks3";
-
-       gpio_lookup_name(str_gpio, NULL, NULL, &gpio);
-       gpio_request(gpio, "reboot");
-       gpio_direction_input(gpio);
-#endif
        psci_system_reset();
 }
 #endif

diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig
index 4582acc75d9e8bcc745b5b0c0989d189168e88c8..ef67db057dcea2ce297d20c1161f18b033248586 100644 (file)
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_SYS_BOARD="odroid-n2"
-CONFIG_ARM_SMCCC=y
 CONFIG_ARCH_MESON=y
 CONFIG_SYS_TEXT_BASE=0x01000000
 CONFIG_NR_DRAM_BANKS=1
@@ -12,7 +11,6 @@ CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL=y
 CONFIG_DEBUG_UART_BASE=0xff803000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" odroid-c4"
-# CONFIG_PSCI_RESET is not set
 CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-odroid-c4"
 CONFIG_DEBUG_UART=y
 CONFIG_OF_BOARD_SETUP=y