Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87028bd1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/doc', 'regulator/fix/max77686'... 

Merge remote-tracking branches 'regulator/fix/doc', 'regulator/fix/max77686' and 'regulator/fix/wm831x' into regulator-linus
parents 24ba1bb3 43343f8d c53403a3 29454738

drivers/regulator/helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev, 
EXPORT_SYMBOL_GPL(regulator_map_voltage_linear);



/**

 * regulator_map_voltage_linear - map_voltage() for multiple linear ranges

 * regulator_map_voltage_linear_range - map_voltage() for multiple linear ranges

 *

 * @rdev: Regulator to operate on

 * @min_uV: Lower bound for voltage

drivers/regulator/max77686.c

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * max77686.c - Regulator driver for the Maxim 77686

 *

 * Copyright (C) 2012 Samsung Electronics

 * Chiwoong Byun <woong.byun@smasung.com>

 * Chiwoong Byun <woong.byun@samsung.com>

 * Jonghwa Lee <jonghwa3.lee@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify
@@ -88,7 +88,7 @@ enum max77686_ramp_rate { 
};



struct max77686_data {

	u64 gpio_enabled:MAX77686_REGULATORS;

	DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS);



	/* Array indexed by regulator id */

	unsigned int opmode[MAX77686_REGULATORS];
@@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686, 
	case MAX77686_BUCK8:

	case MAX77686_BUCK9:

	case MAX77686_LDO20 ... MAX77686_LDO22:

		if (max77686->gpio_enabled & (1 << id))

		if (test_bit(id, max77686->gpio_enabled))

			return MAX77686_GPIO_CONTROL;

	}
@@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np, 
	}



	if (gpio_is_valid(config->ena_gpio)) {

		max77686->gpio_enabled |= (1 << desc->id);

		set_bit(desc->id, max77686->gpio_enabled);



		return regmap_update_bits(config->regmap, desc->enable_reg,

					  desc->enable_mask,

drivers/regulator/wm831x-dcdc.c

+8 −4
Original line number Diff line number Diff line
@@ -533,7 +533,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_dcdc_uv_irq,

					IRQF_TRIGGER_RISING, dcdc->name, dcdc);

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dcdc->name, dcdc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",

			irq, ret);
@@ -543,7 +544,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_dcdc_oc_irq,

					IRQF_TRIGGER_RISING, dcdc->name, dcdc);

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dcdc->name, dcdc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request HC IRQ %d: %d\n",

			irq, ret);
@@ -669,7 +671,8 @@ static int wm831x_buckp_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_dcdc_uv_irq,

					IRQF_TRIGGER_RISING, dcdc->name, dcdc);

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dcdc->name, dcdc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",

			irq, ret);
@@ -785,7 +788,8 @@ static int wm831x_boostp_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_dcdc_uv_irq,

					IRQF_TRIGGER_RISING, dcdc->name,

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					dcdc->name,

					dcdc);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",

drivers/regulator/wm831x-isink.c

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static int wm831x_isink_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_isink_irq,

					IRQF_TRIGGER_RISING, isink->name,

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					isink->name,

					isink);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n",

drivers/regulator/wm831x-ldo.c

+4 −2
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_ldo_uv_irq,

					IRQF_TRIGGER_RISING, ldo->name,

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					ldo->name,

					ldo);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
@@ -496,7 +497,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev) 
	irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

					wm831x_ldo_uv_irq,

					IRQF_TRIGGER_RISING, ldo->name, ldo);

					IRQF_TRIGGER_RISING | IRQF_ONESHOT,

					ldo->name, ldo);

	if (ret != 0) {

		dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",

			irq, ret);