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

Commit 20f9aa22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "The Meson PWM controller driver gains support for the AXG series and a
  minor bug is fixed for the STMPE driver.

  To round things off, the class is now set for PWM channels exported
  via sysfs which allows non-root access, provided that the system has
  been configured accordingly"

* tag 'pwm/for-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: meson: Add clock source configuration for Meson-AXG
  dt-bindings: pwm: Update bindings for the Meson-AXG
  pwm: stmpe: Fix wrong register offset for hwpwm=2 case
  pwm: Set class for exported channels in sysfs
parents 140995c9 bccaa3f9

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

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ Required properties: 
- compatible: Shall contain "amlogic,meson8b-pwm"

                         or "amlogic,meson-gxbb-pwm"

                         or "amlogic,meson-gxbb-ao-pwm"

                         or "amlogic,meson-axg-ee-pwm"

                         or "amlogic,meson-axg-ao-pwm"

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

  the cells format.

drivers/pwm/pwm-meson.c

+26 −0
Original line number Diff line number Diff line
@@ -411,6 +411,24 @@ static const struct meson_pwm_data pwm_gxbb_ao_data = { 
	.num_parents = ARRAY_SIZE(pwm_gxbb_ao_parent_names),

};



static const char * const pwm_axg_ee_parent_names[] = {

	"xtal", "fclk_div5", "fclk_div4", "fclk_div3"

};



static const struct meson_pwm_data pwm_axg_ee_data = {

	.parent_names = pwm_axg_ee_parent_names,

	.num_parents = ARRAY_SIZE(pwm_axg_ee_parent_names),

};



static const char * const pwm_axg_ao_parent_names[] = {

	"aoclk81", "xtal", "fclk_div4", "fclk_div5"

};



static const struct meson_pwm_data pwm_axg_ao_data = {

	.parent_names = pwm_axg_ao_parent_names,

	.num_parents = ARRAY_SIZE(pwm_axg_ao_parent_names),

};



static const struct of_device_id meson_pwm_matches[] = {

	{

		.compatible = "amlogic,meson8b-pwm",
@@ -424,6 +442,14 @@ static const struct of_device_id meson_pwm_matches[] = { 
		.compatible = "amlogic,meson-gxbb-ao-pwm",

		.data = &pwm_gxbb_ao_data

	},

	{

		.compatible = "amlogic,meson-axg-ee-pwm",

		.data = &pwm_axg_ee_data

	},

	{

		.compatible = "amlogic,meson-axg-ao-pwm",

		.data = &pwm_axg_ao_data

	},

	{},

};

MODULE_DEVICE_TABLE(of, meson_pwm_matches);

drivers/pwm/pwm-stmpe.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int stmpe_24xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, 
		break;



	case 2:

		offset = STMPE24XX_PWMIC1;

		offset = STMPE24XX_PWMIC2;

		break;



	default:

drivers/pwm/sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static int pwm_export_child(struct device *parent, struct pwm_device *pwm) 
	export->pwm = pwm;

	mutex_init(&export->lock);



	export->child.class = parent->class;

	export->child.release = pwm_export_release;

	export->child.parent = parent;

	export->child.devt = MKDEV(0, 0);