diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index 21340e0be73e..fd6c848d4763 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -37,6 +37,18 @@ config ARM_HIGHBANK_CPUIDLE
 	help
 	  Select this to enable cpuidle on Calxeda processors.
 
+config ARM_HISI_CPUIDLE
+	bool "Support for Hisilicon big.LITTLE processors"
+	depends on ARCH_HISI
+	select ARM_CPU_SUSPEND
+	select CPU_IDLE_MULTIPLE_DRIVERS
+	select DT_IDLE_STATES
+	help
+	  Select this option to enable CPU idle driver for big.LITTLE based
+	  ARM systems. Driver manages CPUs coordination through MCPM and
+	  define different C-states for little and big cores through the
+	  multiple CPU idle drivers infrastructure.
+
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
 	depends on MACH_KIRKWOOD && !ARM64
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 3ba81b1dffad..c8ed48fbd19e 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
 obj-$(CONFIG_ARM_AT91_CPUIDLE)          += cpuidle-at91.o
 obj-$(CONFIG_ARM_EXYNOS_CPUIDLE)        += cpuidle-exynos.o
 obj-$(CONFIG_ARM_CPUIDLE)		+= cpuidle-arm.o
+obj-$(CONFIG_ARM_HISI_CPUIDLE)		+= cpuidle-hisi.o
 
 ###############################################################################
 # MIPS drivers
