summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/samsung
diff options
context:
space:
mode:
authorYadwinder Singh Brar <yadi.brar@samsung.com>2013-07-07 17:14:22 +0530
committerSamuel Ortiz <sameo@linux.intel.com>2013-07-31 02:04:01 +0200
commit08ad7b7f542bad5d1476573ddecefc1899da21e4 (patch)
tree2c099f5ac936ac0a7163d952ab443706e2869887 /include/linux/mfd/samsung
parentf10111cc83b07251e4f8788343c952a5742d748e (diff)
downloadlinux-stable-08ad7b7f542bad5d1476573ddecefc1899da21e4.tar.gz
linux-stable-08ad7b7f542bad5d1476573ddecefc1899da21e4.tar.bz2
linux-stable-08ad7b7f542bad5d1476573ddecefc1899da21e4.zip
mfd: s2mps11: Remove clocks from regulators list
Since these are fixed rate clocks which are registered with common clock framework so remove these from list of regulators which were unnecessarily incrementing the count(S2MPS11_REGULATOR_MAX) of regulators. Signed-off-by: Yadwinder Singh Brar <yadi.brar@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd/samsung')
-rw-r--r--include/linux/mfd/samsung/s2mps11.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index 4e94dc65f987..179e10ca095b 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -167,11 +167,8 @@ enum s2mps11_regulators {
S2MPS11_BUCK8,
S2MPS11_BUCK9,
S2MPS11_BUCK10,
- S2MPS11_AP_EN32KHZ,
- S2MPS11_CP_EN32KHZ,
- S2MPS11_BT_EN32KHZ,
- S2MPS11_REG_MAX,
+ S2MPS11_REGULATOR_MAX,
};
#define S2MPS11_BUCK_MIN1 600000
@@ -192,6 +189,5 @@ enum s2mps11_regulators {
#define S2MPS11_RAMP_DELAY 25000 /* uV/us */
#define S2MPS11_PMIC_EN_SHIFT 6
-#define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)
#endif /* __LINUX_MFD_S2MPS11_H */