Commit f3bfe643 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "This contains a few fixes and a bunch of cleanups, a lot of which is
  in preparation for Uwe's character device support that may be ready in
  time for the next merge window"

* tag 'pwm/for-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (37 commits)
  pwm: samsung: Document new member .channel in struct samsung_pwm_chip
  pwm: bcm2835: Add support for suspend/resume
  pwm: brcmstb: Checked clk_prepare_enable() return value
  pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume
  pwm: pxa: Explicitly include correct DT includes
  pwm: cros-ec: Simplify using devm_pwmchip_add() and dev_err_probe()
  pwm: samsung: Consistently use the same name for driver data
  pwm: vt8500: Simplify using devm functions
  pwm: sprd: Simplify using devm_pwmchip_add() and dev_err_probe()
  pwm: sprd: Provide a helper to cast a chip to driver data
  pwm: spear: Simplify using devm functions
  pwm: mtk-disp: Simplify using devm_pwmchip_add()
  pwm: imx-tpm: Simplify using devm functions
  pwm: brcmstb: Simplify using devm functions
  pwm: bcm2835: Simplify using devm functions
  pwm: bcm-iproc: Simplify using devm functions
  pwm: Adapt sysfs API documentation to reality
  pwm: dwc: add PWM bit unset in get_state call
  pwm: dwc: make timer clock configurable
  pwm: dwc: split pci out of core driver
  ...
parents 4bbdb725 40592064

Documentation/devicetree/bindings/pwm/mxs-pwm.yaml

+11 −2
Original line number Diff line number Diff line
@@ -15,12 +15,19 @@ allOf: 


properties:

  compatible:

    enum:

      - fsl,imx23-pwm

    oneOf:

      - const: fsl,imx23-pwm

      - items:

          - enum:

              - fsl,imx28-pwm

          - const: fsl,imx23-pwm



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  "#pwm-cells":

    const: 3
@@ -31,6 +38,7 @@ properties: 
required:

  - compatible

  - reg

  - clocks

  - fsl,pwm-number



additionalProperties: false
@@ -40,6 +48,7 @@ examples: 
    pwm@80064000 {

        compatible = "fsl,imx23-pwm";

        reg = <0x80064000 0x2000>;

        clocks = <&clks 30>;

        #pwm-cells = <3>;

        fsl,pwm-number = <8>;

    };

drivers/gpio/gpio-mvebu.c

+0 −1
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ static const struct pwm_ops mvebu_pwm_ops = { 
	.free = mvebu_pwm_free,

	.get_state = mvebu_pwm_get_state,

	.apply = mvebu_pwm_apply,

	.owner = THIS_MODULE,

};



static void __maybe_unused mvebu_pwm_suspend(struct mvebu_gpio_chip *mvchip)

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+0 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,6 @@ static const struct pwm_ops ti_sn_pwm_ops = { 
	.free = ti_sn_pwm_free,

	.apply = ti_sn_pwm_apply,

	.get_state = ti_sn_pwm_get_state,

	.owner = THIS_MODULE,

};



static int ti_sn_pwm_probe(struct auxiliary_device *adev,

drivers/leds/rgb/leds-qcom-lpg.c

+0 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,6 @@ static const struct pwm_ops lpg_pwm_ops = { 
	.request = lpg_pwm_request,

	.apply = lpg_pwm_apply,

	.get_state = lpg_pwm_get_state,

	.owner = THIS_MODULE,

};



static int lpg_add_pwm(struct lpg *lpg)

drivers/pwm/Kconfig

+15 −5
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ config PWM_CLPS711X 
	  will be called pwm-clps711x.



config PWM_CRC

	bool "Intel Crystalcove (CRC) PWM support"

	depends on X86 && INTEL_SOC_PMIC

	tristate "Intel Crystalcove (CRC) PWM support"

	depends on INTEL_SOC_PMIC

	help

	  Generic PWM framework driver for Crystalcove (CRC) PMIC based PWM

	  control.
@@ -186,9 +186,19 @@ config PWM_CROS_EC 
	  PWM driver for exposing a PWM attached to the ChromeOS Embedded

	  Controller.



config PWM_DWC_CORE

	tristate

	depends on HAS_IOMEM

	help

	  PWM driver for Synopsys DWC PWM Controller.



	  To compile this driver as a module, build the dependecies as

	  modules, this will be called pwm-dwc-core.



config PWM_DWC

	tristate "DesignWare PWM Controller"

	depends on PCI

	tristate "DesignWare PWM Controller (PCI bus)"

	depends on HAS_IOMEM && PCI

	select PWM_DWC_CORE

	help

	  PWM driver for Synopsys DWC PWM Controller attached to a PCI bus.
@@ -407,7 +417,7 @@ config PWM_MEDIATEK 


config PWM_MICROCHIP_CORE

	tristate "Microchip corePWM PWM support"

	depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST

	depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST

	depends on HAS_IOMEM && OF

	help

	  PWM driver for Microchip FPGA soft IP core.