diff --git a/drivers/cpuidle/cpuidle-hisi.c b/drivers/cpuidle/cpuidle-hisi.c
new file mode 100644
index 000000000000..003635639620
--- /dev/null
+++ b/drivers/cpuidle/cpuidle-hisi.c
@@ -0,0 +1,292 @@
+/*
+ * ARM64 generic CPU idle driver.
+ *
+ * Copyright (C) 2014 ARM Ltd.
+ * Author: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define pr_fmt(fmt) "CPUidle arm64: " fmt
+
+#include <linux/cpuidle.h>
+#include <linux/cpumask.h>
+#include <linux/cpu_pm.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+
+#include <asm/cpuidle.h>
+#include <asm/suspend.h>
+#include <linux/version.h>
+#include <linux/sched.h>
+#include <linux/cpu.h>
+#include "dt_idle_states.h"
+#ifdef CONFIG_HISI_CORESIGHT_TRACE
+#include <linux/coresight.h>
+#endif
+
+enum {
+	LITTLE_CLUSTER_ID = 0,
+	BIG_CLUSTER_ID,
+	MAX_CLUSTER_ID,
+};
+
+/*
+ * hisi_enter_idle_state - Programs CPU to enter the specified state
+ *
+ * dev: cpuidle device
+ * drv: cpuidle driver
+ * idx: state index
+ *
+ * Called from the CPUidle framework to program the device to the
+ * specified target state selected by the governor.
+ */
+
+extern int real_enable_cpuidle;
+
+static int hisi_enter_idle_state(struct cpuidle_device *dev,
+				     struct cpuidle_driver *drv, int idx)
+{
+	int ret;
+
+	if (need_resched()) {
+		return idx;
+	}
+
+	if (!idx) {
+		cpu_do_idle();
+		return idx;
+	}
+
+	ret = cpu_pm_enter();
+	if (!ret) {
+#ifdef CONFIG_ARCH_HISI
+		local_fiq_disable();
+#endif
+
+		/*
+		* Pass idle state index to cpu_suspend which in turn will
+		* call the CPU ops suspend protocol with idle index as a
+		* parameter.
+		*/
+		ret = arm_cpuidle_suspend(idx);
+
+#ifdef CONFIG_HISI_CORESIGHT_TRACE
+		/*Restore ETM registers */
+		_etm4_cpuilde_restore();
+#endif
+#ifdef CONFIG_ARCH_HISI
+		local_fiq_enable();
+#endif
+		cpu_pm_exit();
+
+	}
+
+	return ret ? -1 : idx;
+}
+
+static struct cpuidle_driver hisi_little_cluster_idle_driver = {
+	.name = "hisi_little_cluster_idle",
+	.owner = THIS_MODULE,
+	/*
+	* State at index 0 is standby wfi and considered standard
+	* on all ARM platforms. If in some platforms simple wfi
+	* can't be used as "state 0", DT bindings must be implemented
+	* to work around this issue and allow installing a special
+	* handler for idle state index 0.
+	*/
+	.states[0] = {
+		.enter			= hisi_enter_idle_state,
+		.exit_latency		= 1,
+		.target_residency	= 1,
+		.power_usage	      = UINT_MAX,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,14)
+		.flags			= CPUIDLE_FLAG_TIME_VALID,
+#endif
+		.name			= "WFI",
+		.desc			= "ARM64 WFI",
+	}
+};
+static struct cpuidle_driver hisi_big_cluster_idle_driver = {
+	.name = "hisi_big_cluster_idle",
+	.owner = THIS_MODULE,
+	/*
+	* State at index 0 is standby wfi and considered standard
+	* on all ARM platforms. If in some platforms simple wfi
+	* can't be used as "state 0", DT bindings must be implemented
+	* to work around this issue and allow installing a special
+	* handler for idle state index 0.
+	*/
+	.states[0] = {
+		.enter			= hisi_enter_idle_state,
+		.exit_latency		= 1,
+		.target_residency	= 1,
+		.power_usage	      = UINT_MAX,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,14)
+		.flags			= CPUIDLE_FLAG_TIME_VALID,
+#endif
+		.name			= "WFI",
+		.desc			= "ARM64 WFI",
+	}
+};
+
+static const struct of_device_id arm64_idle_state_match[] __initconst = {
+	{ .compatible = "arm,idle-state",
+	 .data = hisi_enter_idle_state },
+	{ },
+};
+
+static int __init hisi_idle_drv_cpumask_init(struct cpuidle_driver *drv, int cluster_id)
+{
+	struct cpumask *cpumask;
+	int cpu;
+
+	cpumask = kzalloc(cpumask_size(), GFP_KERNEL);
+	if (!cpumask)
+		return -ENOMEM;
+
+	for_each_possible_cpu(cpu) {
+		if (cpu_topology[cpu].cluster_id == cluster_id)
+			  cpumask_set_cpu(cpu, cpumask);
+	}
+
+	drv->cpumask = cpumask;
+
+	return 0;
+}
+
+static void __init hisi_idle_drv_cpumask_uninit(struct cpuidle_driver *drv)
+{
+	kfree(drv->cpumask);
+}
+
+static int __init hisi_idle_drv_init(struct cpuidle_driver *drv)
+{
+	int cpu, ret;
+
+	/*
+	* Initialize idle states data, starting at index 1.
+	* This driver is DT only, if no DT idle states are detected (ret == 0)
+	* let the driver initialization fail accordingly since there is no
+	* reason to initialize the idle driver if only wfi is supported.
+	*/
+	ret = dt_init_idle_driver(drv, arm64_idle_state_match, 1);
+	if (ret <= 0) {
+		if (ret)
+			  pr_err("failed to initialize idle states\n");
+		return ret ? : -ENODEV;
+	}
+
+	/*
+	* Call arch CPU operations in order to initialize
+	* idle states suspend back-end specific data
+	*/
+	for_each_possible_cpu(cpu) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,14)
+		ret = arm_cpuidle_init(cpu);
+#else
+		ret = cpu_init_idle(cpu);
+#endif
+		if (ret) {
+			  pr_err("CPU %d failed to init idle CPU ops\n", cpu);
+			  return ret;
+		}
+	}
+
+	ret = cpuidle_register(drv, NULL);
+	if (ret) {
+		pr_err("failed to register cpuidle driver\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int __init hisi_multidrv_idle_init(struct cpuidle_driver *drv, int cluster_id)
+{
+	int ret;
+	if (cluster_id >= MAX_CLUSTER_ID) {
+		pr_err("cluster id is out of range.\n");
+		return -ENODEV;
+	}
+
+	ret = hisi_idle_drv_cpumask_init(drv, cluster_id);
+	if (ret) {
+		pr_err("fail to init idle driver!\n");
+		return ret;
+	}
+
+	ret = hisi_idle_drv_init(drv);
+	if (ret) {
+		hisi_idle_drv_cpumask_uninit(drv);
+		pr_err("fail to register cluster%d cpuidle drv.\n", cluster_id);
+		return ret;
+	}
+
+	return 0;
+}
+
+
+static int cpuidle_decoup_hotplug_notify(struct notifier_block *nb,
+		unsigned long action, void *hcpu)
+{
+	if(action & CPU_TASKS_FROZEN)
+		return NOTIFY_OK;
+	switch (action & ~CPU_TASKS_FROZEN) {
+	case CPU_UP_PREPARE:
+	case CPU_DOWN_PREPARE:
+		cpuidle_pause();
+		break;
+	case CPU_DOWN_FAILED:
+	case CPU_UP_CANCELED:
+	case CPU_ONLINE:
+	case CPU_DEAD:
+		cpuidle_resume();
+		kick_all_cpus_sync();
+		break;
+	default:
+		break;
+	}
+	return NOTIFY_OK;
+}
+
+static struct notifier_block cpuidle_decoup_hotplug_notifier = {
+	.notifier_call = cpuidle_decoup_hotplug_notify,
+};
+
+/*
+ * hisi_idle_init
+ *
+ * Registers the hisi multi cpuidle driver with the cpuidle
+ * framework. It relies on core code to parse the idle states
+ * and initialize them using driver data structures accordingly.
+ */
+static int __init hisi_idle_init(void)
+{
+	int ret;
+
+	ret = hisi_multidrv_idle_init(&hisi_little_cluster_idle_driver, LITTLE_CLUSTER_ID);
+	if (ret) {
+		pr_err("fail to register little cluster cpuidle drv.\n");
+		return ret;
+	}
+
+	ret = hisi_multidrv_idle_init(&hisi_big_cluster_idle_driver, BIG_CLUSTER_ID);
+	if (ret) {
+		pr_err("fail to register big cluster cpuidle drv.\n");
+		return ret;
+	}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,14)
+	ret = register_cpu_notifier(&cpuidle_decoup_hotplug_notifier);
+	if (ret) {
+		pr_err("fail to register cpuidle_coupled_cpu_notifier.\n");
+		return ret;
+	}
+#endif
+	return 0;
+}
+device_initcall(hisi_idle_init);