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

Commit a399dc9f authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: shmobile: Use generic platdev driver 



The cpufreq-dt-platdev driver supports creation of cpufreq-dt platform
device now, reuse that and remove similar code from platform code.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 014400c1

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o 




# PM objects

# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o

obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o

obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o

obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o

obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o

arch/arm/mach-shmobile/common.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -25,16 +25,9 @@ static inline int shmobile_suspend_init(void) { return 0; } 
static inline void shmobile_smp_apmu_suspend_init(void) { }

static inline void shmobile_smp_apmu_suspend_init(void) { }

#endif

#endif





#ifdef CONFIG_CPU_FREQ

int shmobile_cpufreq_init(void);

#else

static inline int shmobile_cpufreq_init(void) { return 0; }

#endif



static inline void __init shmobile_init_late(void)

static inline void __init shmobile_init_late(void)

{

{

	shmobile_suspend_init();

	shmobile_suspend_init();

	shmobile_cpufreq_init();

}

}





#endif /* __ARCH_MACH_COMMON_H */
 
#endif /* __ARCH_MACH_COMMON_H */

arch/arm/mach-shmobile/cpufreq.c

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
/*

 * CPUFreq support code for SH-Mobile ARM

 *

 *  Copyright (C) 2014 Gaku Inami

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#include <linux/platform_device.h>



#include "common.h"



int __init shmobile_cpufreq_init(void)

{

	platform_device_register_simple("cpufreq-dt", -1, NULL, 0);

	return 0;

}

drivers/cpufreq/cpufreq-dt-platdev.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,18 @@ static const struct of_device_id machines[] __initconst = { 
	{ .compatible = "samsung,exynos5800", },

	{ .compatible = "samsung,exynos5800", },

#endif

#endif





	{ .compatible = "renesas,emev2", },

	{ .compatible = "renesas,r7s72100", },

	{ .compatible = "renesas,r8a73a4", },

	{ .compatible = "renesas,r8a7740", },

	{ .compatible = "renesas,r8a7778", },

	{ .compatible = "renesas,r8a7779", },

	{ .compatible = "renesas,r8a7790", },

	{ .compatible = "renesas,r8a7791", },

	{ .compatible = "renesas,r8a7793", },

	{ .compatible = "renesas,r8a7794", },

	{ .compatible = "renesas,sh73a0", },



	{ .compatible = "rockchip,rk2928", },

	{ .compatible = "rockchip,rk2928", },

	{ .compatible = "rockchip,rk3036", },

	{ .compatible = "rockchip,rk3036", },

	{ .compatible = "rockchip,rk3066a", },

	{ .compatible = "rockchip,rk3066a", },