Merge "msm: Add support for thermal monitor on msm8974" into msm-3.4
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index 0949213..b2eef6f 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -256,4 +256,3 @@
CONFIG_CRYPTO_DEV_QCEDEV=m
CONFIG_CRC_CCITT=y
CONFIG_LIBCRC32C=y
-CONFIG_MSM_BUS_SCALING=y
diff --git a/drivers/gpio/qpnp-pin.c b/drivers/gpio/qpnp-pin.c
index bbcba81..ccbbd67 100644
--- a/drivers/gpio/qpnp-pin.c
+++ b/drivers/gpio/qpnp-pin.c
@@ -46,10 +46,10 @@
/* mpp peripheral type and subtype values */
#define Q_MPP_TYPE 0x11
-#define Q_MPP_SUBTYPE_4CH_NO_ANA_OUT 0x1
-#define Q_MPP_SUBTYPE_4CH_NO_SINK 0x2
-#define Q_MPP_SUBTYPE_4CH_FULL_FUNC 0x3
-#define Q_MPP_SUBTYPE_8CH_FULL_FUNC 0x7
+#define Q_MPP_SUBTYPE_4CH_NO_ANA_OUT 0x3
+#define Q_MPP_SUBTYPE_4CH_NO_SINK 0x5
+#define Q_MPP_SUBTYPE_4CH_FULL_FUNC 0x2
+#define Q_MPP_SUBTYPE_8CH_FULL_FUNC 0x4
/* control register base address offsets */
#define Q_REG_MODE_CTL 0x40