diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-12 14:11:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-12 14:11:05 -0400 |
commit | b67be92feb486f800d80d72c67fd87b47b79b18e (patch) | |
tree | fcd22ae553cc094be6fcee8f2d3f99661793d165 /drivers/pwm/pwm-tipwmss.c | |
parent | 2d2474a194652f55c7af51068db3c1b851f16711 (diff) | |
parent | dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52 (diff) |
Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding:
"This set of changes contains support for PWM signal capture in the STi
driver as well as support for the PWM controller found on Meson SoCs.
There's also support added for the MediaTek MT2701 and SunXi H3 to the
existing drivers.
Other than that there's a fair set of miscellaneous cleanups and fixes
across the board"
* tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (24 commits)
pwm: meson: Handle unknown ID values
pwm: sti: Take the opportunity to conduct a little house keeping
pwm: sti: It's now valid for number of PWM channels to be zero
pwm: sti: Add PWM capture callback
pwm: sti: Add support for PWM capture interrupts
pwm: sti: Initialise PWM capture device data
pwm: sti: Supply PWM Capture clock handling
pwm: sti: Supply PWM capture register addresses and bit locations
pwm: sti: Only request clock rate when needed
pwm: sti: Reorganise register names in preparation for new functionality
pwm: sti: Rename channel => device
dt-bindings: pwm: sti: Update DT bindings for capture support
pwm: lpc-18xx: use pwm_set_chip_data
pwm: sunxi: Add H3 support
pwm: Add support for Meson PWM Controller
dt-bindings: pwm: Add bindings for Meson PWM Controller
pwm: samsung: Fix to use lowest div for large enough modulation bits
pwm: pwm-tipwmss: Remove all runtime PM gets/puts
pwm: cros-ec: Add __packed to prevent padding
pwm: Add MediaTek MT2701 display PWM driver support
...
Diffstat (limited to 'drivers/pwm/pwm-tipwmss.c')
-rw-r--r-- | drivers/pwm/pwm-tipwmss.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/pwm/pwm-tipwmss.c b/drivers/pwm/pwm-tipwmss.c index 829f4991c96f..7fa85a1604da 100644 --- a/drivers/pwm/pwm-tipwmss.c +++ b/drivers/pwm/pwm-tipwmss.c | |||
@@ -34,7 +34,6 @@ static int pwmss_probe(struct platform_device *pdev) | |||
34 | struct device_node *node = pdev->dev.of_node; | 34 | struct device_node *node = pdev->dev.of_node; |
35 | 35 | ||
36 | pm_runtime_enable(&pdev->dev); | 36 | pm_runtime_enable(&pdev->dev); |
37 | pm_runtime_get_sync(&pdev->dev); | ||
38 | 37 | ||
39 | /* Populate all the child nodes here... */ | 38 | /* Populate all the child nodes here... */ |
40 | ret = of_platform_populate(node, NULL, NULL, &pdev->dev); | 39 | ret = of_platform_populate(node, NULL, NULL, &pdev->dev); |
@@ -46,31 +45,13 @@ static int pwmss_probe(struct platform_device *pdev) | |||
46 | 45 | ||
47 | static int pwmss_remove(struct platform_device *pdev) | 46 | static int pwmss_remove(struct platform_device *pdev) |
48 | { | 47 | { |
49 | pm_runtime_put_sync(&pdev->dev); | ||
50 | pm_runtime_disable(&pdev->dev); | 48 | pm_runtime_disable(&pdev->dev); |
51 | return 0; | 49 | return 0; |
52 | } | 50 | } |
53 | 51 | ||
54 | #ifdef CONFIG_PM_SLEEP | ||
55 | static int pwmss_suspend(struct device *dev) | ||
56 | { | ||
57 | pm_runtime_put_sync(dev); | ||
58 | return 0; | ||
59 | } | ||
60 | |||
61 | static int pwmss_resume(struct device *dev) | ||
62 | { | ||
63 | pm_runtime_get_sync(dev); | ||
64 | return 0; | ||
65 | } | ||
66 | #endif | ||
67 | |||
68 | static SIMPLE_DEV_PM_OPS(pwmss_pm_ops, pwmss_suspend, pwmss_resume); | ||
69 | |||
70 | static struct platform_driver pwmss_driver = { | 52 | static struct platform_driver pwmss_driver = { |
71 | .driver = { | 53 | .driver = { |
72 | .name = "pwmss", | 54 | .name = "pwmss", |
73 | .pm = &pwmss_pm_ops, | ||
74 | .of_match_table = pwmss_of_match, | 55 | .of_match_table = pwmss_of_match, |
75 | }, | 56 | }, |
76 | .probe = pwmss_probe, | 57 | .probe = pwmss_probe, |