diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:54 +0200 |
| commit | 45019dc10b217d249c07cd47bc342f04317d1a7d (patch) | |
| tree | ad93df21187a6ff006bd78c61e91e24b486132ba | |
| parent | 7b4e61bbf9462b38b496f8e151052c3081125aa4 (diff) | |
| parent | b744cc33d5038753dfcb43e6cd186208d0197a62 (diff) | |
| download | barebox-45019dc10b217d249c07cd47bc342f04317d1a7d.tar.gz barebox-45019dc10b217d249c07cd47bc342f04317d1a7d.tar.xz | |
Merge branch 'for-next/mxs'
| -rw-r--r-- | arch/arm/mach-mxs/ocotp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c index 2029b90acb..00758450cc 100644 --- a/arch/arm/mach-mxs/ocotp.c +++ b/arch/arm/mach-mxs/ocotp.c @@ -43,6 +43,7 @@ #define OCOTP_WORD_OFFSET 0x20 struct ocotp_priv { + struct device_d dev; struct cdev cdev; void __iomem *base; unsigned int write_enable; @@ -194,13 +195,19 @@ static int mxs_ocotp_probe(struct device_d *dev) priv->cdev.size = cpu_is_mx23() ? 128 : 160; priv->cdev.name = DRIVERNAME; + strcpy(priv->dev.name, "ocotp"); + priv->dev.parent = dev; + err = register_device(&priv->dev); + if (err) + return err; + err = devfs_create(&priv->cdev); if (err < 0) return err; if (IS_ENABLED(CONFIG_MXS_OCOTP_WRITABLE)) { mxs_ocotp_ops.write = mxs_ocotp_cdev_write; - dev_add_param_bool(dev, "permanent_write_enable", + dev_add_param_bool(&priv->dev, "permanent_write_enable", NULL, NULL, &priv->write_enable, NULL); } |