mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
99fcc90270
This is an automatically generated commit. When doing `git bisect`, consider `git bisect --skip`. Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 2f452dd6047126c42a0ad32ef0f10145c6047d66 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Sun, 6 Jun 2021 11:05:20 -0500
|
|
Subject: [PATCH 061/117] squash? pwm: sunxi: Add Allwinner SoC PWM controller
|
|
driver
|
|
|
|
---
|
|
drivers/pwm/Kconfig | 4 ++--
|
|
drivers/pwm/pwm-sun8i-v536.c | 6 +-----
|
|
2 files changed, 3 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/pwm/Kconfig
|
|
+++ b/drivers/pwm/Kconfig
|
|
@@ -583,11 +583,11 @@ config PWM_SUN4I
|
|
will be called pwm-sun4i.
|
|
|
|
config PWM_SUN8I_V536
|
|
- tristate "Allwinner SUN8I_V536 PWM support"
|
|
+ tristate "Allwinner SUN8I V536 enhanced PWM support"
|
|
depends on ARCH_SUNXI || COMPILE_TEST
|
|
depends on HAS_IOMEM && COMMON_CLK
|
|
help
|
|
- Enhanced PWM framework driver for Allwinner R818, A133, R329,
|
|
+ Enhanced PWM framework driver for Allwinner A133, D1, R329, R818,
|
|
V536 and V833 SoCs.
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
--- a/drivers/pwm/pwm-sun8i-v536.c
|
|
+++ b/drivers/pwm/pwm-sun8i-v536.c
|
|
@@ -373,12 +373,8 @@ err_clk:
|
|
static int sun8i_pwm_remove(struct platform_device *pdev)
|
|
{
|
|
struct sun8i_pwm_chip *pc = platform_get_drvdata(pdev);
|
|
- int ret;
|
|
-
|
|
- ret = pwmchip_remove(&pc->chip);
|
|
- if (ret)
|
|
- return ret;
|
|
|
|
+ pwmchip_remove(&pc->chip);
|
|
clk_disable_unprepare(pc->clk);
|
|
reset_control_assert(pc->rst_clk);
|
|
|