Merge "msm: 8064: Disable write-protect for MTP/LIQUID" into msm-3.0
diff --git a/arch/arm/mach-msm/board-8064-pmic.c b/arch/arm/mach-msm/board-8064-pmic.c
index 75160ef..4b4f32a 100644
--- a/arch/arm/mach-msm/board-8064-pmic.c
+++ b/arch/arm/mach-msm/board-8064-pmic.c
@@ -125,7 +125,6 @@
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 = {
@@ -136,6 +135,7 @@
static struct pm8xxx_gpio_init pm8921_cdp_kp_gpios[] __initdata = {
PM8921_GPIO_INPUT(37, PM_GPIO_PULL_UP_1P5),
PM8921_GPIO_INPUT(42, PM_GPIO_PULL_UP_1P5),
+ PM8921_GPIO_INPUT(17, PM_GPIO_PULL_UP_1P5), /* SD_WP */
};
/* Initial PM8XXX MPP configurations */
diff --git a/arch/arm/mach-msm/board-8064-storage.c b/arch/arm/mach-msm/board-8064-storage.c
index b8cae49..b52004a 100644
--- a/arch/arm/mach-msm/board-8064-storage.c
+++ b/arch/arm/mach-msm/board-8064-storage.c
@@ -273,6 +273,10 @@
if (apq8064_sdc3_pdata) {
apq8064_sdc3_pdata->swfi_latency =
apq8064_rpm_get_swfi_latency();
+ if (!machine_is_apq8064_cdp()) {
+ apq8064_sdc3_pdata->wpswitch_gpio = 0;
+ apq8064_sdc3_pdata->wpswitch_polarity = 0;
+ }
apq8064_add_sdcc(3, apq8064_sdc3_pdata);
}
}