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

Pull pwm updates from Thierry Reding:
 "This is a very tiny pull request, with just a new driver for HiSilicon
  BVT SoCs and a cleanup for the Amlogic Meson driver.

  There are other patches on the list, but my timing was really bad this
  time and I ended up not having the time to look at them in enough
  detail to be comfortable merging them"

* tag 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: Add PWM driver for HiSilicon BVT SOCs
  pwm: meson: Remove unneeded platform MODULE_ALIAS

diff --combined drivers/pwm/pwm-meson.c
index 9d5bd7d5c610b1736eb5698b3b410de6f2c746ed,5678092cad4b6adf6e29ca471ccb0a5c39b05d07..045ef9fa6fe392a6986690fac25f3d020b470318
--- 1/drivers/pwm/pwm-meson.c
--- 2/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@@ -474,7 -474,6 +474,7 @@@ static int meson_pwm_probe(struct platf
        if (IS_ERR(meson->base))
                return PTR_ERR(meson->base);
  
 +      spin_lock_init(&meson->lock);
        meson->chip.dev = &pdev->dev;
        meson->chip.ops = &meson_pwm_ops;
        meson->chip.base = -1;
@@@ -524,7 -523,6 +524,6 @@@ static struct platform_driver meson_pwm
  };
  module_platform_driver(meson_pwm_driver);
  
- MODULE_ALIAS("platform:meson-pwm");
  MODULE_DESCRIPTION("Amlogic Meson PWM Generator driver");
  MODULE_AUTHOR("Neil Armstrong <[email protected]>");
  MODULE_LICENSE("Dual BSD/GPL");