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

Commit 545b2820 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-4.11-rc1' of... 

Merge tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm updates from Thierry Reding:
 "This set contains mostly fixes to existing drivers as well as cleanup
  of code that's not been in active use for a while"

* tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (27 commits)
  acpi: lpss: call pwm_add_table() for BSW PWM device
  pwm: Try to load modules during pwm_get()
  pwm: Don't hold pwm_lookup_lock longer than necessary
  pwm: Make the PWM_POLARITY flag in DTB optional
  pwm: Print error messages with pr_err() instead of pr_debug()
  pwm: imx: Add polarity inversion support to i.MX's PWMv2
  pwm: imx: doc: Update imx-pwm.txt documentation entry
  pwm: imx: Remove redundant i.MX PWMv2 code
  pwm: imx: Provide atomic PWM support for i.MX PWMv2
  pwm: imx: Move PWMv2 wait for fifo slot code to a separate function
  pwm: imx: Move PWMv2 software reset code to a separate function
  pwm: imx: Rewrite v1 code to facilitate switch to atomic PWM
  pwm: imx: Add separate set of PWM ops for v1 and v2
  pwm: imx: Remove ipg clock and enable per clock when required
  pwm: lpss: Add Intel Gemini Lake PCI ID
  pwm: lpss: Do not export board infos for different PWM types
  pwm: lpss: Avoid reconfiguring while UPDATE bit is still enabled
  pwm: lpss: Switch to new atomic API
  pwm: lpss: Allow duty cycle to be 0
  pwm: lpss: Avoid potential overflow of base_unit
  ...
parents 3437f9f0 38b0a526

Documentation/devicetree/bindings/pwm/imx-pwm.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ Required properties: 
  - "fsl,imx1-pwm" for PWM compatible with the one integrated on i.MX1

  - "fsl,imx27-pwm" for PWM compatible with the one integrated on i.MX27

- reg: physical base address and length of the controller's registers

- #pwm-cells: should be 2. See pwm.txt in this directory for a description of

  the cells format.

- #pwm-cells: 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.txt

  in this directory for a description of the cells format.

- clocks : Clock specifiers for both ipg and per clocks.

- clock-names : Clock names should include both "ipg" and "per"

See the clock consumer binding,
@@ -17,7 +17,7 @@ See the clock consumer binding, 
Example:



pwm1: pwm@53fb4000 {

	#pwm-cells = <2>;

	#pwm-cells = <3>;

	compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";

	reg = <0x53fb4000 0x4000>;

	clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,

drivers/acpi/acpi_lpss.c

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/platform_data/x86/pmc_atom.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/pwm.h>

#include <linux/delay.h>



#include "internal.h"
@@ -154,6 +155,18 @@ static void byt_i2c_setup(struct lpss_private_data *pdata) 
	writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);

}



/* BSW PWM used for backlight control by the i915 driver */

static struct pwm_lookup bsw_pwm_lookup[] = {

	PWM_LOOKUP_WITH_MODULE("80862288:00", 0, "0000:00:02.0",

			       "pwm_backlight", 0, PWM_POLARITY_NORMAL,

			       "pwm-lpss-platform"),

};



static void bsw_pwm_setup(struct lpss_private_data *pdata)

{

	pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));

}



