Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / arm / mach-s3c2410 / include / mach / h1940-latch.h

diff --git a/arch/arm/mach-s3c2410/include/mach/h1940-latch.h b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
index d8a8327..97e42bf 100644 (file)
--- a/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
+++ b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
@@ -14,51 +14,30 @@
 #ifndef __ASM_ARCH_H1940_LATCH_H
 #define __ASM_ARCH_H1940_LATCH_H
 
+#include <mach/gpio.h>
 
-#ifndef __ASSEMBLY__
-#define H1940_LATCH            ((void __force __iomem *)0xF8000000)
-#else
-#define H1940_LATCH            0xF8000000
-#endif
-
-#define H1940_PA_LATCH         (S3C2410_CS2)
+#define H1940_LATCH_GPIO(x)            (S3C_GPIO_END + (x))
 
 /* SD layer latch */
 
-#define H1940_LATCH_SDQ1               (1<<16)
-#define H1940_LATCH_LCD_P1             (1<<17)
-#define H1940_LATCH_LCD_P2             (1<<18)
-#define H1940_LATCH_LCD_P3             (1<<19)
-#define H1940_LATCH_MAX1698_nSHUTDOWN  (1<<20)         /* LCD backlight */
-#define H1940_LATCH_LED_RED            (1<<21)
-#define H1940_LATCH_SDQ7               (1<<22)
-#define H1940_LATCH_USB_DP             (1<<23)
+#define H1940_LATCH_LCD_P0             H1940_LATCH_GPIO(0)
+#define H1940_LATCH_LCD_P1             H1940_LATCH_GPIO(1)
+#define H1940_LATCH_LCD_P2             H1940_LATCH_GPIO(2)
+#define H1940_LATCH_LCD_P3             H1940_LATCH_GPIO(3)
+#define H1940_LATCH_MAX1698_nSHUTDOWN  H1940_LATCH_GPIO(4)
+#define H1940_LATCH_LED_RED            H1940_LATCH_GPIO(5)
+#define H1940_LATCH_SDQ7               H1940_LATCH_GPIO(6)
+#define H1940_LATCH_USB_DP             H1940_LATCH_GPIO(7)
 
 /* CPU layer latch */
 
-#define H1940_LATCH_UDA_POWER          (1<<24)
-#define H1940_LATCH_AUDIO_POWER                (1<<25)
-#define H1940_LATCH_SM803_ENABLE       (1<<26)
-#define H1940_LATCH_LCD_P4             (1<<27)
-#define H1940_LATCH_CPUQ5              (1<<28)         /* untraced */
-#define H1940_LATCH_BLUETOOTH_POWER    (1<<29)         /* active high */
-#define H1940_LATCH_LED_GREEN          (1<<30)
-#define H1940_LATCH_LED_FLASH          (1<<31)
-
-/* default settings */
-
-#define H1940_LATCH_DEFAULT            \
-       H1940_LATCH_LCD_P4              | \
-       H1940_LATCH_SM803_ENABLE        | \
-       H1940_LATCH_SDQ1                | \
-       H1940_LATCH_LCD_P1              | \
-       H1940_LATCH_LCD_P2              | \
-       H1940_LATCH_LCD_P3              | \
-       H1940_LATCH_MAX1698_nSHUTDOWN   | \
-       H1940_LATCH_CPUQ5
-
-/* control functions */
-
-extern void h1940_latch_control(unsigned int clear, unsigned int set);
+#define H1940_LATCH_UDA_POWER          H1940_LATCH_GPIO(8)
+#define H1940_LATCH_AUDIO_POWER                H1940_LATCH_GPIO(9)
+#define H1940_LATCH_SM803_ENABLE       H1940_LATCH_GPIO(10)
+#define H1940_LATCH_LCD_P4             H1940_LATCH_GPIO(11)
+#define H1940_LATCH_SD_POWER           H1940_LATCH_GPIO(12)
+#define H1940_LATCH_BLUETOOTH_POWER    H1940_LATCH_GPIO(13)
+#define H1940_LATCH_LED_GREEN          H1940_LATCH_GPIO(14)
+#define H1940_LATCH_LED_FLASH          H1940_LATCH_GPIO(15)
 
 #endif /* __ASM_ARCH_H1940_LATCH_H */