diff mbox

[v4,2/2] soc: Add driver for Freescale Vybrid Platform

Message ID 7df753efff77a96da285f0571f1316512787e83c.1432637313.git.maitysanchayan@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sanchayan May 26, 2015, 11:36 a.m. UTC
This adds a SoC driver to be used by the Freescale Vybrid SoC's.
We create the "fsl" directory for holding the different Freescale
designs. Driver utilises syscon to get the various register values
needed. After this sysfs exposes some SoC specific properties as
below:

> cd /sys/devices/soc0
> ls
family     machine    power      revision   soc_id     subsystem  uevent
> cat family
Freescale Vybrid VF610
> cat machine
Freescale Vybrid
> cat revision
00000013
> cat soc_id
df6472a60c1c39d4

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 drivers/soc/Kconfig         |   1 +
 drivers/soc/Makefile        |   1 +
 drivers/soc/fsl/Kconfig     |   9 +++
 drivers/soc/fsl/Makefile    |   1 +
 drivers/soc/fsl/soc-vf610.c | 168 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 180 insertions(+)
 create mode 100644 drivers/soc/fsl/Kconfig
 create mode 100644 drivers/soc/fsl/Makefile
 create mode 100644 drivers/soc/fsl/soc-vf610.c

Comments

Paul Bolle May 27, 2015, 7:31 a.m. UTC | #1
On Tue, 2015-05-26 at 17:06 +0530, Sanchayan Maity wrote:
> --- /dev/null
> +++ b/drivers/soc/fsl/Kconfig

> +config SOC_VF610
> +	   bool "SoC bus device for the Freescale Vybrid platform"
> +	   select SOC_BUS
> +	   help
> +	     Include support for the SoC bus on the Freescale Vybrid platform
> +	     providing some sysfs information about the module variant.
> \ No newline at end of file

(That review comment is courtesy of git.)

> --- /dev/null
> +++ b/drivers/soc/fsl/Makefile

> +obj-$(CONFIG_SOC_VF610)		+= soc-vf610.o

> --- /dev/null
> +++ b/drivers/soc/fsl/soc-vf610.c

> +MODULE_DEVICE_TABLE(of, vf610_soc_bus_match);

> +module_platform_driver(vf610_soc_driver);

(The series starting at https://lkml.org/lkml/2015/5/10/131 would allow
to use builtin_platform_driver() for built-in only code.)

> +MODULE_DESCRIPTION("Freescale VF610 SoC bus driver");
> +MODULE_LICENSE("GPL v2");

I think soc-vf610.o can only be built-in. But its code contains a few
module specific macros. Was it perhaps intended for SOC_VF610 to be
tristate?


Paul Bolle
Sanchayan May 27, 2015, 1:07 p.m. UTC | #2
Hello,

On 15-05-27 09:31:50, Paul Bolle wrote:
> On Tue, 2015-05-26 at 17:06 +0530, Sanchayan Maity wrote:
> > --- /dev/null
> > +++ b/drivers/soc/fsl/Kconfig
> 
> > +config SOC_VF610
> > +	   bool "SoC bus device for the Freescale Vybrid platform"
> > +	   select SOC_BUS
> > +	   help
> > +	     Include support for the SoC bus on the Freescale Vybrid platform
> > +	     providing some sysfs information about the module variant.
> > \ No newline at end of file
> 
> (That review comment is courtesy of git.)

Will fix it.

> 
> > --- /dev/null
> > +++ b/drivers/soc/fsl/Makefile
> 
> > +obj-$(CONFIG_SOC_VF610)		+= soc-vf610.o
> 
> > --- /dev/null
> > +++ b/drivers/soc/fsl/soc-vf610.c
> 
> > +MODULE_DEVICE_TABLE(of, vf610_soc_bus_match);
> 
> > +module_platform_driver(vf610_soc_driver);
> 
> (The series starting at https://lkml.org/lkml/2015/5/10/131 would allow
> to use builtin_platform_driver() for built-in only code.)

