Merge "msm: 8930: Increase pull-up strength for pmic gpio-keys" into msm-3.0

This commit is contained in:
Linux Build Service Account
2012-03-22 15:52:14 -07:00
committed by QuIC Gerrit Code Review

View File

@@ -89,10 +89,10 @@ struct pm8xxx_mpp_init {
/* Initial pm8038 GPIO configurations */
static struct pm8xxx_gpio_init pm8038_gpios[] __initdata = {
/* keys GPIOs */
PM8XXX_GPIO_INPUT(3, PM_GPIO_PULL_UP_1P5),
PM8XXX_GPIO_INPUT(8, PM_GPIO_PULL_UP_1P5),
PM8XXX_GPIO_INPUT(10, PM_GPIO_PULL_UP_1P5),
PM8XXX_GPIO_INPUT(11, PM_GPIO_PULL_UP_1P5),
PM8XXX_GPIO_INPUT(3, PM_GPIO_PULL_UP_30),
PM8XXX_GPIO_INPUT(8, PM_GPIO_PULL_UP_30),
PM8XXX_GPIO_INPUT(10, PM_GPIO_PULL_UP_30),
PM8XXX_GPIO_INPUT(11, PM_GPIO_PULL_UP_30),
};
/* Initial pm8038 MPP configurations */