commit e29aa87e47f8fc5dfa5e7803741df54e20d4d1b7
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 31 18:32:49 2011 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Wed Aug 31 18:32:50 2011 -0700
tree 1f9eb67cdbfe9eb512d74c05bb27bff2feb3ea78
parent 897a88ebd43b1e31284546c1addf3111e3b91299
parent 3925c26ddb979015555a1ac8c8f1487b5a54910a

Merge "pm8921: Clean up variable names"

dev/pmic/pm8921/include/dev/pm8921.h

diff --git a/dev/pmic/pm8921/include/dev/pm8921.h b/dev/pmic/pm8921/include/dev/pm8921.h
index d6cd3c5..0b09f99 100644
--- a/dev/pmic/pm8921/include/dev/pm8921.h
+++ b/dev/pmic/pm8921/include/dev/pm8921.h
@@ -36,10 +36,10 @@
 #define PM_GPIO_DIR_IN          0x02
 #define PM_GPIO_DIR_BOTH        (PM_GPIO_DIR_OUT | PM_GPIO_DIR_IN)
 
-//TODO: Rename these variables
-#define PM_GPIO_PULL_UP0        0
-#define PM_GPIO_PULL_UP1        2
-#define PM_GPIO_PULL_UP2        3
+#define PM_GPIO_PULL_UP_30      0
+#define PM_GPIO_PULL_UP_31_5    2
+/* 1.5uA + 30uA boost */
+#define PM_GPIO_PULL_UP_1_5_30  3
 #define PM_GPIO_PULL_DN         4
 #define PM_GPIO_PULL_NO         5
 

target/msm8960/panel.c

diff --git a/target/msm8960/panel.c b/target/msm8960/panel.c
index abdf2d1..62ed8d7 100644
--- a/target/msm8960/panel.c
+++ b/target/msm8960/panel.c
@@ -61,7 +61,7 @@
         .direction = PM_GPIO_DIR_OUT,
         .output_buffer = 0,
         .output_value = 1,
-        .pull = PM_GPIO_PULL_UP0,
+        .pull = PM_GPIO_PULL_UP_30,
         .vin_sel = 2,
         .out_strength = PM_GPIO_STRENGTH_HIGH,
         .function = PM_GPIO_FUNC_PAIRED,