From patchwork Fri Jan 11 05:21:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheetal Tigadoli X-Patchwork-Id: 10757389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D19146C5 for ; Fri, 11 Jan 2019 05:21:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C06462998C for ; Fri, 11 Jan 2019 05:21:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B11DC29999; Fri, 11 Jan 2019 05:21:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 41BCF2998C for ; Fri, 11 Jan 2019 05:21:26 +0000 (UTC) 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=OIBCpOLbE+bP/riWxmUm5xDpBVBcJvZnTE1XVWW1qJg=; b=M4R+RySSuyAKhX+SM52X5pV9B/ cTiqsq6pslSipV9k/NMBg2G6svG2PAo1HWpUgGcLyszwNnP9+ehNd1E0h2RdPbrNQSknI8gFYU289 D4hkr2GPRFMMhOfYqLjPSCZLT+IdJwYBUdefwpu40b5wkLU6CARHbLaWO9mI/KzDQFjw37l1RodV+ UryPQBv2kRIh2JSS1Ga8L/ps6qJDAjtq7MdC+KXnv359D8cvFqqCNSHnF0Rh0QLq7fhX5tGwAy53Y BgxYN6XLQ1tYB2KexBFhb1pt9/77oDdsd2/D4cR8QgU2N6IefjdZImG/SmHqeWSWql9xT4lNvAnMU wXfcY23A==; 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 1ghpG1-0003Uo-J5; Fri, 11 Jan 2019 05:21:25 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghpFv-0003QN-Fb for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2019 05:21:23 +0000 Received: by mail-pl1-x642.google.com with SMTP id y1so6230753plp.9 for ; Thu, 10 Jan 2019 21:21:19 -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=Yd4M+CUErpLCr3c/0+nYCFyarZVesvGUD1M9BF/zec4=; b=Ps8hgp9KQELNTG1W1mrwKJ3flExA2lNI26ytiNvhzBXzgwS6wNgwmjBLCGuWHlbL37 zBdKXfCrnBZrLA1wbv4QpFYt0pITMjTvB4Ig42TUUs6MbpD6xsy2zWJBdv1QCjnu30iO 8JsqLylacKIcSI4yPiVNt1QbQD8w14GK/HZlo= 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=Yd4M+CUErpLCr3c/0+nYCFyarZVesvGUD1M9BF/zec4=; b=C0y3MJLixIgmx7CyfCtjs/nUhmK46/iLhHG2u/GpYHw3Y9WiPSGb4tAaw2eV0zUBlm MAvH4Ne4DmUY+eyEs6wgyCOhwYz2cKyYQ+QEdyPPNca3diC7yNoWHYamI1/snfx2AFtn G8h+weSr+XR20y1ivUKhHuAoKdda8Btn2RJ+0lhqiWoiZLs13YttpyMhunIlMSHcG/eM vXJuaonVMnUjJxVWP/4JXMid5Rkz73BQNS7h5iOa+giAT+ZaL5FGNWJ0LmNp+s6+7tM0 3oEBY8W/BiWb/GFMl6Pk1L1N6VMsNJnLGsDgzZvMyb/OVmZ3PkuFv4Rat55nQ2q6VN7e NQ8A== X-Gm-Message-State: AJcUukc2QfwZmHAifnxJmf4uKljkwUtzOZm5DjPng+5gZ7LNmcAWPj77 XJM+TTyL4BD5xmMVGOCnuMS0rQ== X-Google-Smtp-Source: ALg8bN4QGefj7NR/MPTsSMJLmH5z3WSsQE9axJGSg+690Oc4ppwgjnjqr/yLogVMcJdLniGqWRFOJA== X-Received: by 2002:a17:902:42e4:: with SMTP id h91mr13509426pld.18.1547184078787; Thu, 10 Jan 2019 21:21:18 -0800 (PST) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 186sm148425418pga.36.2019.01.10.21.21.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 21:21:18 -0800 (PST) From: Sheetal Tigadoli To: Thierry Reding , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH 1/3] dt-bindings: pwm: kona: Add new compatible for new version pwm-kona Date: Fri, 11 Jan 2019 10:51:14 +0530 Message-Id: <1547184076-20521-2-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190110_212119_906965_943337D6 X-CRM114-Status: GOOD ( 15.28 ) 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Praveen Kumar B Add new compatible string for new version of pwm-kona Signed-off-by: Praveen Kumar B Reviewed-by: Ray Jui Reviewed-by: Scott Branden Signed-off-by: Sheetal Tigadoli --- Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt b/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt index 8eae9fe..d37f697 100644 --- a/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt +++ b/Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt @@ -3,7 +3,7 @@ Broadcom Kona PWM controller device tree bindings This controller has 6 channels. Required Properties : -- compatible: should contain "brcm,kona-pwm" +- compatible: should contain "brcm,kona-pwm" or "brcm,kona-pwm-v2" - reg: physical base address and length of the controller's registers - clocks: phandle + clock specifier pair for the external clock - #pwm-cells: Should be 3. See pwm.txt in this directory for a From patchwork Fri Jan 11 05:21:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheetal Tigadoli X-Patchwork-Id: 10757391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3C8B714E5 for ; Fri, 11 Jan 2019 05:21:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DF0D2998C for ; Fri, 11 Jan 2019 05:21:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F76929999; Fri, 11 Jan 2019 05:21:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3A6DC2998C for ; Fri, 11 Jan 2019 05:21:44 +0000 (UTC) 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=ENsyy9XYoC6Q5bXgg7pxGYJDkN05/NpQqNPQ3CiqM60=; b=ZOZBu97GMkvNIsCiaTsBtNYYt4 rJiIwLXNwJq5CFjMRW4fi9do75kBQapPr5r7P+vvm6zD9K9Gr8WVvXY4VVsFIq3AiaJn1e+hrtxNS Wc9CTi3Ebf/zRVRXHSmyda62TNcj/1+4a97ReDyJlt+vd5bTzb5vPEJ4wbAhhpCWvKmpf7/S9VESG 2h8k+DxG+MiX35Mph1rhhuucLmCIh6aFEr6JqgT5yPXAZnkfv9reRFImPpKyyF4yn1CCWqdz1I8kW JiF0L/Adj97iY2EExnEAgHpCF5t5JUd+ITHtxULtVz87LY4vZile9zaN+Q4GI4DX79EES44gSb23p Pj7csH2A==; 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 1ghpGG-0003iX-4q; Fri, 11 Jan 2019 05:21:40 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghpG5-0003Xv-8G for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2019 05:21:35 +0000 Received: by mail-pl1-x641.google.com with SMTP id p8so6247780plo.2 for ; Thu, 10 Jan 2019 21:21:29 -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=dSzt7MLRYV+yMWksfXxwLNCwO2m42Y1RhXwyI9Ost9c=; b=GkF4aOBNqGTJG7bdvva2HxeTin21woo9vAvEwRxW7LV2lRQ0Ccr5asajkPNWEaG5+N gcLwW+4EDQOpMhzqNtLRFsYGitZnX5k+cS9SxRqPnazaSypAWeAawesa+jWCfo+UCzfS A7GaqOCCYS51H9uQbH8mluHh8wHjCbVpZKIIs= 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=dSzt7MLRYV+yMWksfXxwLNCwO2m42Y1RhXwyI9Ost9c=; b=OM4uERF/VqDLnMwdL5tO5Tnch8YMqaN67/Jsoo9puETfp+uLVHvOZiHRIMfs84ypVA 7VUYpuASduh6xSr2A/q6f4u4uDquYDeQD9ZzuF8xPZGpgrdPWMaseJqh0Yrvk/Ysv831 jxcyNXSjQzWtalBqTLEriKYFDMjQFDjbLCCdyqKY6CNN7WEDEKzLOMskVTMVbojJOfMI /sZvnrH/ujit9QYn7ZSDscSQ3fSHWQ40kfj8sMjSGOxHqDeANAGI5I/X3Z9KR91d0bk6 wWnL6I7Q1ZByWcL2GptC7wQh2NwutU0o8p4lSYjEQDrY3g76emlWfT9/6+tuRoXhCTXm cDzA== X-Gm-Message-State: AJcUukc2NiUS4WS+uA0YE2/jkDAHHzz2x17PTJ6kFjAUWr9Un6bhhiQT YaNAsTmuqfL06wUpCtnnqr8NsQ== X-Google-Smtp-Source: ALg8bN7iIvL3Ky8/0EfKkOTKfsqIxVgj72nNPuUzlB6r/kI4qIYSf8+00jioZ/bYwEQXLoK9RoUgjA== X-Received: by 2002:a17:902:12f:: with SMTP id 44mr1113843plb.74.1547184088506; Thu, 10 Jan 2019 21:21:28 -0800 (PST) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 186sm148425418pga.36.2019.01.10.21.21.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 21:21:27 -0800 (PST) From: Sheetal Tigadoli To: Thierry Reding , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH 2/3] drivers: pwm: pwm-bcm-kona: Add pwm-kona-v2 support Date: Fri, 11 Jan 2019 10:51:15 +0530 Message-Id: <1547184076-20521-3-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190110_212129_634817_AB55A7BE X-CRM114-Status: GOOD ( 20.69 ) 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Praveen Kumar B Add support for new version of pwm-kona. 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 | 128 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 98 insertions(+), 30 deletions(-) diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c index 09a95ae..2b44ad8 100644 --- a/drivers/pwm/pwm-bcm-kona.c +++ b/drivers/pwm/pwm-bcm-kona.c @@ -45,30 +45,39 @@ * high or low depending on its state at that exact instant. */ -#define PWM_CONTROL_OFFSET (0x00000000) +#define PWM_CONTROL_OFFSET 0x00000000 #define PWM_CONTROL_SMOOTH_SHIFT(chan) (24 + (chan)) #define PWM_CONTROL_TYPE_SHIFT(chan) (16 + (chan)) #define PWM_CONTROL_POLARITY_SHIFT(chan) (8 + (chan)) #define PWM_CONTROL_TRIGGER_SHIFT(chan) (chan) -#define PRESCALE_OFFSET (0x00000004) +#define PRESCALE_OFFSET 0x00000004 #define PRESCALE_SHIFT(chan) ((chan) << 2) #define PRESCALE_MASK(chan) (0x7 << PRESCALE_SHIFT(chan)) -#define PRESCALE_MIN (0x00000000) -#define PRESCALE_MAX (0x00000007) +#define PRESCALE_MIN 0x00000000 +#define PRESCALE_MAX 0x00000007 #define PERIOD_COUNT_OFFSET(chan) (0x00000008 + ((chan) << 3)) -#define PERIOD_COUNT_MIN (0x00000002) -#define PERIOD_COUNT_MAX (0x00ffffff) +#define PERIOD_COUNT_MIN 0x00000002 +#define PERIOD_COUNT_MAX 0x00ffffff #define DUTY_CYCLE_HIGH_OFFSET(chan) (0x0000000c + ((chan) << 3)) -#define DUTY_CYCLE_HIGH_MIN (0x00000000) -#define DUTY_CYCLE_HIGH_MAX (0x00ffffff) +#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_V1 = 1, + KONA_PWM_V2 +}; 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,11 +85,40 @@ 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; + unsigned int count = PWM_MONITOR_TIMEOUT_US * 1000; + + switch (kona_ver) { + case KONA_PWM_V1: + /* + * 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 KONA_PWM_V2: + do { + value = readl(kp->base + PWM_MONITOR_OFFSET); + if (!(value & (BIT(chan)))) + return 0; + ndelay(1); + } while (count--); + + return -ETIMEDOUT; + 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, - unsigned int chan) +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 +126,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 +138,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 int kona_pwmc_config(struct pwm_chip *chip, struct pwm_device *pwm, @@ -115,6 +148,7 @@ static int kona_pwmc_config(struct pwm_chip *chip, struct pwm_device *pwm, u64 val, div, rate; unsigned long prescale = PRESCALE_MIN, pc, dc; unsigned int value, chan = pwm->hwpwm; + int ret; /* * Find period count, duty count and prescale to suit duty_ns and @@ -156,7 +190,12 @@ static int kona_pwmc_config(struct pwm_chip *chip, struct pwm_device *pwm, * validated immediately instead of on enable. */ if (pwm_is_enabled(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); @@ -167,7 +206,12 @@ static int kona_pwmc_config(struct pwm_chip *chip, struct pwm_device *pwm, writel(dc, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); - kona_pwmc_apply_settings(kp, chan); + ret = kona_pwmc_apply_settings(kp, chan); + if (ret < 0) { + dev_err(chip->dev, "failed to apply settings: %d\n", + ret); + return ret; + } } return 0; @@ -187,7 +231,11 @@ static int kona_pwmc_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm, return 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 ret; + } value = readl(kp->base + PWM_CONTROL_OFFSET); @@ -198,7 +246,11 @@ static int kona_pwmc_set_polarity(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 apply pwm settings: %d\n", ret); + return ret; + } clk_disable_unprepare(kp->clk); @@ -231,8 +283,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)); @@ -243,7 +300,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 prepare pwm settings: %d\n", ret); + return; + } clk_disable_unprepare(kp->clk); } @@ -256,14 +317,26 @@ static void kona_pwmc_disable(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_V1}, + { .compatible = "brcm,kona-pwm-v2", .data = (void *)KONA_PWM_V2}, + { }, +}; +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; @@ -276,6 +349,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); @@ -322,12 +396,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", From patchwork Fri Jan 11 05:21:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheetal Tigadoli X-Patchwork-Id: 10757393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F15814E5 for ; Fri, 11 Jan 2019 05:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E7232998C for ; Fri, 11 Jan 2019 05:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3A2329999; Fri, 11 Jan 2019 05:22:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 915342998C for ; Fri, 11 Jan 2019 05:22:07 +0000 (UTC) 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=GQVecg5EFoikJUdIwlZdx97uyOsp+3eLK8AFbwY/xN4=; b=r9rDpm3Zwsp0DdW+/oixlLtx9a mV0aFCriNEkP/D5yOruYqyluJJa7y2/Q5UJwUo4/snPwVN2Hbh2L/J3N1l4q2mFubg+k7suy4yUWd lR9lbMS1bG1/2SBa7WQwWyRfLjA0CQUFZOh9rADAYFKs0iM+9bvBZSzq3ouJ6AQPstzWRY85/+kK9 eZrPaGZHFDkPDTurbjwmI8vEgH2UapT+3T4//7GylpUaP1xdkOEXc43j/kjkYSnUg5CRt6jFsSuce jgemUXKLNBMEpF0yR1aRQystW8lkB+Op8EmAVxyjFGWaUGQDgCNkwrRvxt2LVLqDknvdtvjCEZI2B 2ujXiBgw==; 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 1ghpGd-00042n-Mc; Fri, 11 Jan 2019 05:22:03 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ghpGD-0003fV-ON for linux-arm-kernel@lists.infradead.org; Fri, 11 Jan 2019 05:21:51 +0000 Received: by mail-pf1-x441.google.com with SMTP id q1so6407519pfi.5 for ; Thu, 10 Jan 2019 21:21:37 -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=OwRCj7PjZaXnprtMq6QV2wVOFtmvXlT2/KrfJ+jAcLc=; b=QznddbBrgj2tnWMvLRkfILQ3Z/rJLwyOYSkheShqUsZGPsNf5Hq7pmFfdzaysZD+4y RrWaMNMwVlIVgdkcLTQo7pUJZ7Rj6CUFe2Ecf4Y7mWE6xkGK1U5NANtoxjmwk8/AsOXa yJfWA2J4/YDw6EsBo4qeqWNNio6PKcE0StAj4= 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=OwRCj7PjZaXnprtMq6QV2wVOFtmvXlT2/KrfJ+jAcLc=; b=oxFcwztYYBKo4p/SMeANu2nrSEEktQ+ODd5ML1uxeBGaJyGWWxizPGfOtTcxvgeS/S +jxW4es7NXxo0tGK0HJb9ZRr6baPgXmIubCbDCaTR+8np6YPKezm+Gw6EAKh6amPTkcF /NvUx44KpiMXim5OfO6KuNna3NCKSPasJj9mgddKL1ti0rxXXllbJs9NQwWSjfT4bZIA PnHiPFFtpmHTki5i2rK7kABUo2u097tLLaw1VhWMJeUIovQg1GLWDUBByO/HTXaFB9Tj fkhx5oooKWhZVeuo6rPCEJ2eBUFflXtyjE62MkH6iec0Y8jxFFSQI367MGAMfN8F+/Dj Afww== X-Gm-Message-State: AJcUukfbxuKwjmgpYpRfak7F75TWAaF3SdlIn13WHUu9+I2k5ggBEPaD sBQZI1yC05lXrqc8SCdwOHyCyA== X-Google-Smtp-Source: ALg8bN77KebShN+aQwtyujxJ50Qw5574a7UnuGOyfElJju3nFY377rZoh0Obnu9ahLPuF0luY/Tstg== X-Received: by 2002:a65:6542:: with SMTP id a2mr11969178pgw.389.1547184096264; Thu, 10 Jan 2019 21:21:36 -0800 (PST) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 186sm148425418pga.36.2019.01.10.21.21.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 21:21:35 -0800 (PST) From: Sheetal Tigadoli To: Thierry Reding , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH 3/3] ARM: dts: cygnus: Change pwm compatible to new version Date: Fri, 11 Jan 2019 10:51:16 +0530 Message-Id: <1547184076-20521-4-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1547184076-20521-1-git-send-email-sheetal.tigadoli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190110_212138_286154_CF3346D7 X-CRM114-Status: GOOD ( 15.54 ) 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Praveen Kumar B Change pwm compatible to new version of pwm-kona Add new compatible to check pwm configure status Signed-off-by: Praveen Kumar B Reviewed-by: Ray Jui Reviewed-by: Scott Branden Signed-off-by: Sheetal Tigadoli --- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 253df71..2a433e7 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -595,7 +595,7 @@ }; pwm: pwm@180aa500 { - compatible = "brcm,kona-pwm"; + compatible = "brcm,kona-pwm-v2"; reg = <0x180aa500 0xc4>; #pwm-cells = <3>; clocks = <&asiu_clks BCM_CYGNUS_ASIU_PWM_CLK>;