Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac9f1cc2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier cpuidle material for v3.13.

parents 494b2449 35baa336

arch/arm/mach-exynos/common.c

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/clk-provider.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/platform_device.h>



#include <asm/proc-fns.h>

#include <asm/exception.h>
@@ -294,6 +295,16 @@ void exynos5_restart(enum reboot_mode mode, const char *cmd) 
	__raw_writel(val, addr);

}



static struct platform_device exynos_cpuidle = {

	.name		= "exynos_cpuidle",

	.id		= -1,

};



void __init exynos_cpuidle_init(void)

{

	platform_device_register(&exynos_cpuidle);

}



void __init exynos_init_late(void)

{

	if (of_machine_is_compatible("samsung,exynos5440"))

arch/arm/mach-exynos/common.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct map_desc; 
void exynos_init_io(void);

void exynos4_restart(enum reboot_mode mode, const char *cmd);

void exynos5_restart(enum reboot_mode mode, const char *cmd);

void exynos_cpuidle_init(void);

void exynos_init_late(void);



void exynos_firmware_init(void);

arch/arm/mach-exynos/cpuidle.c

+12 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/io.h>

#include <linux/export.h>

#include <linux/time.h>

#include <linux/platform_device.h>



#include <asm/proc-fns.h>

#include <asm/smp_scu.h>
@@ -192,7 +193,7 @@ static void __init exynos5_core_down_clk(void) 
	__raw_writel(tmp, EXYNOS5_PWR_CTRL2);

}



static int __init exynos4_init_cpuidle(void)

static int __init exynos_cpuidle_probe(struct platform_device *pdev)

{

	int cpu_id, ret;

	struct cpuidle_device *device;
@@ -226,4 +227,13 @@ static int __init exynos4_init_cpuidle(void) 


	return 0;

}

device_initcall(exynos4_init_cpuidle);
 


static struct platform_driver exynos_cpuidle_driver = {

	.probe	= exynos_cpuidle_probe,

	.driver = {

		.name = "exynos_cpuidle",

		.owner = THIS_MODULE,

	},

};



module_platform_driver(exynos_cpuidle_driver);

arch/arm/mach-exynos/mach-exynos4-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


static void __init exynos4_dt_machine_init(void)

{

	exynos_cpuidle_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-exynos/mach-exynos5-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static void __init exynos5_dt_machine_init(void) 
		}

	}



	exynos_cpuidle_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}