commit 9dabf73bdc26583c2b12fae0276f9333b1c9bfb6
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 19 00:05:17 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Mar 19 00:05:17 2012 -0700
tree 5affc01a4826b4345e39df98a02b0af8ac4c33f9
parent f45e6ea8cd7824e708c62f1cb816c4d525c41088
parent 787ac48e9d508f117620bc9b4804fb5d9e892c46

Merge "msm: 8064: Add write-protect support." into msm-3.0

arch/arm/mach-msm/board-8064-pmic.c

diff --git a/arch/arm/mach-msm/board-8064-pmic.c b/arch/arm/mach-msm/board-8064-pmic.c
index 99b0a8f..75160ef 100644
--- a/arch/arm/mach-msm/board-8064-pmic.c
+++ b/arch/arm/mach-msm/board-8064-pmic.c
@@ -125,6 +125,7 @@
 	PM8921_GPIO_INPUT(38, PM_GPIO_PULL_UP_1P5),
 	/* TABLA CODEC RESET */
 	PM8921_GPIO_OUTPUT(34, 1, MED),
+	PM8921_GPIO_INPUT(17, PM_GPIO_PULL_UP_1P5),	/* SD_WP */
 };
 
 static struct pm8xxx_gpio_init pm8921_mtp_kp_gpios[] __initdata = {

arch/arm/mach-msm/board-8064-storage.c

diff --git a/arch/arm/mach-msm/board-8064-storage.c b/arch/arm/mach-msm/board-8064-storage.c
index cdafdfc..b8cae49 100644
--- a/arch/arm/mach-msm/board-8064-storage.c
+++ b/arch/arm/mach-msm/board-8064-storage.c
@@ -233,6 +233,8 @@
 	.pclk_src_dfab	= 1,
 	.pin_data	= &mmc_slot_pin_data[SDCC3],
 	.vreg_data	= &mmc_slot_vreg_data[SDCC3],
+	.wpswitch_gpio	= PM8921_GPIO_PM_TO_SYS(17),
+	.wpswitch_polarity = 1,
 	.status_gpio	= 26,
 	.status_irq	= MSM_GPIO_TO_INT(26),
 	.irq_flags	= IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,