summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-09-22 11:05:54 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-22 17:20:22 +0100
commitab6cf13943303f865320407b17b0f86095d23ce3 (patch)
tree70058eb2aa7c20a158a90d4ba5a77adcae9a3d52 /include
parentd13f1fe04412b2319a79ff456cf73cc59692f6fb (diff)
ASoC/MFD: twl6040: Combine bit definitions for Headset control registers
Use one set of defines for the HS bits, since they are identical in both control register. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/twl6040.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 47470cadf969..d9e05eabef33 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -120,15 +120,10 @@
#define TWL6040_LPLLFIN 0x08
#define TWL6040_HPLLSEL 0x10
-/* HSLCTL (0x10) fields */
+/* HSLCTL/R (0x10/0x11) fields */
-#define TWL6040_HSDACMODEL 0x02
-#define TWL6040_HSDRVMODEL 0x08
-
-/* HSRCTL (0x11) fields */
-
-#define TWL6040_HSDACMODER 0x02
-#define TWL6040_HSDRVMODER 0x08
+#define TWL6040_HSDACMODE (1 << 1)
+#define TWL6040_HSDRVMODE (1 << 3)
/* VIBCTLL (0x18) fields */