static const struct lpss_device_desc lpt_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.prv_offset = 0x800,
@@ -191,6 +204,7 @@ static const struct lpss_device_desc byt_pwm_dev_desc = { 


static const struct lpss_device_desc bsw_pwm_dev_desc = {

	.flags = LPSS_SAVE_CTX | LPSS_NO_D3_DELAY,

	.setup = bsw_pwm_setup,

};



static const struct lpss_device_desc byt_uart_dev_desc = {

drivers/leds/leds-pwm.c

+3 −13
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ struct led_pwm_data { 
	unsigned int		active_low;

	unsigned int		period;

	int			duty;

	bool			can_sleep;

};



struct led_pwm_priv {
@@ -49,7 +48,7 @@ static void __led_pwm_set(struct led_pwm_data *led_dat) 
		pwm_enable(led_dat->pwm);

}



static void led_pwm_set(struct led_classdev *led_cdev,

static int led_pwm_set(struct led_classdev *led_cdev,

		       enum led_brightness brightness)

{

	struct led_pwm_data *led_dat =
@@ -66,12 +65,7 @@ static void led_pwm_set(struct led_classdev *led_cdev, 
	led_dat->duty = duty;



	__led_pwm_set(led_dat);

}



static int led_pwm_set_blocking(struct led_classdev *led_cdev,

	enum led_brightness brightness)

{

	led_pwm_set(led_cdev, brightness);

	return 0;

}
@@ -112,11 +106,7 @@ static int led_pwm_add(struct device *dev, struct led_pwm_priv *priv, 
		return ret;

	}



	led_data->can_sleep = pwm_can_sleep(led_data->pwm);

	if (!led_data->can_sleep)

		led_data->cdev.brightness_set = led_pwm_set;

	else

		led_data->cdev.brightness_set_blocking = led_pwm_set_blocking;

	led_data->cdev.brightness_set_blocking = led_pwm_set;



	/*

	 * FIXME: pwm_apply_args() should be removed when switching to the

drivers/pwm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ config PWM_ATMEL_TCB 


config PWM_BCM_IPROC

	tristate "iProc PWM support"

	depends on ARCH_BCM_IPROC

	depends on ARCH_BCM_IPROC || COMPILE_TEST

	depends on COMMON_CLK

	default ARCH_BCM_IPROC

	help

	  Generic PWM framework driver for Broadcom iProc PWM block. This

	  block is used in Broadcom iProc SoC's.

drivers/pwm/core.c

+36 −34
Original line number Diff line number Diff line
@@ -137,9 +137,14 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) 
{

	struct pwm_device *pwm;



	/* check, whether the driver supports a third cell for flags */

	if (pc->of_pwm_n_cells < 3)

		return ERR_PTR(-EINVAL);



	/* flags in the third cell are optional */

	if (args->args_count < 2)

		return ERR_PTR(-EINVAL);



	if (args->args[0] >= pc->npwm)

		return ERR_PTR(-EINVAL);
@@ -148,11 +153,10 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) 
		return pwm;



	pwm->args.period = args->args[1];

	pwm->args.polarity = PWM_POLARITY_NORMAL;



	if (args->args[2] & PWM_POLARITY_INVERTED)

	if (args->args_count > 2 && args->args[2] & PWM_POLARITY_INVERTED)

		pwm->args.polarity = PWM_POLARITY_INVERSED;

	else

		pwm->args.polarity = PWM_POLARITY_NORMAL;



	return pwm;

}
@@ -163,9 +167,14 @@ of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) 
{

	struct pwm_device *pwm;



	/* sanity check driver support */

	if (pc->of_pwm_n_cells < 2)

		return ERR_PTR(-EINVAL);



	/* all cells are required */

	if (args->args_count != pc->of_pwm_n_cells)

		return ERR_PTR(-EINVAL);



	if (args->args[0] >= pc->npwm)

		return ERR_PTR(-EINVAL);
@@ -663,24 +672,17 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id) 
	err = of_parse_phandle_with_args(np, "pwms", "#pwm-cells", index,

					 &args);

	if (err) {

		pr_debug("%s(): can't parse \"pwms\" property\n", __func__);

		pr_err("%s(): can't parse \"pwms\" property\n", __func__);

		return ERR_PTR(err);

	}



	pc = of_node_to_pwmchip(args.np);

	if (IS_ERR(pc)) {

		pr_debug("%s(): PWM chip not found\n", __func__);

		pr_err("%s(): PWM chip not found\n", __func__);

		pwm = ERR_CAST(pc);

		goto put;

	}



	if (args.args_count != pc->of_pwm_n_cells) {

		pr_debug("%s: wrong #pwm-cells for %s\n", np->full_name,

			 args.np->full_name);

		pwm = ERR_PTR(-EINVAL);

		goto put;

	}



	pwm = pc->of_xlate(pc, &args);

	if (IS_ERR(pwm))

		goto put;
@@ -757,12 +759,13 @@ void pwm_remove_table(struct pwm_lookup *table, size_t num) 
 */

struct pwm_device *pwm_get(struct device *dev, const char *con_id)

{

	struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);

	const char *dev_id = dev ? dev_name(dev) : NULL;

	struct pwm_chip *chip = NULL;

	struct pwm_device *pwm;

	struct pwm_chip *chip;

	unsigned int best = 0;

	struct pwm_lookup *p, *chosen = NULL;

	unsigned int match;

	int err;



	/* look up via DT first */

	if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
@@ -817,24 +820,35 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) 
		}

	}



	if (!chosen) {

		pwm = ERR_PTR(-ENODEV);

		goto out;

	}

	mutex_unlock(&pwm_lookup_lock);



	if (!chosen)

		return ERR_PTR(-ENODEV);



	chip = pwmchip_find_by_name(chosen->provider);



	/*

	 * If the lookup entry specifies a module, load the module and retry

	 * the PWM chip lookup. This can be used to work around driver load

	 * ordering issues if driver's can't be made to properly support the

	 * deferred probe mechanism.

	 */

	if (!chip && chosen->module) {

		err = request_module(chosen->module);

		if (err == 0)

			chip = pwmchip_find_by_name(chosen->provider);

	}



	if (!chip)

		goto out;

		return ERR_PTR(-EPROBE_DEFER);



	pwm = pwm_request_from_chip(chip, chosen->index, con_id ?: dev_id);

	if (IS_ERR(pwm))

		goto out;

		return pwm;



	pwm->args.period = chosen->period;

	pwm->args.polarity = chosen->polarity;



out:

	mutex_unlock(&pwm_lookup_lock);

	return pwm;

}

EXPORT_SYMBOL_GPL(pwm_get);
@@ -960,18 +974,6 @@ void devm_pwm_put(struct device *dev, struct pwm_device *pwm) 
}

EXPORT_SYMBOL_GPL(devm_pwm_put);



/**

  * pwm_can_sleep() - report whether PWM access will sleep

  * @pwm: PWM device

  *

  * Returns: True if accessing the PWM can sleep, false otherwise.

  */

bool pwm_can_sleep(struct pwm_device *pwm)

{

	return true;

}

EXPORT_SYMBOL_GPL(pwm_can_sleep);



#ifdef CONFIG_DEBUG_FS

static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s)

{