Commit 3fb55dd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm updates from Thierry Reding:
 "The Rockchip and Mediatek drivers gain support for more chips and the
  LPSS driver undergoes some refactoring and receives some improvements.

  Other than that there are various cleanups of the core"

* tag 'pwm/for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: sysfs: Replace sprintf() with sysfs_emit()
  pwm: core: Replace custom implementation of device_match_fwnode()
  pwm: lpss: Add a comment to the bypass field
  pwm: lpss: Make use of bits.h macros for all masks
  pwm: lpss: Use DEFINE_RUNTIME_DEV_PM_OPS() and pm_ptr() macros
  pwm: lpss: Use device_get_match_data() to get device data
  pwm: lpss: Move resource mapping to the glue drivers
  pwm: lpss: Move exported symbols to PWM_LPSS namespace
  pwm: lpss: Deduplicate board info data structures
  dt-bindings: pwm: Add compatible for Mediatek MT8188
  dt-bindings: pwm: rockchip: Add rockchip,rk3128-pwm
  dt-bindings: pwm: rockchip: Add description for rk3588
  pwm: sysfs: Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
  pwm: rockchip: Convert to use dev_err_probe()
parents ae955959 4709f9ea

Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
      - items:

          - enum:

              - mediatek,mt8186-disp-pwm

              - mediatek,mt8188-disp-pwm

              - mediatek,mt8192-disp-pwm

              - mediatek,mt8195-disp-pwm

          - const: mediatek,mt8183-disp-pwm

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
          - const: rockchip,rk2928-pwm

      - items:

          - enum:

              - rockchip,rk3128-pwm

              - rockchip,rk3368-pwm

              - rockchip,rk3399-pwm

              - rockchip,rv1108-pwm
@@ -30,6 +31,7 @@ properties: 
              - rockchip,px30-pwm

              - rockchip,rk3308-pwm

              - rockchip,rk3568-pwm

              - rockchip,rk3588-pwm

          - const: rockchip,rk3328-pwm



  reg:

drivers/pwm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static struct pwm_chip *fwnode_to_pwmchip(struct fwnode_handle *fwnode) 
	mutex_lock(&pwm_lock);



	list_for_each_entry(chip, &pwm_chips, list)

		if (chip->dev && dev_fwnode(chip->dev) == fwnode) {

		if (chip->dev && device_match_fwnode(chip->dev, fwnode)) {

			mutex_unlock(&pwm_lock);

			return chip;

		}

drivers/pwm/pwm-lpss-pci.c

+11 −37
Original line number Diff line number Diff line
@@ -14,35 +14,6 @@ 


#include "pwm-lpss.h"



/* BayTrail */

static const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {

	.clk_rate = 25000000,

	.npwm = 1,

	.base_unit_bits = 16,

};



/* Braswell */

static const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {

	.clk_rate = 19200000,

	.npwm = 1,

	.base_unit_bits = 16,

};



/* Broxton */

static const struct pwm_lpss_boardinfo pwm_lpss_bxt_info = {

	.clk_rate = 19200000,

	.npwm = 4,

	.base_unit_bits = 22,

	.bypass = true,

};



/* Tangier */

static const struct pwm_lpss_boardinfo pwm_lpss_tng_info = {

	.clk_rate = 19200000,

	.npwm = 4,

	.base_unit_bits = 22,

};



static int pwm_lpss_probe_pci(struct pci_dev *pdev,

			      const struct pci_device_id *id)

{
@@ -54,8 +25,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev, 
	if (err < 0)

		return err;



	err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));

	if (err)

		return err;



	info = (struct pwm_lpss_boardinfo *)id->driver_data;

	lpwm = pwm_lpss_probe(&pdev->dev, &pdev->resource[0], info);

	lpwm = pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info);

	if (IS_ERR(lpwm))

		return PTR_ERR(lpwm);
@@ -73,7 +48,6 @@ static void pwm_lpss_remove_pci(struct pci_dev *pdev) 
	pm_runtime_get_sync(&pdev->dev);

}



#ifdef CONFIG_PM

static int pwm_lpss_runtime_suspend_pci(struct device *dev)

{

	/*
@@ -87,12 +61,11 @@ static int pwm_lpss_runtime_resume_pci(struct device *dev) 
{

	return 0;

}

#endif



static const struct dev_pm_ops pwm_lpss_pci_pm = {

	SET_RUNTIME_PM_OPS(pwm_lpss_runtime_suspend_pci,

			   pwm_lpss_runtime_resume_pci, NULL)

};

static DEFINE_RUNTIME_DEV_PM_OPS(pwm_lpss_pci_pm,

				 pwm_lpss_runtime_suspend_pci,

				 pwm_lpss_runtime_resume_pci,

				 NULL);



static const struct pci_device_id pwm_lpss_pci_ids[] = {

	{ PCI_VDEVICE(INTEL, 0x0ac8), (unsigned long)&pwm_lpss_bxt_info},
@@ -114,10 +87,11 @@ static struct pci_driver pwm_lpss_driver_pci = { 
	.probe = pwm_lpss_probe_pci,

	.remove = pwm_lpss_remove_pci,

	.driver = {

		.pm = &pwm_lpss_pci_pm,

		.pm = pm_ptr(&pwm_lpss_pci_pm),

	},

};

module_pci_driver(pwm_lpss_driver_pci);



MODULE_DESCRIPTION("PWM PCI driver for Intel LPSS");

MODULE_LICENSE("GPL v2");

MODULE_IMPORT_NS(PWM_LPSS);

drivers/pwm/pwm-lpss-platform.c

+10 −30
Original line number Diff line number Diff line
@@ -7,52 +7,31 @@ 
 * Derived from the original pwm-lpss.c

 */



#include <linux/acpi.h>

#include <linux/kernel.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/property.h>



#include "pwm-lpss.h"



/* BayTrail */

static const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {

	.clk_rate = 25000000,

	.npwm = 1,

	.base_unit_bits = 16,

};



/* Braswell */

static const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {

	.clk_rate = 19200000,

	.npwm = 1,

	.base_unit_bits = 16,

	.other_devices_aml_touches_pwm_regs = true,

};



/* Broxton */

static const struct pwm_lpss_boardinfo pwm_lpss_bxt_info = {

	.clk_rate = 19200000,

	.npwm = 4,

	.base_unit_bits = 22,

	.bypass = true,

};



static int pwm_lpss_probe_platform(struct platform_device *pdev)

{

	const struct pwm_lpss_boardinfo *info;

	const struct acpi_device_id *id;

	struct pwm_lpss_chip *lpwm;

	struct resource *r;

	void __iomem *base;



	id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);

	if (!id)

	info = device_get_match_data(&pdev->dev);

	if (!info)

		return -ENODEV;



	info = (const struct pwm_lpss_boardinfo *)id->driver_data;

	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);



	lpwm = pwm_lpss_probe(&pdev->dev, r, info);

	lpwm = pwm_lpss_probe(&pdev->dev, base, info);

	if (IS_ERR(lpwm))

		return PTR_ERR(lpwm);
@@ -110,4 +89,5 @@ module_platform_driver(pwm_lpss_driver_platform); 


MODULE_DESCRIPTION("PWM platform driver for Intel LPSS");

MODULE_LICENSE("GPL v2");

MODULE_IMPORT_NS(PWM_LPSS);

MODULE_ALIAS("platform:pwm-lpss");