Thanks for bringing this to my attention. I am subscribed to the mailing
list however this skipped me.

> 
> > +MODULE_DESCRIPTION("Freescale VF610 SoC bus driver");
> > +MODULE_LICENSE("GPL v2");
> 
> I think soc-vf610.o can only be built-in. But its code contains a few
> module specific macros. Was it perhaps intended for SOC_VF610 to be
> tristate?

I too think that should be built-in. Did not have an intention of making
it tristate, however while using other drivers as references, the perhaps
unneccessary stuff crept in.

The MODULE_* references can be removed along with the corresponding header
file. However that series has not been merged yet, so I can't use builtin_*
yet?

@Arnd

Are you ok with the patch in general? I can take care of the above changes
and send a new version. And once the builtin_driver stuff gets merged, I
can send a minor patch to change this module one to builtin?

Regards,
Sanchayan.
Paul Bolle May 27, 2015, 4:46 p.m. UTC | #3
On Wed, 2015-05-27 at 18:37 +0530, maitysanchayan@gmail.com wrote:
> > > +module_platform_driver(vf610_soc_driver);
> > 
> > (The series starting at https://lkml.org/lkml/2015/5/10/131 would allow
> > to use builtin_platform_driver() for built-in only code.)
> 
> Thanks for bringing this to my attention. I am subscribed to the mailing
> list however this skipped me.

> However that series has not been merged yet, so I can't use builtin_*
> yet?

Correct.

If that series get merged, which is not certain at all, you might
consider changing this. Probably no one will notice if you don't.


Paul Bolle
Andreas Färber May 27, 2015, 5:28 p.m. UTC | #4
Hi,

Am 27.05.2015 um 15:07 schrieb maitysanchayan@gmail.com:
> On 15-05-27 09:31:50, Paul Bolle wrote:
>> On Tue, 2015-05-26 at 17:06 +0530, Sanchayan Maity wrote:
>>> --- /dev/null
>>> +++ b/drivers/soc/fsl/Kconfig
>>
>>> +config SOC_VF610
>>> +	   bool "SoC bus device for the Freescale Vybrid platform"
>>> +	   select SOC_BUS
>>> +	   help
>>> +	     Include support for the SoC bus on the Freescale Vybrid platform
>>> +	     providing some sysfs information about the module variant.
>>> \ No newline at end of file
[...]
>>> --- /dev/null
>>> +++ b/drivers/soc/fsl/Makefile
>>
>>> +obj-$(CONFIG_SOC_VF610)		+= soc-vf610.o
>>
>>> --- /dev/null
>>> +++ b/drivers/soc/fsl/soc-vf610.c
>>
>>> +MODULE_DEVICE_TABLE(of, vf610_soc_bus_match);
>>
>>> +module_platform_driver(vf610_soc_driver);
>>
>> (The series starting at https://lkml.org/lkml/2015/5/10/131 would allow
>> to use builtin_platform_driver() for built-in only code.)
[...]
>>> +MODULE_DESCRIPTION("Freescale VF610 SoC bus driver");
>>> +MODULE_LICENSE("GPL v2");
>>
>> I think soc-vf610.o can only be built-in. But its code contains a few
>> module specific macros. Was it perhaps intended for SOC_VF610 to be
>> tristate?
> 
> I too think that should be built-in.

Why? For a generic distro kernel it'd be unfortunate to not allow
putting such a driver into an initrd, if needed early, or into the
rootfs otherwise.

Regards,
Andreas

