iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: sm750fb: use BIT macro for POWER_MODE_CTRL single-bit fields

Browse Source 
Replace complex definition of POWER_MODE_CTRL register fields with BIT()
macro and use open-coded implementation for register manipulations.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2016-01-17 20:04:30 +02:00 committed by Greg Kroah-Hartman
parent a941245109
commit 776980cf0f
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/sm750fb/ddk750_power.c
View File

@ -60,17 +60,15 @@ void setPowerMode(unsigned int powerMode)
/* Set up other fields in Power Control Register */
if (powerMode == POWER_MODE_CTRL_MODE_SLEEP) {
control_value =
control_value &= ~POWER_MODE_CTRL_OSC_INPUT;
#ifdef VALIDATION_CHIP
FIELD_SET(control_value, POWER_MODE_CTRL, 336CLK, OFF) |
control_value &= ~POWER_MODE_CTRL_336CLK;
#endif
FIELD_SET(control_value, POWER_MODE_CTRL, OSC_INPUT, OFF);
} else {
control_value =
control_value |= POWER_MODE_CTRL_OSC_INPUT;
#ifdef VALIDATION_CHIP
FIELD_SET(control_value, POWER_MODE_CTRL, 336CLK, ON) |
control_value |= POWER_MODE_CTRL_336CLK;
#endif
FIELD_SET(control_value, POWER_MODE_CTRL, OSC_INPUT, ON);
}
/* Program new power mode. */

12
drivers/staging/sm750fb/ddk750_reg.h
View File

@ -497,16 +497,10 @@
#define POWER_MODE_CTRL 0x00004C
#ifdef VALIDATION_CHIP
#define POWER_MODE_CTRL_336CLK 4:4
#define POWER_MODE_CTRL_336CLK_OFF 0
#define POWER_MODE_CTRL_336CLK_ON 1
#define POWER_MODE_CTRL_336CLK BIT(4)
#endif
#define POWER_MODE_CTRL_OSC_INPUT 3:3
#define POWER_MODE_CTRL_OSC_INPUT_OFF 0
#define POWER_MODE_CTRL_OSC_INPUT_ON 1
#define POWER_MODE_CTRL_ACPI 2:2
#define POWER_MODE_CTRL_ACPI_OFF 0
#define POWER_MODE_CTRL_ACPI_ON 1
#define POWER_MODE_CTRL_OSC_INPUT BIT(3)
#define POWER_MODE_CTRL_ACPI BIT(2)
#define POWER_MODE_CTRL_MODE 1:0
#define POWER_MODE_CTRL_MODE_MODE0 0
#define POWER_MODE_CTRL_MODE_MODE1 1