diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-10 14:11:18 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 14:09:31 +0200 |
| commit | fb61f8622369aad275a4e3487b8aeec7a571fdde (patch) | |
| tree | 0bd297dbd8b79f6918326782a40a86a55c5c3322 /arch/arm/mach-integrator/core.c | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
ARM: integrator: get the CM control register by proxy
The CM_CTRL register was accessed directly from the LED driver,
which does not work now that we get the base for the register
from the device tree. Add an accessor function to do this and
make the LED driver compile again.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 4cdfd7365925..c07c821fb6b3 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -94,6 +94,14 @@ int __init integrator_init(bool is_cp) static DEFINE_RAW_SPINLOCK(cm_lock); /** + * cm_get - get the value from the CM_CTRL register + */ +u32 cm_get(void) +{ + return readl(cm_base + INTEGRATOR_HDR_CTRL_OFFSET); +} + +/** * cm_control - update the CM_CTRL register. * @mask: bits to change * @set: bits to set |