> Did not have an intention of making
> it tristate, however while using other drivers as references, the perhaps
> unneccessary stuff crept in.
> 
> The MODULE_* references can be removed along with the corresponding header
> file. However that series has not been merged yet, so I can't use builtin_*
> yet?
[snip]
Joachim Eastwood May 27, 2015, 5:47 p.m. UTC | #5
On 26 May 2015 at 13:36, Sanchayan Maity <maitysanchayan@gmail.com> wrote:
> This adds a SoC driver to be used by the Freescale Vybrid SoC's.
> We create the "fsl" directory for holding the different Freescale
> designs. Driver utilises syscon to get the various register values
> needed. After this sysfs exposes some SoC specific properties as
> below:
>
>> cd /sys/devices/soc0
>> ls
> family     machine    power      revision   soc_id     subsystem  uevent
>> cat family
> Freescale Vybrid VF610
>> cat machine
> Freescale Vybrid
>> cat revision
> 00000013
>> cat soc_id
> df6472a60c1c39d4
>
> Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
> ---
[...]
> +static struct soc_device_attribute *soc_dev_attr;
> +static struct soc_device *soc_dev;

Now that this is a proper platform device consider putting these in a
struct and allocated it in probe to get rid of the global variables.

> +static int vf610_soc_probe(struct platform_device *pdev)
> +{
> +       struct regmap *ocotp_regmap, *mscm_regmap, *rom_regmap;
> +       struct device *dev = &pdev->dev;
> +       struct device_node *node = pdev->dev.of_node;
[...]
> +       soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
> +       if (!soc_dev_attr)
> +               return -ENOMEM;
> +
> +       soc_dev_attr->machine = kasprintf(GFP_KERNEL, "Freescale Vybrid");
> +       soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%016llx", soc_id);
> +       soc_dev_attr->family = kasprintf(GFP_KERNEL, "Freescale Vybrid VF%s",
> +                                                                soc_type);
> +       soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%08x", rom_rev);
> +
> +       soc_dev = soc_device_register(soc_dev_attr);
> +       if (IS_ERR(soc_dev)) {
> +               kfree(soc_dev_attr->revision);
> +               kfree(soc_dev_attr->family);
> +               kfree(soc_dev_attr->soc_id);
> +               kfree(soc_dev_attr->machine);
> +               kfree(soc_dev_attr);

Since you now have a device pointer you can now uses all the devm_*
functions to allocate your memory.
There is also a devm_kasprintf function.

> +               return -ENODEV;
> +       }
> +
> +       return 0;
> +}
> +
> +static int vf610_soc_remove(struct platform_device *pdev)
> +{
> +       if (soc_dev_attr) {
> +               kfree(soc_dev_attr->revision);
> +               kfree(soc_dev_attr->family);
> +               kfree(soc_dev_attr->soc_id);
> +               kfree(soc_dev_attr->machine);
> +               kfree(soc_dev_attr);

With devm_* you can remove this stuff.

> +       }
> +
> +       if (soc_dev)
> +               soc_device_unregister(soc_dev);
> +
> +       return 0;
> +}


