diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6c2b72b173c8..637f5756dca8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -361,11 +361,17 @@ config ARM_SINGLE_ARMV7M
 
 config ARCH_GEMINI
 	bool "Cortina Systems Gemini"
-	select CLKSRC_MMIO
+	select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
 	select CPU_FA526
-	select GENERIC_CLOCKEVENTS
+	select FARADAY_FTINTC010
+	select FTTMR010_TIMER
+	select GPIO_GEMINI
 	select GPIOLIB
 	select MULTI_IRQ_HANDLER
+	select POWER_RESET
+	select POWER_RESET_SYSCON
+	select SERIAL_OF_PLATFORM
+	select USE_OF
 	help
 	  Support for the Cortina Systems Gemini family SoCs
 
diff --git a/arch/arm/mach-gemini/Makefile b/arch/arm/mach-gemini/Makefile
index 7963a77be637..11f07fb6ec3d 100644
--- a/arch/arm/mach-gemini/Makefile
+++ b/arch/arm/mach-gemini/Makefile
@@ -4,7 +4,7 @@
 
 # Object file lists.
 
-obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o reset.o
+obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o reset.o board-dt.o
 
 # Board-specific support
 obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o
diff --git a/arch/arm/mach-gemini/board-dt.c b/arch/arm/mach-gemini/board-dt.c
new file mode 100644
index 000000000000..208ea99cdc47
--- /dev/null
+++ b/arch/arm/mach-gemini/board-dt.c
@@ -0,0 +1,38 @@
+/*
+ * Gemini Device Tree boot support
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+
+#ifdef CONFIG_DEBUG_GEMINI
+/* This is needed for LL-debug/earlyprintk/debug-macro.S */
+static struct map_desc gemini_io_desc[] __initdata = {
+	{
+		.virtual = CONFIG_DEBUG_UART_VIRT,
+		.pfn = __phys_to_pfn(CONFIG_DEBUG_UART_PHYS),
+		.length = SZ_4K,
+		.type = MT_DEVICE,
+	},
+};
+
+static void __init gemini_map_io(void)
+{
+	iotable_init(gemini_io_desc, ARRAY_SIZE(gemini_io_desc));
+}
+#else
+#define gemini_map_io NULL
+#endif
+
+static const char *gemini_board_compat[] = {
+	"cortina,gemini",
+	NULL,
+};
+
+DT_MACHINE_START(GEMINI_DT, "Gemini (Device Tree)")
+	.map_io		= gemini_map_io,
+	.dt_compat	= gemini_board_compat,
+MACHINE_END