Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294145
b: refs/heads/master
c: 7d5e525
h: refs/heads/master
i:
  294143: 518a0c1
v: v3
  • Loading branch information
Mark Brown committed Feb 18, 2012
1 parent 99bde00 commit 62fe329
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cde5fcd435fd929db7b0b486efb435cdb1ddca4
refs/heads/master: 7d5e525b9ceda0e3b85da0acdaa2de19fea51edc
11 changes: 11 additions & 0 deletions trunk/drivers/base/regmap/regcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,13 @@ bool regcache_set_val(void *base, unsigned int idx,
cache[idx] = val;
break;
}
case 4: {
u32 *cache = base;
if (cache[idx] == val)
return true;
cache[idx] = val;
break;
}
default:
BUG();
}
Expand All @@ -393,6 +400,10 @@ unsigned int regcache_get_val(const void *base, unsigned int idx,
const u16 *cache = base;
return cache[idx];
}
case 4: {
const u32 *cache = base;
return cache[idx];
}
default:
BUG();
}
Expand Down
24 changes: 24 additions & 0 deletions trunk/drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ static void regmap_format_16(void *buf, unsigned int val)
b[0] = cpu_to_be16(val);
}

static void regmap_format_32(void *buf, unsigned int val)
{
__be32 *b = buf;

b[0] = cpu_to_be32(val);
}

static unsigned int regmap_parse_8(void *buf)
{
u8 *b = buf;
Expand All @@ -141,6 +148,15 @@ static unsigned int regmap_parse_16(void *buf)
return b[0];
}

static unsigned int regmap_parse_32(void *buf)
{
__be32 *b = buf;

b[0] = be32_to_cpu(b[0]);

return b[0];
}

/**
* regmap_init(): Initialise register map
*
Expand Down Expand Up @@ -239,6 +255,10 @@ struct regmap *regmap_init(struct device *dev,
map->format.format_reg = regmap_format_16;
break;

case 32:
map->format.format_reg = regmap_format_32;
break;

default:
goto err_map;
}
Expand All @@ -252,6 +272,10 @@ struct regmap *regmap_init(struct device *dev,
map->format.format_val = regmap_format_16;
map->format.parse_val = regmap_parse_16;
break;
case 32:
map->format.format_val = regmap_format_32;
map->format.parse_val = regmap_parse_32;
break;
}

if (!map->format.format_write &&
Expand Down

0 comments on commit 62fe329

Please sign in to comment.