|
@@ -387,8 +387,9 @@ static struct regulator_ops wm831x_buckv_ops = {
|
|
|
* Set up DVS control. We just log errors since we can still run
|
|
|
* (with reduced performance) if we fail.
|
|
|
*/
|
|
|
-static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
|
|
|
- struct wm831x_buckv_pdata *pdata)
|
|
|
+static void wm831x_buckv_dvs_init(struct platform_device *pdev,
|
|
|
+ struct wm831x_dcdc *dcdc,
|
|
|
+ struct wm831x_buckv_pdata *pdata)
|
|
|
{
|
|
|
struct wm831x *wm831x = dcdc->wm831x;
|
|
|
int ret;
|
|
@@ -402,9 +403,9 @@ static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
|
|
|
*/
|
|
|
dcdc->dvs_gpio_state = pdata->dvs_init_state;
|
|
|
|
|
|
- ret = gpio_request_one(pdata->dvs_gpio,
|
|
|
- dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0,
|
|
|
- "DCDC DVS");
|
|
|
+ ret = devm_gpio_request_one(&pdev->dev, pdata->dvs_gpio,
|
|
|
+ dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0,
|
|
|
+ "DCDC DVS");
|
|
|
if (ret < 0) {
|
|
|
dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n",
|
|
|
dcdc->name, ret);
|
|
@@ -513,7 +514,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
|
|
|
dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK;
|
|
|
|
|
|
if (pdata && pdata->dcdc[id])
|
|
|
- wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
|
|
|
+ wm831x_buckv_dvs_init(pdev, dcdc,
|
|
|
+ pdata->dcdc[id]->driver_data);
|
|
|
|
|
|
config.dev = pdev->dev.parent;
|
|
|
if (pdata)
|
|
@@ -521,7 +523,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
|
|
|
config.driver_data = dcdc;
|
|
|
config.regmap = wm831x->regmap;
|
|
|
|
|
|
- dcdc->regulator = regulator_register(&dcdc->desc, &config);
|
|
|
+ dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
|
|
|
+ &config);
|
|
|
if (IS_ERR(dcdc->regulator)) {
|
|
|
ret = PTR_ERR(dcdc->regulator);
|
|
|
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
|
|
@@ -530,57 +533,35 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
|
|
|
- ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
|
|
|
- IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
|
|
|
+ wm831x_dcdc_uv_irq,
|
|
|
+ IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
|
|
|
irq, ret);
|
|
|
- goto err_regulator;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC"));
|
|
|
- ret = request_threaded_irq(irq, NULL, wm831x_dcdc_oc_irq,
|
|
|
- IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
|
|
|
+ wm831x_dcdc_oc_irq,
|
|
|
+ IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "Failed to request HC IRQ %d: %d\n",
|
|
|
irq, ret);
|
|
|
- goto err_uv;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, dcdc);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-err_uv:
|
|
|
- free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
|
|
|
- dcdc);
|
|
|
-err_regulator:
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
err:
|
|
|
- if (dcdc->dvs_gpio)
|
|
|
- gpio_free(dcdc->dvs_gpio);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int wm831x_buckv_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
|
|
|
- struct wm831x *wm831x = dcdc->wm831x;
|
|
|
-
|
|
|
- free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC")),
|
|
|
- dcdc);
|
|
|
- free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
|
|
|
- dcdc);
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
- if (dcdc->dvs_gpio)
|
|
|
- gpio_free(dcdc->dvs_gpio);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver wm831x_buckv_driver = {
|
|
|
.probe = wm831x_buckv_probe,
|
|
|
- .remove = wm831x_buckv_remove,
|
|
|
.driver = {
|
|
|
.name = "wm831x-buckv",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -681,7 +662,8 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
|
|
|
config.driver_data = dcdc;
|
|
|
config.regmap = wm831x->regmap;
|
|
|
|
|
|
- dcdc->regulator = regulator_register(&dcdc->desc, &config);
|
|
|
+ dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
|
|
|
+ &config);
|
|
|
if (IS_ERR(dcdc->regulator)) {
|
|
|
ret = PTR_ERR(dcdc->regulator);
|
|
|
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
|
|
@@ -690,38 +672,25 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
|
|
|
- ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
|
|
|
- IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
|
|
|
+ wm831x_dcdc_uv_irq,
|
|
|
+ IRQF_TRIGGER_RISING, dcdc->name, dcdc);
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
|
|
|
irq, ret);
|
|
|
- goto err_regulator;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, dcdc);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-err_regulator:
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
err:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int wm831x_buckp_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
|
|
|
- dcdc);
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver wm831x_buckp_driver = {
|
|
|
.probe = wm831x_buckp_probe,
|
|
|
- .remove = wm831x_buckp_remove,
|
|
|
.driver = {
|
|
|
.name = "wm831x-buckp",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -813,7 +782,8 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
|
|
|
config.driver_data = dcdc;
|
|
|
config.regmap = wm831x->regmap;
|
|
|
|
|
|
- dcdc->regulator = regulator_register(&dcdc->desc, &config);
|
|
|
+ dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
|
|
|
+ &config);
|
|
|
if (IS_ERR(dcdc->regulator)) {
|
|
|
ret = PTR_ERR(dcdc->regulator);
|
|
|
dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
|
|
@@ -822,39 +792,26 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
|
|
|
- ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
|
|
|
- IRQF_TRIGGER_RISING, dcdc->name,
|
|
|
- dcdc);
|
|
|
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
|
|
|
+ wm831x_dcdc_uv_irq,
|
|
|
+ IRQF_TRIGGER_RISING, dcdc->name,
|
|
|
+ dcdc);
|
|
|
if (ret != 0) {
|
|
|
dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
|
|
|
irq, ret);
|
|
|
- goto err_regulator;
|
|
|
+ goto err;
|
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, dcdc);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-err_regulator:
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
err:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int wm831x_boostp_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
|
|
|
- dcdc);
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver wm831x_boostp_driver = {
|
|
|
.probe = wm831x_boostp_probe,
|
|
|
- .remove = wm831x_boostp_remove,
|
|
|
.driver = {
|
|
|
.name = "wm831x-boostp",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -914,7 +871,8 @@ static int wm831x_epe_probe(struct platform_device *pdev)
|
|
|
config.driver_data = dcdc;
|
|
|
config.regmap = wm831x->regmap;
|
|
|
|
|
|
- dcdc->regulator = regulator_register(&dcdc->desc, &config);
|
|
|
+ dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
|
|
|
+ &config);
|
|
|
if (IS_ERR(dcdc->regulator)) {
|
|
|
ret = PTR_ERR(dcdc->regulator);
|
|
|
dev_err(wm831x->dev, "Failed to register EPE%d: %d\n",
|
|
@@ -930,18 +888,8 @@ err:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int wm831x_epe_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- regulator_unregister(dcdc->regulator);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver wm831x_epe_driver = {
|
|
|
.probe = wm831x_epe_probe,
|
|
|
- .remove = wm831x_epe_remove,
|
|
|
.driver = {
|
|
|
.name = "wm831x-epe",
|
|
|
.owner = THIS_MODULE,
|