|
@@ -30,7 +30,8 @@ struct b53_mmap_priv {
|
|
|
|
|
|
static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
*val = readb(regs + (page << 8) + reg);
|
|
|
|
|
@@ -39,7 +40,8 @@ static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)
|
|
|
|
|
|
static int b53_mmap_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
if (WARN_ON(reg % 2))
|
|
|
return -EINVAL;
|
|
@@ -54,7 +56,8 @@ static int b53_mmap_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)
|
|
|
|
|
|
static int b53_mmap_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
if (WARN_ON(reg % 4))
|
|
|
return -EINVAL;
|
|
@@ -69,7 +72,8 @@ static int b53_mmap_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)
|
|
|
|
|
|
static int b53_mmap_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
if (WARN_ON(reg % 2))
|
|
|
return -EINVAL;
|
|
@@ -107,7 +111,8 @@ static int b53_mmap_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)
|
|
|
|
|
|
static int b53_mmap_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
u32 hi, lo;
|
|
|
|
|
|
if (WARN_ON(reg % 4))
|
|
@@ -128,7 +133,8 @@ static int b53_mmap_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)
|
|
|
|
|
|
static int b53_mmap_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
writeb(value, regs + (page << 8) + reg);
|
|
|
|
|
@@ -138,7 +144,8 @@ static int b53_mmap_write8(struct b53_device *dev, u8 page, u8 reg, u8 value)
|
|
|
static int b53_mmap_write16(struct b53_device *dev, u8 page, u8 reg,
|
|
|
u16 value)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
if (WARN_ON(reg % 2))
|
|
|
return -EINVAL;
|
|
@@ -154,7 +161,8 @@ static int b53_mmap_write16(struct b53_device *dev, u8 page, u8 reg,
|
|
|
static int b53_mmap_write32(struct b53_device *dev, u8 page, u8 reg,
|
|
|
u32 value)
|
|
|
{
|
|
|
- u8 __iomem *regs = dev->priv;
|
|
|
+ struct b53_mmap_priv *priv = dev->priv;
|
|
|
+ void __iomem *regs = priv->regs;
|
|
|
|
|
|
if (WARN_ON(reg % 4))
|
|
|
return -EINVAL;
|
|
@@ -223,12 +231,19 @@ static const struct b53_io_ops b53_mmap_ops = {
|
|
|
static int b53_mmap_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct b53_platform_data *pdata = pdev->dev.platform_data;
|
|
|
+ struct b53_mmap_priv *priv;
|
|
|
struct b53_device *dev;
|
|
|
|
|
|
if (!pdata)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, pdata->regs);
|
|
|
+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
|
|
+ if (!priv)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
+ priv->regs = pdata->regs;
|
|
|
+
|
|
|
+ dev = b53_switch_alloc(&pdev->dev, &b53_mmap_ops, priv);
|
|
|
if (!dev)
|
|
|
return -ENOMEM;
|
|
|
|