@@ -1,2 +1,2 @@
-obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_SMP) += cpu.o headsmp.o
obj-$(CONFIG_ARCH_STI) += board-dt.o
@@ -12,7 +12,7 @@
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h>
-#include "smp.h"
+#include "cpu.h"
static const char *const stih41x_dt_match[] __initconst = {
"st,stih415",
@@ -31,4 +31,5 @@ DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree")
L2C_AUX_CTRL_WAY_SIZE(4),
.l2c_aux_mask = 0xc0000fff,
.smp = smp_ops(sti_smp_ops),
+ .init_late = init_cpufreq,
MACHINE_END
similarity index 93%
rename from arch/arm/mach-sti/platsmp.c
rename to arch/arm/mach-sti/cpu.c
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-sti/platsmp.c
+ * arch/arm/mach-sti/cpu.c
*
* Copyright (C) 2013 STMicroelectronics (R&D) Limited.
* http://www.st.com
@@ -13,6 +13,7 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/delay.h>
@@ -21,13 +22,17 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/memblock.h>
+#include <linux/platform_device.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
-#include "smp.h"
+#include "cpu.h"
+/**
+ * SMP Operations
+ */
static void write_pen_release(int val)
{
pen_release = val;
@@ -161,3 +166,11 @@ struct smp_operations __initdata sti_smp_ops = {
.smp_secondary_init = sti_secondary_init,
.smp_boot_secondary = sti_boot_secondary,
};
+
+/**
+ * CPUFreq Registration
+ */
+void init_cpufreq(void)
+{
+ platform_device_register_simple("sti-cpufreq", -1, NULL, 0);
+}
similarity index 93%
rename from arch/arm/mach-sti/smp.h
rename to arch/arm/mach-sti/cpu.h
@@ -15,5 +15,6 @@
extern struct smp_operations sti_smp_ops;
void sti_secondary_startup(void);
+extern void init_cpufreq(void);
#endif
DT will not allow pseudo-devices. Only devices which represent real hardware are permitted. So we have to register the CPUFreq driver from platform code instead. Rather than create a new file, we're bundling this in with the SMP functionality and renaming it from 'smp' to the more generic 'cpu'. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/mach-sti/Makefile | 2 +- arch/arm/mach-sti/board-dt.c | 3 ++- arch/arm/mach-sti/{platsmp.c => cpu.c} | 17 +++++++++++++++-- arch/arm/mach-sti/{smp.h => cpu.h} | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) rename arch/arm/mach-sti/{platsmp.c => cpu.c} (93%) rename arch/arm/mach-sti/{smp.h => cpu.h} (93%) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/