summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-16 09:22:00 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-16 09:22:00 -0700
commit504c6dd5d11f8d3e0b7f1858df0da929d80ae07b (patch)
tree845657dfb717b53571c6d759cb9b70e1c69a1d7f /include/linux
parent7ba1c55052436059a1760834525e1c704096fe1d (diff)
parentb1c114010839ce7bb57440e20758adcee3860a70 (diff)
Merge "drivers: mfd: set IIR and ANC registers as volatile"
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/wcd9xxx/core.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/include/linux/mfd/wcd9xxx/core.h b/include/linux/mfd/wcd9xxx/core.h
index e545d8d55a33..11e8d89c337b 100644
--- a/include/linux/mfd/wcd9xxx/core.h
+++ b/include/linux/mfd/wcd9xxx/core.h
@@ -53,12 +53,18 @@
#define TASHA_VERSION_1_0 0
#define TASHA_VERSION_1_1 1
#define TASHA_VERSION_2_0 2
-#define TASHA_IS_1_0(ver) \
- ((ver == TASHA_VERSION_1_0) ? 1 : 0)
-#define TASHA_IS_1_1(ver) \
- ((ver == TASHA_VERSION_1_1) ? 1 : 0)
-#define TASHA_IS_2_0(ver) \
- ((ver == TASHA_VERSION_2_0) ? 1 : 0)
+
+#define TASHA_IS_1_0(wcd) \
+ ((wcd->type == WCD9335 || wcd->type == WCD9326) ? \
+ ((wcd->version == TASHA_VERSION_1_0) ? 1 : 0) : 0)
+
+#define TASHA_IS_1_1(wcd) \
+ ((wcd->type == WCD9335 || wcd->type == WCD9326) ? \
+ ((wcd->version == TASHA_VERSION_1_1) ? 1 : 0) : 0)
+
+#define TASHA_IS_2_0(wcd) \
+ ((wcd->type == WCD9335 || wcd->type == WCD9326) ? \
+ ((wcd->version == TASHA_VERSION_2_0) ? 1 : 0) : 0)
/*
* As fine version info cannot be retrieved before tavil probe.