diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-02-26 04:13:50 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2015-03-03 12:30:18 -0500 |
commit | ef9c80b37ad3062d335d4e37846a94d862b5579f (patch) | |
tree | 241637a78f533d576a26cf1318bd2baa9c1e6347 | |
parent | 97e4a7a21edf5901c8cd60715c81b880b7a3be12 (diff) |
mfd: sec: Cleanup unused RTC fields: ono, WTSR and SMPL
The WTSR (Watchdog Timer Software Reset) and SMPL (Sudden Momentary
Power Loss) were removed from rtc-s5m driver because they were not used.
Remove them (and on/off interrupt) from main MFD driver and header.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/sec-core.c | 1 | ||||
-rw-r--r-- | include/linux/mfd/samsung/core.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index 0a7bc43db4e4..423a2d3da4b2 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c | |||
@@ -333,7 +333,6 @@ static int sec_pmic_probe(struct i2c_client *i2c, | |||
333 | } | 333 | } |
334 | if (pdata) { | 334 | if (pdata) { |
335 | sec_pmic->device_type = pdata->device_type; | 335 | sec_pmic->device_type = pdata->device_type; |
336 | sec_pmic->ono = pdata->ono; | ||
337 | sec_pmic->irq_base = pdata->irq_base; | 336 | sec_pmic->irq_base = pdata->irq_base; |
338 | sec_pmic->wakeup = pdata->wakeup; | 337 | sec_pmic->wakeup = pdata->wakeup; |
339 | sec_pmic->pdata = pdata; | 338 | sec_pmic->pdata = pdata; |
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 3fdb7cfbffb3..75115384f3fc 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h | |||
@@ -58,13 +58,7 @@ enum sec_device_type { | |||
58 | * @irq_base: Base IRQ number for device, required for IRQs | 58 | * @irq_base: Base IRQ number for device, required for IRQs |
59 | * @irq: Generic IRQ number for device | 59 | * @irq: Generic IRQ number for device |
60 | * @irq_data: Runtime data structure for IRQ controller | 60 | * @irq_data: Runtime data structure for IRQ controller |
61 | * @ono: Power onoff IRQ number for s5m87xx | ||
62 | * @wakeup: Whether or not this is a wakeup device | 61 | * @wakeup: Whether or not this is a wakeup device |
63 | * @wtsr_smpl: Whether or not to enable in RTC driver the Watchdog | ||
64 | * Timer Software Reset (registers set to default value | ||
65 | * after PWRHOLD falling) and Sudden Momentary Power Loss | ||
66 | * (PMIC will enter power on sequence after short drop in | ||
67 | * VBATT voltage). | ||
68 | */ | 62 | */ |
69 | struct sec_pmic_dev { | 63 | struct sec_pmic_dev { |
70 | struct device *dev; | 64 | struct device *dev; |
@@ -77,9 +71,7 @@ struct sec_pmic_dev { | |||
77 | int irq; | 71 | int irq; |
78 | struct regmap_irq_chip_data *irq_data; | 72 | struct regmap_irq_chip_data *irq_data; |
79 | 73 | ||
80 | int ono; | ||
81 | bool wakeup; | 74 | bool wakeup; |
82 | bool wtsr_smpl; | ||
83 | }; | 75 | }; |
84 | 76 | ||
85 | int sec_irq_init(struct sec_pmic_dev *sec_pmic); | 77 | int sec_irq_init(struct sec_pmic_dev *sec_pmic); |
@@ -95,7 +87,6 @@ struct sec_platform_data { | |||
95 | int irq_base; | 87 | int irq_base; |
96 | int (*cfg_pmic_irq)(void); | 88 | int (*cfg_pmic_irq)(void); |
97 | 89 | ||
98 | int ono; | ||
99 | bool wakeup; | 90 | bool wakeup; |
100 | bool buck_voltage_lock; | 91 | bool buck_voltage_lock; |
101 | 92 | ||