sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: i.MX: iim: pass private data struct to imx_iim_fuse_blow 

To make all struct members available and to reduce the argument
count.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-05-16 09:48:06 +02:00
parent eec34f2a08
commit bb9e3842b2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-imx/iim.c
View File

@ -120,17 +120,13 @@ static ssize_t imx_iim_cdev_read(struct cdev *cdev, void *buf, size_t count,
return size; return size;
} }
static int imx_iim_fuse_blow(void __iomem *reg_base, unsigned int bank, static int imx_iim_fuse_blow(struct iim_bank *bank, unsigned int row, u8 value)
unsigned int row, u8 value)
{ {
struct iim_priv *iim = bank->iim;
void __iomem *reg_base = iim->base;
int bit, ret = 0; int bit, ret = 0;
u8 err, stat; u8 err, stat;
if (bank > 7) {
printf("%s: invalid bank number\n", __func__);
return -EINVAL;
}
if (row > 255) { if (row > 255) {
printf("%s: invalid row index\n", __func__); printf("%s: invalid row index\n", __func__);
return -EINVAL; return -EINVAL;
@ -144,7 +140,7 @@ static int imx_iim_fuse_blow(void __iomem *reg_base, unsigned int bank,
writeb(0xaa, reg_base + IIM_PREG_P); writeb(0xaa, reg_base + IIM_PREG_P);
/* upper half address register */ /* upper half address register */
writeb((bank << 3) | (row >> 5), reg_base + IIM_UA); writeb((bank->bank << 3) | (row >> 5), reg_base + IIM_UA);
for (bit = 0; bit < 8; bit++) { for (bit = 0; bit < 8; bit++) {
if (((value >> bit) & 1) == 0) if (((value >> bit) & 1) == 0)
@ -167,7 +163,7 @@ static int imx_iim_fuse_blow(void __iomem *reg_base, unsigned int bank,
err = readb(reg_base + IIM_ERR); err = readb(reg_base + IIM_ERR);
if (err) { if (err) {
printf("%s: bank %u, row %u, bit %d program error " printf("%s: bank %u, row %u, bit %d program error "
"(0x%02x)\n", __func__, bank, row, bit, "(0x%02x)\n", __func__, bank->bank, row, bit,
err); err);
ret = -EIO; ret = -EIO;
goto out; goto out;
@ -185,7 +181,6 @@ static ssize_t imx_iim_cdev_write(struct cdev *cdev, const void *buf, size_t cou
{ {
ulong size, i; ulong size, i;
struct iim_bank *bank = container_of(cdev, struct iim_bank, cdev); struct iim_bank *bank = container_of(cdev, struct iim_bank, cdev);
struct iim_priv *iim = bank->iim;
size = min((loff_t)count, 32 - offset); size = min((loff_t)count, 32 - offset);
@ -193,8 +188,7 @@ static ssize_t imx_iim_cdev_write(struct cdev *cdev, const void *buf, size_t cou
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
int ret; int ret;
ret = imx_iim_fuse_blow(iim->base, bank->bank, ret = imx_iim_fuse_blow(bank, offset + i, ((u8 *)buf)[i]);
offset + i, ((u8 *)buf)[i]);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }