Add 'cpu-rev' property for cpus node to support getting cpu revision
from dts, since it's not good to get cpu revision using powerpc specific
function(like SVR_REV()) in common drivers.
Signed-off-by: Yangbo Lu <yangbo.lu@xxxxxxxxxxxxx>
---
arch/powerpc/platforms/85xx/common.c | 34 +++++++++++++++++++++++++++
arch/powerpc/platforms/85xx/corenet_generic.c | 3 +++
arch/powerpc/platforms/85xx/mpc85xx.h | 1 +
3 files changed, 38 insertions(+)
diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c
index 7bfb9b1..5c55c0a4 100644
--- a/arch/powerpc/platforms/85xx/common.c
+++ b/arch/powerpc/platforms/85xx/common.c
@@ -8,8 +8,10 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
+#include <linux/slab.h>
#include <asm/qe.h>
+#include <asm/mpc85xx.h>
#include <sysdev/cpm2_pic.h>
#include "mpc85xx.h"
@@ -44,8 +46,40 @@ static const struct of_device_id mpc85xx_common_ids[] __initconst = {
{},
};
+/* Add 'cpu-rev' property into cpus node of device tree */
+int of_add_cpu_rev_property(void)
+{
+ struct device_node *cpus;
+ struct property *cpu_rev;
+ u8 *revision;
+ u32 svr;
+
+ svr = mfspr(SPRN_SVR);
+
+ revision = kzalloc(sizeof(*revision), GFP_KERNEL);
+ if (!revision)
+ return 0;
+ *revision = SVR_REV(svr);
+
+ cpu_rev = kzalloc(sizeof(*cpu_rev), GFP_KERNEL);
+ if (!cpu_rev)
+ return 0;
+ cpu_rev->name = "cpu-rev";
+ cpu_rev->value = revision;
+ cpu_rev->length = sizeof(*revision);
+
+ cpus = of_find_node_by_path("/cpus");
+ if (of_add_property(cpus, cpu_rev))
+ return 0;
+
+ return 1;
+}
+
int __init mpc85xx_common_publish_devices(void)
{
+ if (!of_add_cpu_rev_property())
+ pr_info("Add 'cpu-rev' property into cpus node: failed!\n");
+
return of_platform_bus_probe(NULL, mpc85xx_common_ids, NULL);
}
#ifdef CONFIG_CPM2
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index bd839dc..880940f 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -132,6 +132,9 @@ static const struct of_device_id of_device_ids[] = {
int __init corenet_gen_publish_devices(void)
{
+ if (!of_add_cpu_rev_property())
+ pr_info("Add 'cpu-rev' property into cpus node: failed!\n");
+
return of_platform_bus_probe(NULL, of_device_ids, NULL);
}
diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h
index 39056f6..bcc18e2 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx.h
+++ b/arch/powerpc/platforms/85xx/mpc85xx.h
@@ -1,5 +1,6 @@
#ifndef MPC85xx_H
#define MPC85xx_H
+extern int of_add_cpu_rev_property(void);
extern int mpc85xx_common_publish_devices(void);
#ifdef CONFIG_CPM2
--
2.1.0.27.g96db324
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
