[Zaurus-devel] [PATCH 1/2] ARM/scoop: Add CPR register bit definitions

2010-06-13 Thread Marek Vasut
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.va...@gmail.com
---
 arch/arm/include/asm/hardware/scoop.h |   29 +
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/arch/arm/include/asm/hardware/scoop.h 
b/arch/arm/include/asm/hardware/scoop.h
index 46492a6..ebb3cea 100644
--- a/arch/arm/include/asm/hardware/scoop.h
+++ b/arch/arm/include/asm/hardware/scoop.h
@@ -22,18 +22,23 @@
 #define SCOOP_GPWR 0x24
 #define SCOOP_GPRR 0x28
 
-#define SCOOP_GPCR_PA22( 1  12 )
-#define SCOOP_GPCR_PA21( 1  11 )
-#define SCOOP_GPCR_PA20( 1  10 )
-#define SCOOP_GPCR_PA19( 1  9 )
-#define SCOOP_GPCR_PA18( 1  8 )
-#define SCOOP_GPCR_PA17( 1  7 )
-#define SCOOP_GPCR_PA16( 1  6 )
-#define SCOOP_GPCR_PA15( 1  5 )
-#define SCOOP_GPCR_PA14( 1  4 )
-#define SCOOP_GPCR_PA13( 1  3 )
-#define SCOOP_GPCR_PA12( 1  2 )
-#define SCOOP_GPCR_PA11( 1  1 )
+#define SCOOP_CPR_OUT  (1  7)
+#define SCOOP_CPR_SD_3V(1  2)
+#define SCOOP_CPR_CF_XV(1  1)
+#define SCOOP_CPR_CF_3V(1  0)
+
+#define SCOOP_GPCR_PA22(1  12)
+#define SCOOP_GPCR_PA21(1  11)
+#define SCOOP_GPCR_PA20(1  10)
+#define SCOOP_GPCR_PA19(1  9)
+#define SCOOP_GPCR_PA18(1  8)
+#define SCOOP_GPCR_PA17(1  7)
+#define SCOOP_GPCR_PA16(1  6)
+#define SCOOP_GPCR_PA15(1  5)
+#define SCOOP_GPCR_PA14(1  4)
+#define SCOOP_GPCR_PA13(1  3)
+#define SCOOP_GPCR_PA12(1  2)
+#define SCOOP_GPCR_PA11(1  1)
 
 struct scoop_config {
unsigned short io_out;
-- 
1.7.1


___
Zaurus-devel mailing list
Zaurus-devel@lists.linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/zaurus-devel


[Zaurus-devel] [PATCH 1/2] ARM/scoop: Add CPR register bit definitions

2010-06-11 Thread Marek Vasut
Add bit definitions of the CPR register of the SCOOP chip into scoop.h

Signed-off-by: Marek Vasut marek.va...@gmail.com
---
 arch/arm/include/asm/hardware/scoop.h |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/hardware/scoop.h 
b/arch/arm/include/asm/hardware/scoop.h
index 46492a6..5821f21 100644
--- a/arch/arm/include/asm/hardware/scoop.h
+++ b/arch/arm/include/asm/hardware/scoop.h
@@ -22,6 +22,11 @@
 #define SCOOP_GPWR 0x24
 #define SCOOP_GPRR 0x28
 
+#define SCOOP_CPR_OUT  ( 1  7 )
+#define SCOOP_CPR_SD_3V( 1  2 )
+#define SCOOP_CPR_CF_XV( 1  1 )
+#define SCOOP_CPR_CF_3V( 1  0 )
+
 #define SCOOP_GPCR_PA22( 1  12 )
 #define SCOOP_GPCR_PA21( 1  11 )
 #define SCOOP_GPCR_PA20( 1  10 )
-- 
1.7.1


___
Zaurus-devel mailing list
Zaurus-devel@lists.linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/zaurus-devel