linux.git/drivers/base/regmap/regmap.c, branch v3.4-rc2 Linux kernel source tree Merge remote-tracking branch 'regmap/topic/bulk' into regmap-next 2012-03-14T13:15:48+00:00 Mark Brown broonie@opensource.wolfsonmicro.com 2012-03-14T13:15:48+00:00 addfd8a09e1f434a73b3d87d36ef050c73511d2b 






Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next
2012-03-14T13:15:03+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-03-14T13:15:03+00:00

eae4b51b21f7452b0b53a9848f48c02cb0fac336

Simple add/add conflict:
	drivers/base/regmap/regmap.c





Simple add/add conflict:
	drivers/base/regmap/regmap.c







Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
2012-03-14T13:13:25+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-03-14T13:13:25+00:00

7d9aca39dcacd2b3f42e2e287162329f410f93e1

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c





Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c







Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/devm' into regmap-next
2012-03-14T13:12:33+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-03-14T13:12:33+00:00

e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b












regmap: Fix future missing prototype of devres_alloc() and friends
2012-03-11T12:52:44+00:00

Stephen Warren
swarren@wwwdotorg.org

2012-03-09T20:17:28+00:00

f5d6eba74b8aac7d4bf646c5445807aa6a247e6c

[Fix for breakage which will be introduced during the merge window via
header reworks in another tree, the regmap tree does include device.h
but Paul's tree breaks that.  Reworded subject to reflect -- broonie]

regmap.s uses devres_alloc() and others that are prototyped in device.h.
Include that to solve the following:

drivers/base/regmap/regmap.c: In function 'devm_regmap_init':
drivers/base/regmap/regmap.c:331:2: error: implicit declaration of function 'devres_alloc' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c:338:3: error: implicit declaration of function 'devres_add' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c:340:3: error: implicit declaration of function 'devres_free' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c: In function '_regmap_raw_write':
drivers/base/regmap/regmap.c:421:5: error: implicit declaration of function 'dev_err' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>





[Fix for breakage which will be introduced during the merge window via
header reworks in another tree, the regmap tree does include device.h
but Paul's tree breaks that.  Reworded subject to reflect -- broonie]

regmap.s uses devres_alloc() and others that are prototyped in device.h.
Include that to solve the following:

drivers/base/regmap/regmap.c: In function 'devm_regmap_init':
drivers/base/regmap/regmap.c:331:2: error: implicit declaration of function 'devres_alloc' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c:338:3: error: implicit declaration of function 'devres_add' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c:340:3: error: implicit declaration of function 'devres_free' [-Werror=implicit-function-declaration]
drivers/base/regmap/regmap.c: In function '_regmap_raw_write':
drivers/base/regmap/regmap.c:421:5: error: implicit declaration of function 'dev_err' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>







regmap: delete unused module.h from drivers/base/regmap files
2012-03-01T11:10:35+00:00

Paul Gortmaker
paul.gortmaker@windriver.com

2012-02-29T00:28:02+00:00

19694b5ea1d3a723dafe9544b5ee9a935414dc28

Remove unused module.h and/or replace with export.h
as required.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>





Remove unused module.h and/or replace with export.h
as required.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>







regmap: Support raw reads from cached registers
2012-02-21T19:29:18+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-02-21T19:12:47+00:00

b8fb5ab156055b745254609f4635fcfd6b7dabc8

Fall back to a register by register read to do so; most likely we'll be
cache only so the overhead will be low.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>





Fall back to a register by register read to do so; most likely we'll be
cache only so the overhead will be low.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>







Merge branch 'topic/patch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-drivers
2012-02-20T21:21:33+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-02-20T21:21:33+00:00

aca1e172a1096ed3785e0da01d82943b7562527c












Merge branch 'topic/devm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-drivers
2012-02-20T21:21:25+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-02-20T21:21:25+00:00

3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695












regmap: Allow users to query the size of register values
2012-02-20T21:17:08+00:00

Mark Brown
broonie@opensource.wolfsonmicro.com

2012-02-17T22:20:14+00:00

a6539c32949063c8147905512a83a98842c2d254

Generic infrastructure based on top of regmap may want to operate on
blocks of data and therefore find it useful to find the size of the
register values. Provide an accessor operation for this.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>





Generic infrastructure based on top of regmap may want to operate on
blocks of data and therefore find it useful to find the size of the
register values. Provide an accessor operation for this.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>