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

Commit 8eb96127 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Bryan Wu
Browse files

pwm: core: Rename of_pwm_request() to of_pwm_get() and export it 



Allow client driver to use of_pwm_get() to get the PWM they need. This
is needed for drivers which handle more than one PWM separately, like
leds-pwm driver, which have:

pwmleds {
	compatible = "pwm-leds";
	kpad {
		label = "omap4::keypad";
		pwms = <&twl_pwm 0 7812500>;
		max-brightness = <127>;
	};

	charging {
		label = "omap4:green:chrg";
		pwms = <&twl_pwmled 0 7812500>;
		max-brightness = <255>;
	};
};

in the dts files.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarBryan Wu <cooloney@gmail.com>
parent d4c0c470

drivers/pwm/core.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -471,7 +471,7 @@ static struct pwm_chip *of_node_to_pwmchip(struct device_node *np) 
}

}





/**

/**

 * of_pwm_request() - request a PWM via the PWM framework

 * of_pwm_get() - request a PWM via the PWM framework

 * @np: device node to get the PWM from

 * @np: device node to get the PWM from

 * @con_id: consumer name

 * @con_id: consumer name

 *

 *
@@ -486,8 +486,7 @@ static struct pwm_chip *of_node_to_pwmchip(struct device_node *np) 
 * becomes mandatory for devices that look up the PWM device via the con_id

 * becomes mandatory for devices that look up the PWM device via the con_id

 * parameter.

 * parameter.

 */

 */

static struct pwm_device *of_pwm_request(struct device_node *np,

struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id)

					 const char *con_id)

{

{

	struct pwm_device *pwm = NULL;

	struct pwm_device *pwm = NULL;

	struct of_phandle_args args;

	struct of_phandle_args args;
@@ -545,6 +544,7 @@ static struct pwm_device *of_pwm_request(struct device_node *np, 




	return pwm;

	return pwm;

}

}

EXPORT_SYMBOL_GPL(of_pwm_get);





/**

/**

 * pwm_add_table() - register PWM device consumers

 * pwm_add_table() - register PWM device consumers
@@ -587,7 +587,7 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) 




	/* look up via DT first */

	/* look up via DT first */

	if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)

	if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)

		return of_pwm_request(dev->of_node, con_id);

		return of_pwm_get(dev->of_node, con_id);





	/*

	/*

	 * We look up the provider in the static table typically provided by

	 * We look up the provider in the static table typically provided by

include/linux/pwm.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,7 @@ struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *pc, 
		const struct of_phandle_args *args);

		const struct of_phandle_args *args);





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

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

struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id);

void pwm_put(struct pwm_device *pwm);

void pwm_put(struct pwm_device *pwm);





struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);

struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);
@@ -213,6 +214,12 @@ static inline struct pwm_device *pwm_get(struct device *dev, 
	return ERR_PTR(-ENODEV);

	return ERR_PTR(-ENODEV);

}

}





static inline struct pwm_device *of_pwm_get(struct device_node *np,

					    const char *con_id)

{

	return ERR_PTR(-ENODEV);

}



static inline void pwm_put(struct pwm_device *pwm)

static inline void pwm_put(struct pwm_device *pwm)

{

{

}

}