aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-08-17 16:50:15 +1000
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2013-03-09 15:42:59 +0100
commit29b87af9de4eea872a3d75ca09e25249fc34ecf4 (patch)
treeb654d53c224b83b208e6eec72ae48ee1b981adda
parent80e2fb38747acd40d171807be6d6dafbbf2ef75c (diff)
downloadkernel_goldelico_gta04-29b87af9de4eea872a3d75ca09e25249fc34ecf4.zip
kernel_goldelico_gta04-29b87af9de4eea872a3d75ca09e25249fc34ecf4.tar.gz
kernel_goldelico_gta04-29b87af9de4eea872a3d75ca09e25249fc34ecf4.tar.bz2
GTA04: Enable mdac hwmon
Useful for testing. /sys/class/hwmon/hwmon0/device/in7_input show the reading for MICSENSE which detects a jack plugged in. You need HSMIC_BIAS enabled which is forced by the next patch or can be achieved with alsamixer by "Analog Left Headset Mic" set to capture, and so loopback enabled, e.g. HeadsetL Mixer AudioL1 not muted Left1 Analog Loopback not muted Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--arch/arm/configs/gta04_debug_defconfig2
-rw-r--r--arch/arm/configs/gta04_defconfig2
-rw-r--r--arch/arm/mach-omap2/board-omap3gta04.c7
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/configs/gta04_debug_defconfig b/arch/arm/configs/gta04_debug_defconfig
index d0cda3a..5f39a96 100644
--- a/arch/arm/configs/gta04_debug_defconfig
+++ b/arch/arm/configs/gta04_debug_defconfig
@@ -1740,7 +1740,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_TMP102 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TWL4030_MADC is not set
+CONFIG_SENSORS_TWL4030_MADC=y
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83791D is not set
diff --git a/arch/arm/configs/gta04_defconfig b/arch/arm/configs/gta04_defconfig
index 23a2fcc..656135b 100644
--- a/arch/arm/configs/gta04_defconfig
+++ b/arch/arm/configs/gta04_defconfig
@@ -1737,7 +1737,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_TMP102 is not set
# CONFIG_SENSORS_TMP401 is not set
# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TWL4030_MADC is not set
+CONFIG_SENSORS_TWL4030_MADC=y
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83791D is not set
diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c
index 47acfa9..8a46275 100644
--- a/arch/arm/mach-omap2/board-omap3gta04.c
+++ b/arch/arm/mach-omap2/board-omap3gta04.c
@@ -1150,6 +1150,12 @@ static struct platform_device gta04_vaux3_virtual_regulator_device = {
};
#endif
+
+static struct platform_device madc_hwmon = {
+ .name = "twl4030_madc_hwmon",
+ .id = -1,
+};
+
static struct platform_device *gta04_devices[] __initdata = {
&pwm_device,
// &leds_gpio,
@@ -1175,6 +1181,7 @@ static struct platform_device *gta04_devices[] __initdata = {
#if defined(CONFIG_SND_SOC_W2CBW003)
&gta04_w2cbw003_codec_audio_device,
#endif
+ &madc_hwmon,
};
static const struct usbhs_omap_board_data usbhs_bdata __initconst = {