Merge branch 'omap1' into ams-delta

1 files changed, 22 insertions, 26 deletions

diff --git a/arch/arm/plat-omap/include/plat/board-ams-delta.h b/arch/arm/plat-omap/include/plat/board-ams-delta.h
index 51b102dc906b..027e79eead5e 100644
--- a/arch/arm/plat-omap/include/plat/board-ams-delta.h
+++ b/arch/arm/plat-omap/include/plat/board-ams-delta.h
@@ -28,30 +28,6 @@
 
 #if defined (CONFIG_MACH_AMS_DELTA)
 
-#define AMS_DELTA_LATCH1_PHYS           0x01000000
-#define AMS_DELTA_LATCH1_VIRT           0xEA000000
-#define AMS_DELTA_MODEM_PHYS            0x04000000
-#define AMS_DELTA_MODEM_VIRT            0xEB000000
-#define AMS_DELTA_LATCH2_PHYS           0x08000000
-#define AMS_DELTA_LATCH2_VIRT           0xEC000000
-
-#define AMS_DELTA_LATCH1_LED_CAMERA     0x01
-#define AMS_DELTA_LATCH1_LED_ADVERT     0x02
-#define AMS_DELTA_LATCH1_LED_EMAIL      0x04
-#define AMS_DELTA_LATCH1_LED_HANDSFREE  0x08
-#define AMS_DELTA_LATCH1_LED_VOICEMAIL  0x10
-#define AMS_DELTA_LATCH1_LED_VOICE      0x20
-
-#define AMS_DELTA_LATCH2_LCD_VBLEN      0x0001
-#define AMS_DELTA_LATCH2_LCD_NDISP      0x0002
-#define AMS_DELTA_LATCH2_NAND_NCE       0x0004
-#define AMS_DELTA_LATCH2_NAND_NRE       0x0008
-#define AMS_DELTA_LATCH2_NAND_NWP       0x0010
-#define AMS_DELTA_LATCH2_NAND_NWE       0x0020
-#define AMS_DELTA_LATCH2_NAND_ALE       0x0040
-#define AMS_DELTA_LATCH2_NAND_CLE       0x0080
-#define AMD_DELTA_LATCH2_KEYBRD_PWR     0x0100
-#define AMD_DELTA_LATCH2_KEYBRD_DATA    0x0200
 #define AMD_DELTA_LATCH2_SCARD_RSTIN    0x0400
 #define AMD_DELTA_LATCH2_SCARD_CMDVCC   0x0800
 #define AMS_DELTA_LATCH2_MODEM_NRESET   0x1000
@@ -66,9 +42,29 @@
 #define AMS_DELTA_GPIO_PIN_CONFIG       11
 #define AMS_DELTA_GPIO_PIN_NAND_RB      12
 
+#define AMS_DELTA_GPIO_PIN_LCD_VBLEN            240
+#define AMS_DELTA_GPIO_PIN_LCD_NDISP            241
+#define AMS_DELTA_GPIO_PIN_NAND_NCE             242
+#define AMS_DELTA_GPIO_PIN_NAND_NRE             243
+#define AMS_DELTA_GPIO_PIN_NAND_NWP             244
+#define AMS_DELTA_GPIO_PIN_NAND_NWE             245
+#define AMS_DELTA_GPIO_PIN_NAND_ALE             246
+#define AMS_DELTA_GPIO_PIN_NAND_CLE             247
+#define AMS_DELTA_GPIO_PIN_KEYBRD_PWR           248
+#define AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT       249
+#define AMS_DELTA_GPIO_PIN_SCARD_RSTIN          250
+#define AMS_DELTA_GPIO_PIN_SCARD_CMDVCC         251
+#define AMS_DELTA_GPIO_PIN_MODEM_NRESET         252
+#define AMS_DELTA_GPIO_PIN_MODEM_CODEC          253
+
+#define AMS_DELTA_LATCH2_GPIO_BASE      AMS_DELTA_GPIO_PIN_LCD_VBLEN
+#define AMS_DELTA_LATCH2_NGPIO          16
+
 #ifndef __ASSEMBLY__
-void ams_delta_latch1_write(u8 mask, u8 value);
-void ams_delta_latch2_write(u16 mask, u16 value);
+void ams_delta_latch_write(int base, int ngpio, u16 mask, u16 value);
+#define ams_delta_latch2_write(mask, value) \
+        ams_delta_latch_write(AMS_DELTA_LATCH2_GPIO_BASE, \
+                        AMS_DELTA_LATCH2_NGPIO, (mask), (value))
 #endif
 
 #endif /* CONFIG_MACH_AMS_DELTA */