diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-28 11:28:05 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-29 12:05:26 +0200 |
commit | fee474a22e0f6cb287f2aba5333334b71e27b942 (patch) | |
tree | a154373800c5b53a5c54c4328271afa205bdcbe7 | |
parent | ffcf536cef0fe90bb0b7340b82492ce0a54a0dc6 (diff) | |
download | barebox-fee474a22e0f6cb287f2aba5333334b71e27b942.tar.gz barebox-fee474a22e0f6cb287f2aba5333334b71e27b942.tar.xz |
ARM i.MX IIM: Add a iim read function
To allow reading the iim from code.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-imx/iim.c | 28 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/iim.h | 7 |
2 files changed, 31 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c index 0774ebba9c..80dfa9becb 100644 --- a/arch/arm/mach-imx/iim.c +++ b/arch/arm/mach-imx/iim.c @@ -22,6 +22,8 @@ #include <xfuncs.h> #include <errno.h> #include <param.h> +#include <fcntl.h> +#include <malloc.h> #include <asm/io.h> @@ -73,7 +75,7 @@ static int do_fuse_sense(unsigned long reg_base, unsigned int bank, return readb(reg_base + IIM_SDAT); } -static ssize_t imx_iim_read(struct cdev *cdev, void *buf, size_t count, +static ssize_t imx_iim_cdev_read(struct cdev *cdev, void *buf, size_t count, ulong offset, ulong flags) { ulong size, i; @@ -168,7 +170,7 @@ out: } #endif /* CONFIG_IMX_IIM_FUSE_BLOW */ -static ssize_t imx_iim_write(struct cdev *cdev, const void *buf, size_t count, +static ssize_t imx_iim_cdev_write(struct cdev *cdev, const void *buf, size_t count, ulong offset, ulong flags) { ulong size, i; @@ -204,8 +206,8 @@ static ssize_t imx_iim_write(struct cdev *cdev, const void *buf, size_t count, } static struct file_operations imx_iim_ops = { - .read = imx_iim_read, - .write = imx_iim_write, + .read = imx_iim_cdev_read, + .write = imx_iim_cdev_write, .lseek = dev_lseek_default, }; @@ -297,6 +299,24 @@ static int imx_iim_init(void) } coredevice_initcall(imx_iim_init); +int imx_iim_read(unsigned int bank, int offset, void *buf, int count) +{ + struct cdev *cdev; + char *name = asprintf(DRIVERNAME "_bank%d", bank); + int ret; + + cdev = cdev_open(name, O_RDONLY); + if (!cdev) + return -ENODEV; + + ret = cdev_read(cdev, buf, count, offset, 0); + + cdev_close(cdev); + free(name); + + return ret; +} + int imx_iim_get_mac(unsigned char *mac) { int i; diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/include/mach/iim.h index 03ff485b6d..69357f3d17 100644 --- a/arch/arm/mach-imx/include/mach/iim.h +++ b/arch/arm/mach-imx/include/mach/iim.h @@ -46,8 +46,15 @@ struct imx_iim_platform_data { }; #ifdef CONFIG_IMX_IIM +int imx_iim_read(unsigned int bank, int offset, void *buf, int count); int imx_iim_get_mac(unsigned char *mac); #else +static inline int imx_iim_read(unsigned int bank, int offset, void *buf, + int count) +{ + return -EINVAL; +} + static inline int imx_iim_get_mac(unsigned char *mac) { return -EINVAL; |