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/midas-nfc.c | |
| 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/midas-nfc.c')
| -rw-r--r-- | arch/arm/mach-exynos/midas-nfc.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/midas-nfc.c b/arch/arm/mach-exynos/midas-nfc.c index c9c05f5..4f3dc87 100644 --- a/arch/arm/mach-exynos/midas-nfc.c +++ b/arch/arm/mach-exynos/midas-nfc.c @@ -16,12 +16,22 @@ static unsigned int nfc_gpio_table[][4] = { static inline void nfc_setup_gpio(void) { + int err = 0; int array_size = ARRAY_SIZE(nfc_gpio_table); u32 i, gpio; for (i = 0; i < array_size; i++) { gpio = nfc_gpio_table[i][0]; - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(nfc_gpio_table[i][1])); - s3c_gpio_setpull(gpio, nfc_gpio_table[i][3]); + + err = s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(nfc_gpio_table[i][1])); + if (err < 0) + pr_err("%s, s3c_gpio_cfgpin gpio(%d) fail(err = %d)\n", + __func__, i, err); + + err = s3c_gpio_setpull(gpio, nfc_gpio_table[i][3]); + if (err < 0) + pr_err("%s, s3c_gpio_setpull gpio(%d) fail(err = %d)\n", + __func__, i, err); + if (nfc_gpio_table[i][2] != 2) gpio_set_value(gpio, nfc_gpio_table[i][2]); } @@ -53,12 +63,17 @@ int __init midas_nfc_init(int i2c_bus) static int __init midas_nfc_init(void) { int ret = 0; -#if defined(CONFIG_MACH_C1) || defined(CONFIG_MACH_C1VZW) || \ - defined(CONFIG_MACH_M3) || defined(CONFIG_MACH_M0_CTC) +#if defined(CONFIG_MACH_C1) || \ + defined(CONFIG_MACH_M0_CTC) #define I2C_BUSNUM_PN65N (system_rev == 3 ? 0 : 5) -#elif defined(CONFIG_MACH_M0) || \ - defined(CONFIG_MACH_JENGA) || defined(CONFIG_MACH_S2PLUS) +#elif defined(CONFIG_MACH_M3) +#define I2C_BUSNUM_PN65N 12 +#elif defined(CONFIG_MACH_M0) #define I2C_BUSNUM_PN65N (system_rev == 3 ? 12 : 5) +#elif defined(CONFIG_MACH_T0) +#define I2C_BUSNUM_PN65N (system_rev == 0 ? 5 : 12) +#elif defined(CONFIG_MACH_BAFFIN) +#define I2C_BUSNUM_PN65N 5 #else #define I2C_BUSNUM_PN65N 12 #endif |