Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] scoop: Add CPR register bit definitions

Add bit definitions of the CPR register of the SCOOP chip into scoop.h. Also,
cleanup the GPCR definitions to match coding style.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

authored by

Marek Vasut and committed by
Eric Miao
983536e7 11dd2d9a

+17 -12
+17 -12
arch/arm/include/asm/hardware/scoop.h
··· 22 22 #define SCOOP_GPWR 0x24 23 23 #define SCOOP_GPRR 0x28 24 24 25 - #define SCOOP_GPCR_PA22 ( 1 << 12 ) 26 - #define SCOOP_GPCR_PA21 ( 1 << 11 ) 27 - #define SCOOP_GPCR_PA20 ( 1 << 10 ) 28 - #define SCOOP_GPCR_PA19 ( 1 << 9 ) 29 - #define SCOOP_GPCR_PA18 ( 1 << 8 ) 30 - #define SCOOP_GPCR_PA17 ( 1 << 7 ) 31 - #define SCOOP_GPCR_PA16 ( 1 << 6 ) 32 - #define SCOOP_GPCR_PA15 ( 1 << 5 ) 33 - #define SCOOP_GPCR_PA14 ( 1 << 4 ) 34 - #define SCOOP_GPCR_PA13 ( 1 << 3 ) 35 - #define SCOOP_GPCR_PA12 ( 1 << 2 ) 36 - #define SCOOP_GPCR_PA11 ( 1 << 1 ) 25 + #define SCOOP_CPR_OUT (1 << 7) 26 + #define SCOOP_CPR_SD_3V (1 << 2) 27 + #define SCOOP_CPR_CF_XV (1 << 1) 28 + #define SCOOP_CPR_CF_3V (1 << 0) 29 + 30 + #define SCOOP_GPCR_PA22 (1 << 12) 31 + #define SCOOP_GPCR_PA21 (1 << 11) 32 + #define SCOOP_GPCR_PA20 (1 << 10) 33 + #define SCOOP_GPCR_PA19 (1 << 9) 34 + #define SCOOP_GPCR_PA18 (1 << 8) 35 + #define SCOOP_GPCR_PA17 (1 << 7) 36 + #define SCOOP_GPCR_PA16 (1 << 6) 37 + #define SCOOP_GPCR_PA15 (1 << 5) 38 + #define SCOOP_GPCR_PA14 (1 << 4) 39 + #define SCOOP_GPCR_PA13 (1 << 3) 40 + #define SCOOP_GPCR_PA12 (1 << 2) 41 + #define SCOOP_GPCR_PA11 (1 << 1) 37 42 38 43 struct scoop_config { 39 44 unsigned short io_out;