ARM: s3c64xx: Leave disabling of unused PM domains to genpd
authorUlf Hansson <ulf.hansson@linaro.org>
Wed, 3 Sep 2014 10:52:28 +0000 (12:52 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Sep 2014 22:46:12 +0000 (00:46 +0200)
Since genpd at late init, will try to disable unused PM domains we
don't need to do it from the machine specific code as well.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
13 files changed:
arch/arm/mach-s3c64xx/common.c
arch/arm/mach-s3c64xx/common.h
arch/arm/mach-s3c64xx/mach-anw6410.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-ncp.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smartq5.c
arch/arm/mach-s3c64xx/mach-smartq7.c
arch/arm/mach-s3c64xx/mach-smdk6400.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s3c64xx/pm.c

index 5c45aae675b63e86f21c44aea48e41bfccddb444..16547f2641a32d343bb8ea44adfdf106ad781f49 100644 (file)
@@ -440,8 +440,3 @@ void s3c64xx_restart(enum reboot_mode mode, const char *cmd)
        /* if all else fails, or mode was for soft, jump to 0 */
        soft_restart(0);
 }
-
-void __init s3c64xx_init_late(void)
-{
-       s3c64xx_pm_late_initcall();
-}
index 7043e7a3a67ed868f9e4465d7afae197619dcdc9..9eb8644129116e9354274283c0cfd4d66e032f9e 100644 (file)
@@ -23,7 +23,6 @@ void s3c64xx_init_irq(u32 vic0, u32 vic1);
 void s3c64xx_init_io(struct map_desc *mach_desc, int size);
 
 void s3c64xx_restart(enum reboot_mode mode, const char *cmd);
-void s3c64xx_init_late(void);
 
 void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
        unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
@@ -52,12 +51,6 @@ extern void s3c6410_map_io(void);
 #define s3c6410_init NULL
 #endif
 
-#ifdef CONFIG_PM
-int __init s3c64xx_pm_late_initcall(void);
-#else
-static inline int s3c64xx_pm_late_initcall(void) { return 0; }
-#endif
-
 #ifdef CONFIG_S3C64XX_PL080
 extern struct pl08x_platform_data s3c64xx_dma0_plat_data;
 extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
index 60576dfbea8d42cf152cdd0aced552f10f888d27..6224c67f5061251568995a80d0d278b060c26840 100644 (file)
@@ -233,7 +233,6 @@ MACHINE_START(ANW6410, "A&W6410")
        .init_irq       = s3c6410_init_irq,
        .map_io         = anw6410_map_io,
        .init_machine   = anw6410_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index fe116334afda929958a2671ba224bb06d8fe88be..10b913baab2883562acb916ecef103d96b35b761 100644 (file)
@@ -857,7 +857,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
        .init_irq       = s3c6410_init_irq,
        .map_io         = crag6410_map_io,
        .init_machine   = crag6410_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 19e8feb908fdba504cda3f150202f053dbd21255..e4b087c58ee61ae14fbe69f8204c85d806909666 100644 (file)
@@ -277,7 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT")
        .init_irq       = s3c6410_init_irq,
        .map_io         = hmt_map_io,
        .init_machine   = hmt_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 9cbc07602ef388cb78a97e0196899c041e7ce927..ab61af50bfb9c485e2488ca67579777a11ebafda 100644 (file)
@@ -366,7 +366,6 @@ MACHINE_START(MINI6410, "MINI6410")
        .init_irq       = s3c6410_init_irq,
        .map_io         = mini6410_map_io,
        .init_machine   = mini6410_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 4bae7dc49eeabe9a9602f8efda7bb06e89eb931b..80cb1446f69f8241d20bd3e7f69d72b7a29b63a4 100644 (file)
@@ -103,7 +103,6 @@ MACHINE_START(NCP, "NCP")
        .init_irq       = s3c6410_init_irq,
        .map_io         = ncp_map_io,
        .init_machine   = ncp_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index fbad2af1ef1604a46ffa1a06dc0f387ef40006c0..85fa9598b9801f21833b75dc10d46f2017d12ac6 100644 (file)
@@ -335,7 +335,6 @@ MACHINE_START(REAL6410, "REAL6410")
        .init_irq       = s3c6410_init_irq,
        .map_io         = real6410_map_io,
        .init_machine   = real6410_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index dec4c08e834f4d5026284342568102d2a8e6a1a4..33224ab36fac8c8692ab84a7455c63f520184ada 100644 (file)
@@ -156,7 +156,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5")
        .init_irq       = s3c6410_init_irq,
        .map_io         = smartq_map_io,
        .init_machine   = smartq5_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 27b322069c7dd4420495eb26b370ffd01c8e84c0..fc7fece22fb0d8e5a12e83aac2c880154ae50d7c 100644 (file)
@@ -172,7 +172,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7")
        .init_irq       = s3c6410_init_irq,
        .map_io         = smartq_map_io,
        .init_machine   = smartq7_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 91074976834042646cb8a42e6d4ffe44eb1fd59c..6f425126a735eb05e66732097a9b050e76b2234b 100644 (file)
@@ -92,7 +92,6 @@ MACHINE_START(SMDK6400, "SMDK6400")
        .init_irq       = s3c6400_init_irq,
        .map_io         = smdk6400_map_io,
        .init_machine   = smdk6400_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 1dc86d76b530032a75cdd644a34219909cf8f7c9..661eb662d05159861fb9fffd9b95705b8dbac238 100644 (file)
@@ -705,7 +705,6 @@ MACHINE_START(SMDK6410, "SMDK6410")
        .init_irq       = s3c6410_init_irq,
        .map_io         = smdk6410_map_io,
        .init_machine   = smdk6410_machine_init,
-       .init_late      = s3c64xx_init_late,
        .init_time      = samsung_timer_init,
        .restart        = s3c64xx_restart,
 MACHINE_END
index 6b37694fa3351fc55a66f0a5b0b4377e23ab734a..aaf7bea4032f4824a611f92710335aa717f70a33 100644 (file)
@@ -347,10 +347,3 @@ static __init int s3c64xx_pm_initcall(void)
        return 0;
 }
 arch_initcall(s3c64xx_pm_initcall);
-
-int __init s3c64xx_pm_late_initcall(void)
-{
-       pm_genpd_poweroff_unused();
-
-       return 0;
-}