Permalink
Browse files

merge gpio-herring.h and gpio-aries.h using #ifdef GALAXYS

  • Loading branch information...
1 parent 45232f8 commit ffb766ab4295c47e3e4f2d2b176089ec1d4e955d @supercurio supercurio committed Dec 23, 2010
Showing with 131 additions and 0 deletions.
  1. +131 −0 arch/arm/mach-s5pv210/include/mach/gpio-herring.h
@@ -97,6 +97,14 @@
#define GPIO_CAM_SCL_29V S5PV210_GPD1(1)
#define GPIO_CAM_SCL_29V_AF 2
+#ifdef CONFIG_GALAXYS_S
+#define GPIO_FM_SDA_28V S5PV210_GPD1(2)
+#define GPIO_FM_SDA_28V_AF 2
+
+#define GPIO_FM_SCL_28V S5PV210_GPD1(3)
+#define GPIO_FM_SCL_28V_AF 2
+#endif
+
#define GYRO_SDA_28V S5PV210_GPD1(2)
#define GYRO_SCL_28V S5PV210_GPD1(3)
@@ -251,12 +259,25 @@
#define GPIO_NAND_D3 S5PV210_GPG0(6)
#define GPIO_NAND_D3_AF 2
+#ifdef CONFIG_GALAXYS
+#define GPIO_GPS_nRST S5PV210_GPG3(0)
+
+#define GPIO_GPS_PWR_EN S5PV210_GPG3(1)
+
+#define GPIO_BT_RST S5PV210_GPB(3)
+#define GPIO_WLAN_BT_EN S5PV210_GPB(5)
+#else
#define GPIO_GPS_nRST S5PV210_GPG1(0)
#define GPIO_GPS_PWR_EN S5PV210_GPG1(1)
+#endif
#define GPIO_WLAN_RST S5PV210_GPG1(2)
+#ifdef CONFIG_GALAXYS
+#define GPIO_GPS_CLK_INT S5PV210_GPG3(2)
+#endif
+
#define GPIO_NAND_D4 S5PV210_GPG1(3)
#define GPIO_NAND_D4_AF 3
@@ -289,6 +310,28 @@
#define GPIO_T_FLASH_D3 S5PV210_GPG2(6)
#define GPIO_T_FLASH_D3_AF 2
+#ifdef CONFIG_GALAXYS
+#define GPIO_WLAN_SDIO_CLK S5PV210_GPG1(0)
+#define GPIO_WLAN_SDIO_CLK_AF 2
+
+#define GPIO_WLAN_SDIO_CMD S5PV210_GPG1(1)
+#define GPIO_WLAN_SDIO_CMD_AF 2
+
+#define GPIO_WLAN_nRST S5PV210_GPG1(2)
+#define GPIO_WLAN_nRST_AF 1
+
+#define GPIO_WLAN_SDIO_D0 S5PV210_GPG1(3)
+#define GPIO_WLAN_SDIO_D0_AF 2
+
+#define GPIO_WLAN_SDIO_D1 S5PV210_GPG1(4)
+#define GPIO_WLAN_SDIO_D1_AF 2
+
+#define GPIO_WLAN_SDIO_D2 S5PV210_GPG1(5)
+#define GPIO_WLAN_SDIO_D2_AF 2
+
+#define GPIO_WLAN_SDIO_D3 S5PV210_GPG1(6)
+#define GPIO_WLAN_SDIO_D3_AF 2
+#else
#define GPIO_WLAN_SDIO_CLK S5PV210_GPG3(0)
#define GPIO_WLAN_SDIO_CLK_AF 2
@@ -309,6 +352,7 @@
#define GPIO_WLAN_SDIO_D3 S5PV210_GPG3(6)
#define GPIO_WLAN_SDIO_D3_AF 2
+#endif
#define GPIO_AP_PS_HOLD S5PV210_GPH0(0)
@@ -330,7 +374,15 @@
#define GPIO_GPH10 S5PV210_GPH1(0)
+#ifdef CONFIG_GALAXYS
+#define GPIO_PDA_ACTIVE S5PV210_MP03(3)
+#else
#define GPIO_PDA_ACTIVE S5PV210_GPH1(1)
+#endif
+
+#ifdef CONFIG_GALAXYS
+#define GPIO_GPH11 S5PV210_GPH1(1)
+#endif
#define GPIO_GPH12 S5PV210_GPH1(2)
#define GPIO_nINT_ONEDRAM_AP S5PV210_GPH1(3)
@@ -352,11 +404,21 @@
#define GPIO_KBC2 S5PV210_GPH2(2)
#define GPIO_KBC2_AF 3
+#ifdef CONFIG_GALAXYS
+#define GPIO_BT_WAKE S5PV210_GPG3(4)
+#define GPIO_WLAN_WAKE S5PV210_GPG3(5)
+#else
#define GPIO_BT_WAKE S5PV210_GPH2(2)
#define GPIO_WLAN_WAKE S5PV210_GPH2(3)
+#endif
#define GPIO_WLAN_WAKE_AF 1
#define GPIO_KBC_DATA (GPIO_KBC2 + 0x04)
+#endif
+
+#ifdef CONFIG_GALAXYS
+#define GPIO_GPH23 S5PV210_GPH2(3)
+#endif
#define GPIO_WLAN_HOST_WAKE S5PV210_GPH2(4)
#define GPIO_WLAN_HOST_WAKE_AF 0xF
@@ -367,19 +429,41 @@
#define GPIO_nPOWER S5PV210_GPH2(6)
#define GPIO_JACK_nINT S5PV210_GPH2(7)
+#ifdef CONFIG_GALAXYS
+#define GPIO_JACK_nINT_AF 0xF
+#endif
+#ifdef CONFIG_GALAXYS
+#define GPIO_TA_CURRENT_SEL_AP S5PV210_GPG3(3)
+#else
#define GPIO_TA_CURRENT_SEL_AP S5PV210_GPH3(0)
+#endif
+#ifdef CONFIG_GALAXYS
+#define GPIO_KBR0 S5PV210_GPH3(0)
+#define GPIO_KBR0_AF 3
+#endif
#define GPIO_KBR1 S5PV210_GPH3(1)
#define GPIO_KBR1_AF 3
#define GPIO_KBR2 S5PV210_GPH3(2)
#define GPIO_KBR2_AF 3
+#ifdef CONFIG_GALAXYS
+#define GPIO_MSENSE_IRQ S5PV210_GPH3(5)
+
+#else
#define GPIO_MSENSE_IRQ S5PV210_GPH3(3)
+#endif
+
+#ifdef CONFIG_GALAXYS
+#define GPIO_KBR3 S5PV210_GPH3(3)
+#define GPIO_KBR3_AF 3
+#endif
#define GPIO_KBR_DATA (GPIO_KBR1 + 0x04)
+
#define GPIO_T_FLASH_DETECT S5PV210_GPH3(4)
/* EAR_SEN_END_OPEN */
@@ -420,13 +504,28 @@
#define GPIO_HWREV_MODE3 S5PV210_GPJ0(7)
+#ifdef CONFIG_GALAXYS
+#define GPIO_PHONE_ON S5PV210_GPJ1(0)
+#endif
+
+#ifdef CONFIG_GALAXYS
+#define GPIO_CAM_FLASH_EN S5PV210_GPJ2(0)
+
+#define GPIO_CAM_FLASH_SET S5PV210_GPJ2(1)
+#endif
+
#define GPIO_CAM_FLASH_EN_SET S5PV210_GPJ1(0)
#define GPIO_VIBTONE_EN1 S5PV210_GPJ1(1)
+#ifdef CONFIG_GALAXYS
+#define GPIO_GPJ30 S5PV210_GPJ1(2)
+#endif
+
#define GPIO_EAR_SEL S5PV210_GPJ2(3)
#define GPIO_FLASH_EN S5PV210_GPJ1(2)
+
#define GPIO_TOUCH_EN S5PV210_GPJ1(3)
#define GPIO_TOUCH_EN_AF 1
@@ -436,11 +535,21 @@
#define GPIO_OLED_DET S5PV210_GPJ2(2)
+#ifdef CONFIG_GALAXYS
+#define GPIO_CODEC_XTAL_EN S5PV210_GPJ2(3)
+#endif
+
#define GPIO_EAR_SEL S5PV210_GPJ2(3)
#define GPIO_FM_INT S5PV210_GPJ2(4)
#define GPIO_FM_RST S5PV210_GPJ2(5)
#define GPIO_TV_OUT_SEL S5PV210_GPJ2(6)
+#ifdef CONFIG_GALAXYS
+#define GPIO_FM_RST S5PV210_GPJ2(5)
+
+#define GPIO_EARPATH_SEL S5PV210_GPJ2(6)
+#endif
+
#define GPIO_MASSMEMORY_EN S5PV210_GPJ2(7)
#define _3_TOUCH_SDA_28V S5PV210_GPJ3(0)
@@ -460,16 +569,27 @@
#define GPIO_AP_PMIC_SDA S5PV210_GPJ4(0)
#define _3_GPIO_TOUCH_INT S5PV210_GPJ4(1)
+#ifdef CONFIG_GALAXYS
+#define _3_GPIO_TOUCH_INT_AF S3C_GPIO_SFN(0xf)
+#else
#define _3_GPIO_TOUCH_INT_AF 0xFF
+#endif
#define GPIO_MICBIAS_EN S5PV210_GPJ4(2)
#define GPIO_AP_PMIC_SCL S5PV210_GPJ4(3)
+#ifdef GALAXYS
+#define GPIO_TV_EN S5PV210_GPJ4(4)
+#else
#define GPIO_EAR_MICBIAS_EN S5PV210_GPJ4(4)
+#endif
#define GPIO_MP010 S5PV210_MP01(0)
#define GPIO_DISPLAY_CS S5PV210_MP01(1)
+#ifdef CONFIG_GALAXYS
+#define GPIO_DISPLAY_CS_AF S3C_GPIO_SFN(1)
+#endif
#define GPIO_SUB_DISPLAY_CS S5PV210_MP01(2)
@@ -511,10 +631,16 @@
#define GPIO_USB_SEL S5PV210_MP04(0)
#define GPIO_DISPLAY_CLK S5PV210_MP04(1)
+#ifdef CONFIG_GALAXYS
+#define GPIO_DISPLAY_CLK_AF S3C_GPIO_SFN(1)
+#endif
#define GPIO_MP042 S5PV210_MP04(2)
#define GPIO_DISPLAY_SI S5PV210_MP04(3)
+#ifdef CONFIG_GALAXYS
+#define GPIO_DISPLAY_SI_AF S3C_GPIO_SFN(1)
+#endif
#define GPIO_MP044 S5PV210_MP04(4)
@@ -534,6 +660,9 @@
#define GPIO_MP054 S5PV210_MP05(4)
#define GPIO_MLCD_RST S5PV210_MP05(5)
+#ifdef CONFIG_GALAXYS
+#define GPIO_MLCD_RST_AF S3C_GPIO_SFN(1)
+#endif
#define GPIO_MP056 S5PV210_MP05(6)
@@ -597,6 +726,8 @@
#define GPIO_JACK_INT_N_AF 0xFF
#define _3_GPIO_TOUCH_CE S5PV210_GPJ3(3)
+#ifdef CONFIG_GALAXYS
+#define _3_GPIO_TOUCH_ST_AF 1
#endif
/* end of __GPIO_HERRING_H_ */

0 comments on commit ffb766a

Please sign in to comment.