diff options
author | Jinyoung Park <jinyoungp@nvidia.com> | 2013-11-29 14:58:59 +0900 |
---|---|---|
committer | Harry Hong <hhong@nvidia.com> | 2013-12-01 22:12:54 -0800 |
commit | cd6f59a1958fda8475b8e4beaf6b845df4658249 (patch) | |
tree | 5d37134b00b90a9c986c555974e59eb2f2b24bff | |
parent | bc316340a5c8e761e9430f6857c0434ce1f9ac66 (diff) |
iio: staging: adc: palmas: Rename wakeup to auto conversion
Rename wakeup to auto conversion.
Bug 1366274
Change-Id: Ice678d86050a5c82a45dae3b6bc599e434a812b6
Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com>
Reviewed-on: http://git-master/r/336847
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
-rw-r--r-- | drivers/staging/iio/adc/palmas_gpadc.c | 75 | ||||
-rw-r--r-- | include/linux/mfd/palmas.h | 8 |
2 files changed, 42 insertions, 41 deletions
diff --git a/drivers/staging/iio/adc/palmas_gpadc.c b/drivers/staging/iio/adc/palmas_gpadc.c index 078c4ce0e2cf..8a0c7bd6c5e6 100644 --- a/drivers/staging/iio/adc/palmas_gpadc.c +++ b/drivers/staging/iio/adc/palmas_gpadc.c @@ -92,10 +92,10 @@ struct palmas_gpadc { int irq_auto_1; struct palmas_gpadc_info *adc_info; struct completion conv_completion; - struct palmas_adc_wakeup_property wakeup1_data; - struct palmas_adc_wakeup_property wakeup2_data; - bool wakeup1_enable; - bool wakeup2_enable; + struct palmas_adc_auto_conv_property auto_conv1_data; + struct palmas_adc_auto_conv_property auto_conv2_data; + bool auto_conv1_enable; + bool auto_conv2_enable; int auto_conversion_period; }; @@ -524,10 +524,10 @@ static int __devinit palmas_gpadc_probe(struct platform_device *pdev) goto out_unregister_map; } - if (adc_pdata->adc_wakeup1_data) { - memcpy(&adc->wakeup1_data, adc_pdata->adc_wakeup1_data, - sizeof(adc->wakeup1_data)); - adc->wakeup1_enable = true; + if (adc_pdata->adc_auto_conv1_data) { + memcpy(&adc->auto_conv1_data, adc_pdata->adc_auto_conv1_data, + sizeof(adc->auto_conv1_data)); + adc->auto_conv1_enable = true; adc->irq_auto_0 = platform_get_irq(pdev, 1); ret = request_threaded_irq(adc->irq_auto_0, NULL, palmas_gpadc_irq_auto, @@ -540,10 +540,10 @@ static int __devinit palmas_gpadc_probe(struct platform_device *pdev) } } - if (adc_pdata->adc_wakeup2_data) { - memcpy(&adc->wakeup2_data, adc_pdata->adc_wakeup2_data, - sizeof(adc->wakeup2_data)); - adc->wakeup2_enable = true; + if (adc_pdata->adc_auto_conv2_data) { + memcpy(&adc->auto_conv2_data, adc_pdata->adc_auto_conv2_data, + sizeof(adc->auto_conv2_data)); + adc->auto_conv2_enable = true; adc->irq_auto_1 = platform_get_irq(pdev, 2); ret = request_threaded_irq(adc->irq_auto_1, NULL, palmas_gpadc_irq_auto, @@ -605,15 +605,16 @@ static int __devinit palmas_gpadc_probe(struct platform_device *pdev) palmas_gpadc_calibrate(adc, i); } - if (adc->wakeup1_enable || adc->wakeup2_enable) + if (adc->auto_conv1_enable || adc->auto_conv2_enable) device_wakeup_enable(&pdev->dev); + return 0; out_irq_auto1_free: - if (adc_pdata->adc_wakeup2_data) + if (adc_pdata->adc_auto_conv2_data) free_irq(adc->irq_auto_1, adc); out_irq_auto0_free: - if (adc_pdata->adc_wakeup1_data) + if (adc_pdata->adc_auto_conv1_data) free_irq(adc->irq_auto_0, adc); out_irq_free: free_irq(adc->irq, adc); @@ -635,16 +636,16 @@ static int __devexit palmas_gpadc_remove(struct platform_device *pdev) iio_map_array_unregister(iodev, pdata->adc_pdata->iio_maps); iio_device_unregister(iodev); free_irq(adc->irq, adc); - if (adc->wakeup1_enable) + if (adc->auto_conv1_enable) free_irq(adc->irq_auto_0, adc); - if (adc->wakeup2_enable) + if (adc->auto_conv2_enable) free_irq(adc->irq_auto_1, adc); iio_free_device(iodev); return 0; } #ifdef CONFIG_PM_SLEEP -static int palmas_adc_wakeup_configure(struct palmas_gpadc *adc) +static int palmas_adc_auto_conv_configure(struct palmas_gpadc *adc) { int adc_period, conv; int i; @@ -670,16 +671,16 @@ static int palmas_adc_wakeup_configure(struct palmas_gpadc *adc) } conv = 0; - if (adc->wakeup1_enable) { + if (adc->auto_conv1_enable) { int is_high; - ch0 = adc->wakeup1_data.adc_channel_number; + ch0 = adc->auto_conv1_data.adc_channel_number; conv |= PALMAS_GPADC_AUTO_CTRL_AUTO_CONV0_EN; - if (adc->wakeup1_data.adc_high_threshold > 0) { - thres = adc->wakeup1_data.adc_high_threshold; + if (adc->auto_conv1_data.adc_high_threshold > 0) { + thres = adc->auto_conv1_data.adc_high_threshold; is_high = 0; } else { - thres = adc->wakeup1_data.adc_low_threshold; + thres = adc->auto_conv1_data.adc_low_threshold; is_high = BIT(7); } @@ -701,16 +702,16 @@ static int palmas_adc_wakeup_configure(struct palmas_gpadc *adc) } } - if (adc->wakeup2_enable) { + if (adc->auto_conv2_enable) { int is_high; - ch1 = adc->wakeup2_data.adc_channel_number; + ch1 = adc->auto_conv2_data.adc_channel_number; conv |= PALMAS_GPADC_AUTO_CTRL_AUTO_CONV1_EN; - if (adc->wakeup2_data.adc_high_threshold > 0) { - thres = adc->wakeup2_data.adc_high_threshold; + if (adc->auto_conv2_data.adc_high_threshold > 0) { + thres = adc->auto_conv2_data.adc_high_threshold; is_high = 0; } else { - thres = adc->wakeup2_data.adc_low_threshold; + thres = adc->auto_conv2_data.adc_low_threshold; is_high = BIT(7); } @@ -751,7 +752,7 @@ static int palmas_adc_wakeup_configure(struct palmas_gpadc *adc) return 0; } -static int palmas_adc_wakeup_reset(struct palmas_gpadc *adc) +static int palmas_adc_auto_conv_reset(struct palmas_gpadc *adc) { int ret; @@ -775,20 +776,20 @@ static int palmas_gpadc_suspend(struct device *dev) { struct iio_dev *iodev = dev_get_drvdata(dev); struct palmas_gpadc *adc = iio_priv(iodev); - int wakeup = adc->wakeup1_enable || adc->wakeup2_enable; + int wakeup = adc->auto_conv1_enable || adc->auto_conv2_enable; int ret; if (!device_may_wakeup(dev) || !wakeup) return 0; - ret = palmas_adc_wakeup_configure(adc); + ret = palmas_adc_auto_conv_configure(adc); if (ret < 0) return ret; - if (adc->wakeup1_enable) + if (adc->auto_conv1_enable) enable_irq_wake(adc->irq_auto_0); - if (adc->wakeup2_enable) + if (adc->auto_conv2_enable) enable_irq_wake(adc->irq_auto_1); return 0; @@ -798,20 +799,20 @@ static int palmas_gpadc_resume(struct device *dev) { struct iio_dev *iodev = dev_get_drvdata(dev); struct palmas_gpadc *adc = iio_priv(iodev); - int wakeup = adc->wakeup1_enable || adc->wakeup2_enable; + int wakeup = adc->auto_conv1_enable || adc->auto_conv2_enable; int ret; if (!device_may_wakeup(dev) || !wakeup) return 0; - ret = palmas_adc_wakeup_reset(adc); + ret = palmas_adc_auto_conv_reset(adc); if (ret < 0) return ret; - if (adc->wakeup1_enable) + if (adc->auto_conv1_enable) disable_irq_wake(adc->irq_auto_0); - if (adc->wakeup2_enable) + if (adc->auto_conv2_enable) disable_irq_wake(adc->irq_auto_1); return 0; diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 9d294ca573ec..973bdb58462d 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -208,12 +208,12 @@ struct palmas_rtc_platform_data { }; /* - * ADC wakeup property: Wakup the system from suspend when threshold crossed. + * ADC auto_conv property: Generate interrupt when threshold crossed. * @adc_channel_number: ADC channel number for monitoring. * @adc_high_threshold: ADC High raw data for upper threshold to generate int. * @adc_low_threshold: ADC low raw data for lower threshold to generate int. */ -struct palmas_adc_wakeup_property { +struct palmas_adc_auto_conv_property { int adc_channel_number; int adc_high_threshold; int adc_low_threshold; @@ -227,8 +227,8 @@ struct palmas_gpadc_platform_data { struct iio_map *iio_maps; int auto_conversion_period_ms; - struct palmas_adc_wakeup_property *adc_wakeup1_data; - struct palmas_adc_wakeup_property *adc_wakeup2_data; + struct palmas_adc_auto_conv_property *adc_auto_conv1_data; + struct palmas_adc_auto_conv_property *adc_auto_conv2_data; }; struct palmas_pinctrl_config { |