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

ARM: i.MX: iim: introduce private data struct 

Instead of duplicating data shared between the banks in a bank
specific struct, use a iim struct and a bank struct.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-05-16 09:36:53 +02:00
parent 579dce92c8
commit c50bdcf71e
1 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,16 +30,25 @@
#include <mach/iim.h> #include <mach/iim.h>
#define DRIVERNAME "imx_iim" #define DRIVERNAME "imx_iim"
#define IIM_NUM_BANKS 8
static int iim_write_enable; static int iim_write_enable;
static int iim_sense_enable; static int iim_sense_enable;
struct iim_priv;
struct iim_bank {
struct cdev cdev;
void __iomem *bankbase;
int bank;
struct iim_priv *iim;
};
struct iim_priv { struct iim_priv {
struct cdev cdev; struct cdev cdev;
void __iomem *base; void __iomem *base;
void __iomem *bankbase; void __iomem *bankbase;
int bank; struct iim_bank *bank[IIM_NUM_BANKS];
int banksize;
}; };
static int do_fuse_sense(void __iomem *reg_base, unsigned int bank, static int do_fuse_sense(void __iomem *reg_base, unsigned int bank,
@ -88,22 +97,23 @@ static ssize_t imx_iim_cdev_read(struct cdev *cdev, void *buf, size_t count,
loff_t offset, ulong flags) loff_t offset, ulong flags)
{ {
ulong size, i; ulong size, i;
struct iim_priv *priv = cdev->priv; struct iim_bank *bank = container_of(cdev, struct iim_bank, cdev);
struct iim_priv *iim = bank->iim;
size = min((loff_t)count, priv->banksize - offset); size = min((loff_t)count, 32 - offset);
if (iim_sense_enable) { if (iim_sense_enable) {
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
int row_val; int row_val;
row_val = do_fuse_sense(priv->base, row_val = do_fuse_sense(iim->base,
priv->bank, offset + i); bank->bank, offset + i);
if (row_val < 0) if (row_val < 0)
return row_val; return row_val;
((u8 *)buf)[i] = (u8)row_val; ((u8 *)buf)[i] = (u8)row_val;
} }
} else { } else {
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
((u8 *)buf)[i] = ((u8 *)priv->bankbase)[(offset+i)*4]; ((u8 *)buf)[i] = ((u8 *)bank->bankbase)[(offset+i)*4];
} }
return size; return size;
@ -173,22 +183,23 @@ static ssize_t imx_iim_cdev_write(struct cdev *cdev, const void *buf, size_t cou
loff_t offset, ulong flags) loff_t offset, ulong flags)
{ {
ulong size, i; ulong size, i;
struct iim_priv *priv = cdev->priv; struct iim_bank *bank = container_of(cdev, struct iim_bank, cdev);
struct iim_priv *iim = bank->iim;
size = min((loff_t)count, priv->banksize - offset); size = min((loff_t)count, 32 - offset);
if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW) && iim_write_enable) { if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW) && iim_write_enable) {
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
int ret; int ret;
ret = do_fuse_blow(priv->base, priv->bank, ret = do_fuse_blow(iim->base, bank->bank,
offset + i, ((u8 *)buf)[i]); offset + i, ((u8 *)buf)[i]);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
} else { } else {
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
((u8 *)priv->bankbase)[(offset+i)*4] = ((u8 *)buf)[i]; ((u8 *)bank->bankbase)[(offset+i)*4] = ((u8 *)buf)[i];
} }
return size; return size;
@ -200,26 +211,25 @@ static struct file_operations imx_iim_ops = {
.lseek = dev_lseek_default, .lseek = dev_lseek_default,
}; };
static int imx_iim_add_bank(struct device_d *dev, void __iomem *base, int num) static int imx_iim_add_bank(struct iim_priv *iim, int num)
{ {
struct iim_priv *priv; struct iim_bank *bank;
struct cdev *cdev; struct cdev *cdev;
priv = xzalloc(sizeof (*priv)); bank = xzalloc(sizeof (*bank));
priv->base = base; bank->bankbase = iim->base + 0x800 + 0x400 * num;
priv->bankbase = priv->base + 0x800 + 0x400 * num; bank->bank = num;
priv->bank = num; bank->iim = iim;
priv->banksize = 32; cdev = &bank->cdev;
cdev = &priv->cdev;
cdev->dev = dev;
cdev->ops = &imx_iim_ops; cdev->ops = &imx_iim_ops;
cdev->priv = priv;
cdev->size = 32; cdev->size = 32;
cdev->name = asprintf(DRIVERNAME "_bank%d", num); cdev->name = asprintf(DRIVERNAME "_bank%d", num);
if (cdev->name == NULL) if (cdev->name == NULL)
return -ENOMEM; return -ENOMEM;
iim->bank[num] = bank;
return devfs_create(cdev); return devfs_create(cdev);
} }
@ -231,7 +241,7 @@ static int imx_iim_add_bank(struct device_d *dev, void __iomem *base, int num)
*/ */
#define MAC_ADDRESS_PROPLEN (3 * sizeof(__be32)) #define MAC_ADDRESS_PROPLEN (3 * sizeof(__be32))
static void imx_iim_init_dt(struct device_d *dev) static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim)
{ {
char mac[6]; char mac[6];
const __be32 *prop; const __be32 *prop;
@ -266,25 +276,29 @@ static void imx_iim_init_dt(struct device_d *dev)
} }
} }
#else #else
static inline void imx_iim_init_dt(struct device_d *dev) static inline void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim)
{ {
} }
#endif #endif
static int imx_iim_probe(struct device_d *dev) static int imx_iim_probe(struct device_d *dev)
{ {
int i; struct iim_priv *iim;
void __iomem *base; int i, ret;
base = dev_request_mem_region(dev, 0); iim = xzalloc(sizeof(*iim));
if (!base)
iim->base = dev_request_mem_region(dev, 0);
if (!iim->base)
return -EBUSY; return -EBUSY;
for (i = 0; i < 8; i++) { for (i = 0; i < IIM_NUM_BANKS; i++) {
imx_iim_add_bank(dev, base, i); ret = imx_iim_add_bank(iim, i);
if (ret)
return ret;
} }
imx_iim_init_dt(dev); imx_iim_init_dt(dev, iim);
if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW)) if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW))
dev_add_param_bool(dev, "permanent_write_enable", dev_add_param_bool(dev, "permanent_write_enable",