summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingyu Zhou <b02241@freescale.com>2008-04-03 10:27:22 +0800
committerDaniel Schaeffer <daniel.schaeffer@timesys.com>2008-08-25 15:20:57 -0400
commitfd2ea4e9d46b70ceb8c713a618e136c7a739bd89 (patch)
treec222b80ce275648400b5e4921c676814c5f8dafb
parentf6c413b2f5b1b503421f4543955aeff7a40bba92 (diff)
ENGR00071084 enable FM output
Enable FM output Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
-rw-r--r--drivers/mxc/pmic/mc13783/pmic_audio.c3
-rw-r--r--include/asm-arm/arch-mxc/pmic_external.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mxc/pmic/mc13783/pmic_audio.c b/drivers/mxc/pmic/mc13783/pmic_audio.c
index 922627fe6910..2495fd9792d0 100644
--- a/drivers/mxc/pmic/mc13783/pmic_audio.c
+++ b/drivers/mxc/pmic/mc13783/pmic_audio.c
@@ -867,7 +867,8 @@ PMIC_STATUS pmic_audio_set_autodetect(int val)
return status;
reg_mask = 0;
if (val == 1) {
- reg_write = SET_BITS(regAUDIO_RX_0, HSDETEN, 1);
+ reg_write = SET_BITS(regAUDIO_RX_0, HSDETEN, 1) |
+ SET_BITS(regAUDIO_RX_0, HSDETAUTOB, 1);
} else {
reg_write = 0;
}
diff --git a/include/asm-arm/arch-mxc/pmic_external.h b/include/asm-arm/arch-mxc/pmic_external.h
index 5679a21b495c..aa5106637eed 100644
--- a/include/asm-arm/arch-mxc/pmic_external.h
+++ b/include/asm-arm/arch-mxc/pmic_external.h
@@ -969,11 +969,13 @@ bool pmic_check_sensor(t_sensor sensor);
*/
PMIC_STATUS pmic_get_sensors(t_sensor_bits * sensor_bits);
+#ifdef CONFIG_MXC_PMIC_MC9SDZ60
PMIC_STATUS pmic_gpio_set_bit_val(t_mcu_gpio_reg reg, unsigned int bit,
unsigned int val);
PMIC_STATUS pmic_gpio_get_bit_val(t_mcu_gpio_reg reg, unsigned int bit,
unsigned int *val);
+#endif
#ifdef CONFIG_REGULATOR_MC13783
/*!