S5PC11X: NFC: Add firmware GPIO configuration

Change-Id: Ibafa9499d447de4cd6d11be833803bdc3acc8d14 Signed-off-by: Nick Pelly <npelly@google.com>
xcaliburinhand · Nov 15, 2010 · 5adbc29 · 5adbc29
1 parent 99487b9
commit 5adbc29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio-herring.h b/arch/arm/mach-s5pv210/include/mach/gpio-herring.h
@@ -548,6 +548,7 @@
 #define NFC_SDA_18V			S5PV210_MP04(5)
 #define NFC_IRQ				S5PV210_GPH1(4)
 #define NFC_EN				S5PV210_GPH1(5)
+#define NFC_FIRM			S5PV210_GPH1(6)
 
 #define PMIC_I2C_SDA			S5PV210_GPJ4(0)
 #define PMIC_I2C_SCL			S5PV210_GPJ4(3)

diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c
@@ -2116,6 +2116,8 @@ static struct i2c_board_info i2c_devs6[] __initdata = {
 
 static struct pn544_i2c_platform_data pn544_pdata = {
 	.irq_gpio = NFC_IRQ,
+	.ven_gpio = NFC_EN,
+	.firm_gpio = NFC_FIRM,
 };
 
 static struct i2c_board_info i2c_devs14[] __initdata = {
@@ -2900,11 +2902,11 @@ static struct gpio_init_data herring_init_gpios[] = {
 		.val	= S3C_GPIO_SETPIN_ONE,
 		.pud	= S3C_GPIO_PULL_NONE,
 		.drv	= S3C_GPIO_DRVSTR_1X,
-	}, {
+	}, { /* NFC_FIRM */
 		.num	= S5PV210_GPH1(6),
-		.cfg	= S3C_GPIO_INPUT,
-		.val	= S3C_GPIO_SETPIN_NONE,
-		.pud	= S3C_GPIO_PULL_DOWN,
+		.cfg	= S3C_GPIO_OUTPUT,
+		.val	= S3C_GPIO_SETPIN_ZERO,
+		.pud	= S3C_GPIO_PULL_NONE,
 		.drv	= S3C_GPIO_DRVSTR_1X,
 	}, {
 		.num	= S5PV210_GPH1(7),