Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb61f862 authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d0e639c9

arch/arm/mach-integrator/core.c

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,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

arch/arm/mach-integrator/include/mach/cm.h

+2 −1
Original line number Diff line number Diff line 
/*

 * update the core module control register.

 * access the core module control register.

 */

u32 cm_get(void);

void cm_control(u32, u32);



#define CM_CTRL	__io_address(INTEGRATOR_HDR_CTRL)

arch/arm/mach-integrator/leds.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void cm_led_set(struct led_classdev *cdev, 


static enum led_brightness cm_led_get(struct led_classdev *cdev)

{

	u32 reg = readl(CM_CTRL);

	u32 reg = cm_get();



	return (reg & CM_CTRL_LED) ? LED_FULL : LED_OFF;

}