regards,
Joachim Eastwood
Stefan Agner May 27, 2015, 9:42 p.m. UTC | #6
On 2015-05-26 13:36, Sanchayan Maity wrote:
> This adds a SoC driver to be used by the Freescale Vybrid SoC's.
> We create the "fsl" directory for holding the different Freescale
> designs. Driver utilises syscon to get the various register values
> needed. After this sysfs exposes some SoC specific properties as
> below:
> 
>> cd /sys/devices/soc0
>> ls
> family     machine    power      revision   soc_id     subsystem  uevent
>> cat family
> Freescale Vybrid VF610
>> cat machine
> Freescale Vybrid
>> cat revision
> 00000013
>> cat soc_id
> df6472a60c1c39d4
> 
> Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
> ---
>  drivers/soc/Kconfig         |   1 +
>  drivers/soc/Makefile        |   1 +
>  drivers/soc/fsl/Kconfig     |   9 +++
>  drivers/soc/fsl/Makefile    |   1 +
>  drivers/soc/fsl/soc-vf610.c | 168 ++++++++++++++++++++++++++++++++++++++++++++
>  5 files changed, 180 insertions(+)
>  create mode 100644 drivers/soc/fsl/Kconfig
>  create mode 100644 drivers/soc/fsl/Makefile
>  create mode 100644 drivers/soc/fsl/soc-vf610.c
> 
> diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
> index d8bde82..8b4dd2b 100644
> --- a/drivers/soc/Kconfig
> +++ b/drivers/soc/Kconfig
> @@ -1,5 +1,6 @@
>  menu "SOC (System On Chip) specific Drivers"
>  
> +source "drivers/soc/fsl/Kconfig"
>  source "drivers/soc/mediatek/Kconfig"
>  source "drivers/soc/qcom/Kconfig"
>  source "drivers/soc/ti/Kconfig"
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index 70042b2..142676e 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -2,6 +2,7 @@
>  # Makefile for the Linux Kernel SOC specific device drivers.
>  #
>  
> +obj-$(CONFIG_SOC_VF610)         += fsl/
>  obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
>  obj-$(CONFIG_ARCH_QCOM)		+= qcom/
>  obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
> diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
> new file mode 100644
> index 0000000..d0ac671
> --- /dev/null
> +++ b/drivers/soc/fsl/Kconfig
> @@ -0,0 +1,9 @@
> +#
> +# Freescale SoC drivers
> +
> +config SOC_VF610
> +	   bool "SoC bus device for the Freescale Vybrid platform"
> +	   select SOC_BUS
> +	   help
> +	     Include support for the SoC bus on the Freescale Vybrid platform
> +	     providing some sysfs information about the module variant.
> \ No newline at end of file
> diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
> new file mode 100644
> index 0000000..5fccbba
> --- /dev/null
> +++ b/drivers/soc/fsl/Makefile
> @@ -0,0 +1 @@
> +obj-$(CONFIG_SOC_VF610)		+= soc-vf610.o
> diff --git a/drivers/soc/fsl/soc-vf610.c b/drivers/soc/fsl/soc-vf610.c
> new file mode 100644
> index 0000000..6425cfb
> --- /dev/null
> +++ b/drivers/soc/fsl/soc-vf610.c
> @@ -0,0 +1,168 @@
> +/*
> + * Copyright 2015 Toradex AG
> + *
> + * Author: Sanchayan Maity <sanchayan.maity@toradex.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2, as
> + * published by the Free Software Foundation.
> + *
> + */
> +
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/regmap.h>
> +#include <linux/random.h>
> +#include <linux/slab.h>
> +#include <linux/sys_soc.h>
> +
> +#define DRIVER_NAME "vf610-soc-bus"
> +
> +#define MSCM_CPxCOUNT_OFFSET   0x0000002C
> +#define MSCM_CPxCFG1_OFFSET    0x00000014
> +
> +static struct soc_device_attribute *soc_dev_attr;
> +static struct soc_device *soc_dev;
> +
> +static int vf610_soc_probe(struct platform_device *pdev)
> +{
> +	struct regmap *ocotp_regmap, *mscm_regmap, *rom_regmap;
> +	struct device *dev = &pdev->dev;
> +	struct device_node *node = pdev->dev.of_node;
> +	struct device_node *soc_node;
> +	struct of_phandle_args pargs;
> +	char soc_type[] = "xx0";
> +	u32 cfg0_offset, cfg1_offset, rom_rev_offset;
> +	u32 soc_id1, soc_id2, rom_rev;
> +	u32 cpxcount, cpxcfg1;
> +	u64 soc_id;
> +	int ret;
> +
> +	mscm_regmap = syscon_node_to_regmap(node);
> +	if (IS_ERR(mscm_regmap)) {
> +		dev_err(dev, "regmap lookup for mscm failed\n");
> +		return PTR_ERR(mscm_regmap);
> +	}
> +
> +	soc_node = of_find_node_by_path("/soc");
> +
> +	ret = of_parse_phandle_with_fixed_args(soc_node,
> +					"ocotp-cfg", 2, 0, &pargs);
> +	if (ret) {
> +		dev_err(dev, "lookup failed for ocotp-cfg node %d\n", ret);
> +		return ret;
> +	}
> +
> +	ocotp_regmap = syscon_node_to_regmap(pargs.np);
> +	if (IS_ERR(ocotp_regmap)) {
> +		of_node_put(pargs.np);
> +		dev_err(dev, "regmap lookup for ocotp failed\n");
> +		return PTR_ERR(ocotp_regmap);
> +	}
> +
> +	cfg0_offset = pargs.args[0];
> +	cfg1_offset = pargs.args[1];
> +	of_node_put(pargs.np);
> +
> +	ret = of_parse_phandle_with_fixed_args(soc_node,
> +					"rom-revision", 1, 0, &pargs);
> +	if (ret) {
> +		dev_err(dev, "lookup failed for rom-revision node %d\n", ret);
> +		return ret;
> +	}
> +
> +	rom_regmap = syscon_node_to_regmap(pargs.np);
> +	if (IS_ERR(rom_regmap)) {
> +		of_node_put(pargs.np);
> +		dev_err(dev, "regmap lookup for ocrom failed\n");
> +		return PTR_ERR(rom_regmap);
> +	}
> +
> +	rom_rev_offset = pargs.args[0];
> +	of_node_put(pargs.np);
> +
> +	ret = regmap_read(ocotp_regmap, cfg0_offset, &soc_id1);
> +	if (ret)
> +		return -ENODEV;
> +
> +	ret = regmap_read(ocotp_regmap, cfg1_offset, &soc_id2);
> +	if (ret)
> +		return -ENODEV;
> +
> +	soc_id = (u64) soc_id1 << 32 | soc_id2;
> +	add_device_randomness(&soc_id, sizeof(soc_id));
> +
> +	ret = regmap_read(mscm_regmap, MSCM_CPxCOUNT_OFFSET, &cpxcount);
> +	if (ret)
> +		return -ENODEV;
> +
> +	ret = regmap_read(mscm_regmap, MSCM_CPxCFG1_OFFSET, &cpxcfg1);
> +	if (ret)
> +		return -ENODEV;
> +
> +	soc_type[0] = cpxcount ? '6' : '5'; /* Dual Core => VF6x0 */
> +	soc_type[1] = cpxcfg1 ? '1' : '0'; /* L2 Cache => VFx10 */
> +
> +	ret = regmap_read(rom_regmap, rom_rev_offset, &rom_rev);
> +	if (ret)
> +		return -ENODEV;
> +
> +	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
> +	if (!soc_dev_attr)
> +		return -ENOMEM;
> +
> +	soc_dev_attr->machine = kasprintf(GFP_KERNEL, "Freescale Vybrid");
> +	soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%016llx", soc_id);
> +	soc_dev_attr->family = kasprintf(GFP_KERNEL, "Freescale Vybrid VF%s",
> +								 soc_type);
> +	soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%08x", rom_rev);
> +
> +	soc_dev = soc_device_register(soc_dev_attr);
> +	if (IS_ERR(soc_dev)) {
> +		kfree(soc_dev_attr->revision);
> +		kfree(soc_dev_attr->family);
> +		kfree(soc_dev_attr->soc_id);
> +		kfree(soc_dev_attr->machine);
> +		kfree(soc_dev_attr);
> +		return -ENODEV;
> +	}
> +
> +	return 0;
> +}
> +
> +static int vf610_soc_remove(struct platform_device *pdev)
> +{
> +	if (soc_dev_attr) {
> +		kfree(soc_dev_attr->revision);
> +		kfree(soc_dev_attr->family);
> +		kfree(soc_dev_attr->soc_id);
> +		kfree(soc_dev_attr->machine);
> +		kfree(soc_dev_attr);
> +	}
> +
> +	if (soc_dev)
> +		soc_device_unregister(soc_dev);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id vf610_soc_bus_match[] = {
> +	{ .compatible = "fsl,vf610-mscm-cpucfg", },

IMHO that is a mix and match now. We still bind this driver to a
specific device, while we point directly to the registers from the SoC
level (in the device tree).

I'm not sure if the suggestion I made in v2 is acceptable: Couldn't we
add compatible nodes to the SoC level and bind this driver to the SoC
directly? I think if we point to the registers at SoC level, we should
also bind this driver to the SoC level. Of course, then we additionally
need to point to the mscm-cpucfg register to get the SoC type
information.

If we keep this driver bound to "fsl,vf610-mscm-cpucfg", then I think we
should also point from this node to the other nodes/registers...

Arnd, where did you meant to put the pointers?

--
Stefan
diff mbox

Patch

diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index d8bde82..8b4dd2b 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -1,5 +1,6 @@ 
 menu "SOC (System On Chip) specific Drivers"
 
+source "drivers/soc/fsl/Kconfig"
 source "drivers/soc/mediatek/Kconfig"
 source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/ti/Kconfig"
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 70042b2..142676e 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -2,6 +2,7 @@ 
 # Makefile for the Linux Kernel SOC specific device drivers.
 #
 
+obj-$(CONFIG_SOC_VF610)         += fsl/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
new file mode 100644
index 0000000..d0ac671
--- /dev/null
+++ b/drivers/soc/fsl/Kconfig
@@ -0,0 +1,9 @@ 
+#
+# Freescale SoC drivers
+
+config SOC_VF610
+	   bool "SoC bus device for the Freescale Vybrid platform"
+	   select SOC_BUS
+	   help
+	     Include support for the SoC bus on the Freescale Vybrid platform
+	     providing some sysfs information about the module variant.
\ No newline at end of file
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
new file mode 100644
index 0000000..5fccbba
--- /dev/null
+++ b/drivers/soc/fsl/Makefile
@@ -0,0 +1 @@ 
+obj-$(CONFIG_SOC_VF610)		+= soc-vf610.o
diff --git a/drivers/soc/fsl/soc-vf610.c b/drivers/soc/fsl/soc-vf610.c
new file mode 100644
index 0000000..6425cfb
--- /dev/null
+++ b/drivers/soc/fsl/soc-vf610.c
@@ -0,0 +1,168 @@ 
+/*
+ * Copyright 2015 Toradex AG
+ *
+ * Author: Sanchayan Maity <sanchayan.maity@toradex.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/regmap.h>
+#include <linux/random.h>
+#include <linux/slab.h>
+#include <linux/sys_soc.h>
+
+#define DRIVER_NAME "vf610-soc-bus"
+
+#define MSCM_CPxCOUNT_OFFSET   0x0000002C
+#define MSCM_CPxCFG1_OFFSET    0x00000014
+
+static struct soc_device_attribute *soc_dev_attr;
+static struct soc_device *soc_dev;
+
+static int vf610_soc_probe(struct platform_device *pdev)
+{
+	struct regmap *ocotp_regmap, *mscm_regmap, *rom_regmap;
+	struct device *dev = &pdev->dev;
+	struct device_node *node = pdev->dev.of_node;
+	struct device_node *soc_node;
+	struct of_phandle_args pargs;
+	char soc_type[] = "xx0";
+	u32 cfg0_offset, cfg1_offset, rom_rev_offset;
+	u32 soc_id1, soc_id2, rom_rev;
+	u32 cpxcount, cpxcfg1;
+	u64 soc_id;
+	int ret;
+
+	mscm_regmap = syscon_node_to_regmap(node);
+	if (IS_ERR(mscm_regmap)) {
+		dev_err(dev, "regmap lookup for mscm failed\n");
+		return PTR_ERR(mscm_regmap);
+	}
+
+	soc_node = of_find_node_by_path("/soc");
+
+	ret = of_parse_phandle_with_fixed_args(soc_node,
+					"ocotp-cfg", 2, 0, &pargs);
+	if (ret) {
+		dev_err(dev, "lookup failed for ocotp-cfg node %d\n", ret);
+		return ret;
+	}
+
+	ocotp_regmap = syscon_node_to_regmap(pargs.np);
+	if (IS_ERR(ocotp_regmap)) {
+		of_node_put(pargs.np);
+		dev_err(dev, "regmap lookup for ocotp failed\n");
+		return PTR_ERR(ocotp_regmap);
+	}
+
+	cfg0_offset = pargs.args[0];
+	cfg1_offset = pargs.args[1];
+	of_node_put(pargs.np);
+
+	ret = of_parse_phandle_with_fixed_args(soc_node,
+					"rom-revision", 1, 0, &pargs);
+	if (ret) {
+		dev_err(dev, "lookup failed for rom-revision node %d\n", ret);
+		return ret;
+	}
+
+	rom_regmap = syscon_node_to_regmap(pargs.np);
+	if (IS_ERR(rom_regmap)) {
+		of_node_put(pargs.np);
+		dev_err(dev, "regmap lookup for ocrom failed\n");
+		return PTR_ERR(rom_regmap);
+	}
+
+	rom_rev_offset = pargs.args[0];
+	of_node_put(pargs.np);
+
+	ret = regmap_read(ocotp_regmap, cfg0_offset, &soc_id1);
+	if (ret)
+		return -ENODEV;
+
+	ret = regmap_read(ocotp_regmap, cfg1_offset, &soc_id2);
+	if (ret)
+		return -ENODEV;
+
+	soc_id = (u64) soc_id1 << 32 | soc_id2;
+	add_device_randomness(&soc_id, sizeof(soc_id));
+
+	ret = regmap_read(mscm_regmap, MSCM_CPxCOUNT_OFFSET, &cpxcount);
+	if (ret)
+		return -ENODEV;
+
+	ret = regmap_read(mscm_regmap, MSCM_CPxCFG1_OFFSET, &cpxcfg1);
+	if (ret)
+		return -ENODEV;
+
+	soc_type[0] = cpxcount ? '6' : '5'; /* Dual Core => VF6x0 */
+	soc_type[1] = cpxcfg1 ? '1' : '0'; /* L2 Cache => VFx10 */
+
+	ret = regmap_read(rom_regmap, rom_rev_offset, &rom_rev);
+	if (ret)
+		return -ENODEV;
+
+	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+	if (!soc_dev_attr)
+		return -ENOMEM;
+
+	soc_dev_attr->machine = kasprintf(GFP_KERNEL, "Freescale Vybrid");
+	soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%016llx", soc_id);
+	soc_dev_attr->family = kasprintf(GFP_KERNEL, "Freescale Vybrid VF%s",
+								 soc_type);
+	soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%08x", rom_rev);
+
+	soc_dev = soc_device_register(soc_dev_attr);
+	if (IS_ERR(soc_dev)) {
+		kfree(soc_dev_attr->revision);
+		kfree(soc_dev_attr->family);
+		kfree(soc_dev_attr->soc_id);
+		kfree(soc_dev_attr->machine);
+		kfree(soc_dev_attr);
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static int vf610_soc_remove(struct platform_device *pdev)
+{
+	if (soc_dev_attr) {
+		kfree(soc_dev_attr->revision);
+		kfree(soc_dev_attr->family);
+		kfree(soc_dev_attr->soc_id);
+		kfree(soc_dev_attr->machine);
+		kfree(soc_dev_attr);
+	}
+
+	if (soc_dev)
+		soc_device_unregister(soc_dev);
+
+	return 0;
+}
+
+static const struct of_device_id vf610_soc_bus_match[] = {
+	{ .compatible = "fsl,vf610-mscm-cpucfg", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, vf610_soc_bus_match);
+
+static struct platform_driver vf610_soc_driver = {
+	.probe          = vf610_soc_probe,
+	.remove         = vf610_soc_remove,
+	.driver         = {
+		.name   = DRIVER_NAME,
+		.of_match_table = vf610_soc_bus_match,
+	},
+};
+
+module_platform_driver(vf610_soc_driver);
+
+MODULE_DESCRIPTION("Freescale VF610 SoC bus driver");
+MODULE_LICENSE("GPL v2");