From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA7B9C43387 for ; Wed, 16 Jan 2019 20:15:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C2CE20840 for ; Wed, 16 Jan 2019 20:15:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BEsyM9jT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="cHKFfRQ5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C2CE20840 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dxtB7lqAYbc1nNM/cdNvJocgl2zDTbdn2bNweALD89c=; b=BEsyM9jTuViuhf6/NrtNNDFstH cX7FzIXfoyaKkvfKoHiD2JD9sNJ9U//CjKRz3nVUWl6/oj68CVvhKG3oD/DQeWov1VZrNsIttQrvt d8JkQ/gt6qP/gL9RLdqCSHyvdGEYTvyvKrN8z9odLvoYBmIqSh6j4w3IAnimBTgXsWOok2qd5juOi MGe36elH77f3Kn81wRfGEX90bFY5Kt+q8A6oZtO5N1cxVLmGKrb8vKVdydMwXEXQ/CmuQX2M/DYDR eZTGuciWWwhWHPbdeVGNJ1viwdS5RNpJzRnjIZHWnWHgXx2mW8u5eEWFh4GWv6q+arYRjvCWeECRM r5HCWPXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjrbO-0005Bw-4r; Wed, 16 Jan 2019 20:15:54 +0000 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjrac-0003GV-N3 for linux-arm-kernel@lists.infradead.org; Wed, 16 Jan 2019 20:15:13 +0000 Received: by mail-yw1-xc44.google.com with SMTP id k188so2934095ywa.6 for ; Wed, 16 Jan 2019 12:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=awa79T+kyx6VZKS7urmfQCd1R09XTg+c5Pfm4+eLFDE=; b=cHKFfRQ5YKjciYjd8iziH+qR38wH3iMnFxB5C7Xnxrc3Cr4iW9rDOCfaDOdilHUnMN TNon+oSQDVjeUoUZHYw3qaGIrU705oze7rfC5xJpX4dBUsEmcGGt01bt9/8+NlM4xK4h 6fiK4p2Qq0ffUoJ+KxLbIdPfoQ15yez+oeHDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=awa79T+kyx6VZKS7urmfQCd1R09XTg+c5Pfm4+eLFDE=; b=WQGlozaPqYnK+uBReq1IYqoMvkrOX7ZZ+2n2vqbodaDmRfVg04lJntwZHbjlgTWpR8 6oBZVKhXMaW5BjZIO/cQjNE75e9fI+Bx+RnDsxj5Hi5nNFS9TpshN5bkTJoucaToL3ss AtBzF15QkeFDE7spSIkgbWZNb5IB8kNXCRl1ncxxSEqisvGuZsWzuFtio+TkDGl0ACT4 tF3ltqYvT+Nn7Sv9EP6x4taCOIREmNl0dxSkiC6bA4DxmLkz6RUa4ITLWz+GR4DLvDQY SCEacr+rzQPRywpne43ex+NW6yRCTSkNREK2UYLh2PSuIJl3N7H6EELd1W//MHMGukUw riqg== X-Gm-Message-State: AJcUukfCVOVdSkgosAHVYwmfvbq7Yl3DutVtRgceHr4HHX10SFBbJBm5 E95FIKsdi5ebmglEv4PH8xUKLQ== X-Google-Smtp-Source: ALg8bN7+atlby7ihq5YcsnR59OrsRycWnio8d0DP9VHzmvb+R7NsMJlc/CpqwTUChIoOsKv0xJOYZg== X-Received: by 2002:a81:3358:: with SMTP id z85mr9364471ywz.398.1547669705220; Wed, 16 Jan 2019 12:15:05 -0800 (PST) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id w63sm2541026ywc.46.2019.01.16.12.15.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 12:15:04 -0800 (PST) From: Sheetal Tigadoli To: Thierry Reding , Rob Herring , Mark Rutland , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V2 3/4] drivers: pwm: pwm-bcm-kona: Add cygnus-pwm support Date: Thu, 17 Jan 2019 01:45:15 +0530 Message-Id: <1547669716-20070-4-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547669716-20070-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1547669716-20070-1-git-send-email-sheetal.tigadoli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190116_121507_738025_8F9E4F45 X-CRM114-Status: GOOD ( 20.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, Sheetal Tigadoli , Praveen Kumar B , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Praveen Kumar B Add support for new version of pwm-cygnus. Add support to make PWM changes configured and stable. Signed-off-by: Praveen Kumar B Reviewed-by: Ray Jui Reviewed-by: Scott Branden Signed-off-by: Sheetal Tigadoli --- drivers/pwm/pwm-bcm-kona.c | 95 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 19 deletions(-) diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c index fe63289..143843f 100644 --- a/drivers/pwm/pwm-bcm-kona.c +++ b/drivers/pwm/pwm-bcm-kona.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -65,10 +66,19 @@ #define DUTY_CYCLE_HIGH_MIN (0x00000000) #define DUTY_CYCLE_HIGH_MAX (0x00ffffff) +#define PWM_MONITOR_OFFSET 0xb0 +#define PWM_MONITOR_TIMEOUT_US 5 + +enum kona_pwmc_ver { + KONA_PWM = 1, + CYGNUS_PWM +}; + struct kona_pwmc { struct pwm_chip chip; void __iomem *base; struct clk *clk; + enum kona_pwmc_ver version; }; static inline struct kona_pwmc *to_kona_pwmc(struct pwm_chip *_chip) @@ -76,10 +86,36 @@ static inline struct kona_pwmc *to_kona_pwmc(struct pwm_chip *_chip) return container_of(_chip, struct kona_pwmc, chip); } +static int kona_pwmc_wait_stable(struct pwm_chip *chip, unsigned int chan, + unsigned int kona_ver) +{ + struct kona_pwmc *kp = to_kona_pwmc(chip); + unsigned int value; + + switch (kona_ver) { + case KONA_PWM: + /* + * There must be a min 400ns delay between clearing trigger and + * settingit. Failing to do this may result in no PWM signal. + */ + ndelay(400); + return 0; + + case CYGNUS_PWM: + return readl_poll_timeout(kp->base + PWM_MONITOR_OFFSET, value, + !(value & (BIT(chan))), 0, + PWM_MONITOR_TIMEOUT_US); + + default: + return -ENODEV; + + } +} + /* * Clear trigger bit but set smooth bit to maintain old output. */ -static void kona_pwmc_prepare_for_settings(struct kona_pwmc *kp, +static int kona_pwmc_prepare_for_settings(struct kona_pwmc *kp, unsigned int chan) { unsigned int value = readl(kp->base + PWM_CONTROL_OFFSET); @@ -88,14 +124,10 @@ static void kona_pwmc_prepare_for_settings(struct kona_pwmc *kp, value &= ~(1 << PWM_CONTROL_TRIGGER_SHIFT(chan)); writel(value, kp->base + PWM_CONTROL_OFFSET); - /* - * There must be a min 400ns delay between clearing trigger and setting - * it. Failing to do this may result in no PWM signal. - */ - ndelay(400); + return kona_pwmc_wait_stable(&kp->chip, chan, kp->version); } -static void kona_pwmc_apply_settings(struct kona_pwmc *kp, unsigned int chan) +static int kona_pwmc_apply_settings(struct kona_pwmc *kp, unsigned int chan) { unsigned int value = readl(kp->base + PWM_CONTROL_OFFSET); @@ -104,8 +136,7 @@ static void kona_pwmc_apply_settings(struct kona_pwmc *kp, unsigned int chan) value |= 1 << PWM_CONTROL_TRIGGER_SHIFT(chan); writel(value, kp->base + PWM_CONTROL_OFFSET); - /* Trigger bit must be held high for at least 400 ns. */ - ndelay(400); + return kona_pwmc_wait_stable(&kp->chip, chan, kp->version); } static void kona_pwmc_disable(struct pwm_chip *chip, struct pwm_device *pwm) @@ -113,8 +144,13 @@ static void kona_pwmc_disable(struct pwm_chip *chip, struct pwm_device *pwm) struct kona_pwmc *kp = to_kona_pwmc(chip); unsigned int chan = pwm->hwpwm; unsigned int value; + int ret; - kona_pwmc_prepare_for_settings(kp, chan); + ret = kona_pwmc_prepare_for_settings(kp, chan); + if (ret < 0) { + dev_err(chip->dev, "failed to prepare pwm settings: %d\n", ret); + return; + } /* Simulate a disable by configuring for zero duty */ writel(0, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); @@ -125,7 +161,11 @@ static void kona_pwmc_disable(struct pwm_chip *chip, struct pwm_device *pwm) value &= ~PRESCALE_MASK(chan); writel(value, kp->base + PRESCALE_OFFSET); - kona_pwmc_apply_settings(kp, chan); + ret = kona_pwmc_apply_settings(kp, chan); + if (ret < 0) { + dev_err(chip->dev, "failed to apply pwm settings: %d\n", ret); + return; + } clk_disable_unprepare(kp->clk); } @@ -188,7 +228,12 @@ static int kona_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm, } } - kona_pwmc_prepare_for_settings(kp, chan); + ret = kona_pwmc_prepare_for_settings(kp, chan); + if (ret < 0) { + dev_err(chip->dev, + "failed to prepare pwm settings: %d\n", ret); + return ret; + } value = readl(kp->base + PRESCALE_OFFSET); value &= ~PRESCALE_MASK(chan); @@ -208,7 +253,12 @@ static int kona_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm, writel(value, kp->base + PWM_CONTROL_OFFSET); } - kona_pwmc_apply_settings(kp, chan); + ret = kona_pwmc_apply_settings(kp, chan); + if (ret < 0) { + dev_err(chip->dev, + "failed to prepare pwm settings: %d\n", ret); + return ret; + } } else if (cstate.enabled) { kona_pwmc_disable(chip, pwm); } @@ -221,14 +271,26 @@ static int kona_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm, .owner = THIS_MODULE, }; +static const struct of_device_id bcm_kona_pwmc_dt[] = { + { .compatible = "brcm,kona-pwm", .data = (void *)KONA_PWM}, + { .compatible = "brcm,cygnus-pwm", .data = (void *)CYGNUS_PWM}, + { }, +}; +MODULE_DEVICE_TABLE(of, bcm_kona_pwmc_dt); + static int kona_pwmc_probe(struct platform_device *pdev) { struct kona_pwmc *kp; struct resource *res; + const struct of_device_id *of_id; unsigned int chan; unsigned int value = 0; int ret = 0; + of_id = of_match_node(bcm_kona_pwmc_dt, pdev->dev.of_node); + if (!of_id) + return -ENODEV; + kp = devm_kzalloc(&pdev->dev, sizeof(*kp), GFP_KERNEL); if (kp == NULL) return -ENOMEM; @@ -241,6 +303,7 @@ static int kona_pwmc_probe(struct platform_device *pdev) kp->chip.npwm = 6; kp->chip.of_xlate = of_pwm_xlate_with_flags; kp->chip.of_pwm_n_cells = 3; + kp->version = (enum kona_pwmc_ver)of_id->data; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); kp->base = devm_ioremap_resource(&pdev->dev, res); @@ -287,12 +350,6 @@ static int kona_pwmc_remove(struct platform_device *pdev) return pwmchip_remove(&kp->chip); } -static const struct of_device_id bcm_kona_pwmc_dt[] = { - { .compatible = "brcm,kona-pwm" }, - { }, -}; -MODULE_DEVICE_TABLE(of, bcm_kona_pwmc_dt); - static struct platform_driver kona_pwmc_driver = { .driver = { .name = "bcm-kona-pwm", -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel