diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h b/arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h index 13fdb3d..cd778f2 100644 --- a/arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h +++ b/arch/arm/mach-exynos/include/mach/gpio-rev00-m0.h @@ -20,8 +20,8 @@ extern void midas_config_sleep_gpio_table(void); #define GPIO_PMIC_SDA EXYNOS4_GPB(2) #define GPIO_PMIC_SCL EXYNOS4_GPB(3) -#define GPIO_ADC_SCL EXYNOS4_GPY0(2) -#define GPIO_ADC_SDA EXYNOS4_GPY0(3) +#define GPIO_FM_SCL EXYNOS4_GPY0(2) +#define GPIO_FM_SDA EXYNOS4_GPY0(3) #define GPIO_ADC_INT EXYNOS4_GPX2(4) /* rev0.0, 0.1 */ #define GPIO_CAM_SPI_SCLK EXYNOS4_GPB(4) @@ -71,6 +71,7 @@ extern void midas_config_sleep_gpio_table(void); #define GPIO_MSENSOR_INT EXYNOS4212_GPJ0(7) #define GPIO_MSENSOR_SDA_18V EXYNOS4_GPY2(4) #define GPIO_MSENSOR_SCL_18V EXYNOS4_GPY2(5) +#define GPIO_MSENSE_RST_N EXYNOS4_GPC1(1) #define GPIO_BENSE_SCL_18V EXYNOS4_GPY2(3) #define GPIO_BSENSE_SDA_18V EXYNOS4_GPY2(2) |