From patchwork Wed Nov 25 09:41:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 7696681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C770EBF90C for ; Wed, 25 Nov 2015 09:47:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFE2720890 for ; Wed, 25 Nov 2015 09:47:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E982720881 for ; Wed, 25 Nov 2015 09:47:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1Wdr-00011r-Jp; Wed, 25 Nov 2015 09:45:35 +0000 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1Wdn-0000xd-Rx for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2015 09:45:32 +0000 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id tAP9dmtR002156; Wed, 25 Nov 2015 01:45:07 -0800 Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0a-0016f401.pphosted.com with ESMTP id 1yd8gnga2a-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 25 Nov 2015 01:45:06 -0800 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Wed, 25 Nov 2015 01:45:05 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1044.25 via Frontend Transport; Wed, 25 Nov 2015 01:45:05 -0800 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id 892E83F703F; Wed, 25 Nov 2015 01:45:04 -0800 (PST) From: Jisheng Zhang To: , , Subject: [PATCH v2] pwm: berlin: Add PM support Date: Wed, 25 Nov 2015 17:41:25 +0800 Message-ID: <1448444485-4857-1-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2015-11-25_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=inbound_notspam policy=inbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1511250172 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151125_014531_974890_571C3CF9 X-CRM114-Status: GOOD ( 16.98 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jisheng Zhang , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds S2R support for berlin pwm driver. Signed-off-by: Jisheng Zhang --- Since v1: - implement .request and .free hooks, allocate/free the channel in berlin_pwm_request/berlin_pwm_free. Then use pwm_get_chip_data in suspend/resume implementation. - s/int/unsigned int - check return value of clk_prepare_enable - remoev BERLIN_PWM_PM_OPS macro drivers/pwm/pwm-berlin.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c index 6510812..a66b9ff 100644 --- a/drivers/pwm/pwm-berlin.c +++ b/drivers/pwm/pwm-berlin.c @@ -16,6 +16,7 @@ #include #include #include +#include #define BERLIN_PWM_EN 0x0 #define BERLIN_PWM_ENABLE BIT(0) @@ -27,6 +28,15 @@ #define BERLIN_PWM_TCNT 0xc #define BERLIN_PWM_MAX_TCNT 65535 +#define NUM_PWM_CHANNEL 4 /* berlin PWM channels */ + +struct berlin_pwm_channel { + u32 enable; + u32 ctrl; + u32 duty; + u32 tcnt; +}; + struct berlin_pwm_chip { struct pwm_chip chip; struct clk *clk; @@ -55,6 +65,28 @@ static inline void berlin_pwm_writel(struct berlin_pwm_chip *chip, writel_relaxed(value, chip->base + channel * 0x10 + offset); } +static int berlin_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm_dev) +{ + struct berlin_pwm_channel *chan; + + if (pwm_dev->hwpwm >= NUM_PWM_CHANNEL) + return -EINVAL; + + chan = kzalloc(sizeof(*chan), GFP_KERNEL); + if (!chan) + return -ENOMEM; + + return pwm_set_chip_data(pwm_dev, chan); +} + +static void berlin_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm_dev) +{ + struct berlin_pwm_channel *chan = pwm_get_chip_data(pwm_dev); + + kfree(chan); + pwm_set_chip_data(pwm_dev, NULL); +} + static int berlin_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm_dev, int duty_ns, int period_ns) { @@ -137,6 +169,8 @@ static void berlin_pwm_disable(struct pwm_chip *chip, } static const struct pwm_ops berlin_pwm_ops = { + .request = berlin_pwm_request, + .free = berlin_pwm_free, .config = berlin_pwm_config, .set_polarity = berlin_pwm_set_polarity, .enable = berlin_pwm_enable, @@ -176,7 +210,7 @@ static int berlin_pwm_probe(struct platform_device *pdev) pwm->chip.dev = &pdev->dev; pwm->chip.ops = &berlin_pwm_ops; pwm->chip.base = -1; - pwm->chip.npwm = 4; + pwm->chip.npwm = NUM_PWM_CHANNEL; pwm->chip.can_sleep = true; pwm->chip.of_xlate = of_pwm_xlate_with_flags; pwm->chip.of_pwm_n_cells = 3; @@ -204,12 +238,66 @@ static int berlin_pwm_remove(struct platform_device *pdev) return ret; } +#ifdef CONFIG_PM_SLEEP +static int berlin_pwm_suspend(struct device *dev) +{ + unsigned int i; + struct berlin_pwm_chip *pwm = dev_get_drvdata(dev); + + for (i = 0; i < pwm->chip.npwm; i++) { + struct pwm_device *pwm_dev = &pwm->chip.pwms[i]; + struct berlin_pwm_channel *chan = pwm_get_chip_data(pwm_dev); + + if (!chan) + continue; + + chan->enable = berlin_pwm_readl(pwm, i, BERLIN_PWM_ENABLE); + chan->ctrl = berlin_pwm_readl(pwm, i, BERLIN_PWM_CONTROL); + chan->duty = berlin_pwm_readl(pwm, i, BERLIN_PWM_DUTY); + chan->tcnt = berlin_pwm_readl(pwm, i, BERLIN_PWM_TCNT); + } + clk_disable_unprepare(pwm->clk); + + return 0; +} + +static int berlin_pwm_resume(struct device *dev) +{ + int ret; + unsigned int i; + struct berlin_pwm_chip *pwm = dev_get_drvdata(dev); + + ret = clk_prepare_enable(pwm->clk); + if (ret) + return ret; + + for (i = 0; i < pwm->chip.npwm; i++) { + struct pwm_device *pwm_dev = &pwm->chip.pwms[i]; + struct berlin_pwm_channel *chan = pwm_get_chip_data(pwm_dev); + + if (!chan) + continue; + + berlin_pwm_writel(pwm, i, chan->ctrl, BERLIN_PWM_CONTROL); + berlin_pwm_writel(pwm, i, chan->duty, BERLIN_PWM_DUTY); + berlin_pwm_writel(pwm, i, chan->tcnt, BERLIN_PWM_TCNT); + berlin_pwm_writel(pwm, i, chan->enable, BERLIN_PWM_ENABLE); + } + + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(berlin_pwm_pm_ops, berlin_pwm_suspend, + berlin_pwm_resume); + static struct platform_driver berlin_pwm_driver = { .probe = berlin_pwm_probe, .remove = berlin_pwm_remove, .driver = { .name = "berlin-pwm", .of_match_table = berlin_pwm_match, + .pm = &berlin_pwm_pm_ops, }, }; module_platform_driver(berlin_pwm_driver);