Received: by 10.192.165.148 with SMTP id m20csp1640106imm; Thu, 3 May 2018 03:00:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoBoSeb4Pl9GmGJhidLkDkylf5ikz1FqUafrrzWhqn12TXxDAXdoPgvu34209Gwbm45tThd X-Received: by 2002:a63:77ce:: with SMTP id s197-v6mr18324398pgc.272.1525341603750; Thu, 03 May 2018 03:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525341603; cv=none; d=google.com; s=arc-20160816; b=zfjv47dl7jkiNSGTajUa6EKcUjG+daLs7EUz+fCwRa25eGXCEDf45938kUvJFTv8Ce hDIp6qVOkg4CahgOKGxo/4sgCYRlKGZ87TD4oGqlea6qx6rM/lv5GGBVppobnUN/suUa hL7S+3M9NYNp4yw9y5X7I0gANkYvUbweA3W+AGhyWwmLVPFLtPh45QvlsEZH3fl/W37A qoFq21TMZQgALJ6Q80GFgBqpDfOoZjAlRwf9bUOhrDcdGvUXF0yl/QZ61xf2e635VD5y QDknL92QYcL9CCvRtz/QytnvMxwRiz95rtjGOyflRikXH1PsQ3Deu6zba/Vaf27s5oDS o8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=3XEVOTaiM2cAe8JA1c2+SyrGveddUoH6xW0+/VvwdyA=; b=DIv4bmHtTupZzt9H9hHqdn3Ia+WJNJVSTFxXMEw+t27NuZXEbzEIbj9KCwvA6220fd YV7JFnsJEAZ/Di8iFZI75/W4sCRGGy+FNvUs2bbHoIkCEaIx54iX/ueEemL9e5vvSqST cLNCgXq0lf1aXzoGjl0mHf6UBxyio2iQtpezJgV6vVlWzRcbqKTOLEjDfmDTW5IoU2k/ q+Qir+DGTU/i8r5GkUjVY8qWz2aywgyNDyP3ITD+eNRYfdOeuGcm6kcsYjG4lg/0UR4K VQxGnpz5SyryvYsAqpmij1q/93jQ0MDHilLmkBzem51FErbjLy4wXydhCIFxMoISJ5h0 tqFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ehI2xO30; dkim=pass header.i=@codeaurora.org header.s=default header.b=F7dFzHu/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w21-v6si2922747plp.199.2018.05.03.02.59.49; Thu, 03 May 2018 03:00:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ehI2xO30; dkim=pass header.i=@codeaurora.org header.s=default header.b=F7dFzHu/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbeECJ7J (ORCPT + 99 others); Thu, 3 May 2018 05:59:09 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43894 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbeECJ7B (ORCPT ); Thu, 3 May 2018 05:59:01 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2632A607A2; Thu, 3 May 2018 09:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525341541; bh=QsN9ZWb6KCeTaj+ffm/z6bQCphFcVtRgxTa+cuMKZNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ehI2xO30nF/Bx2S+IIPeCfe1aIrUoimTh1tZ11B4fAUPeu2krepW3ERYDqgWKJSsL hE6bm0kj6asKq5Fulk7Jjmb9l8x/0HRPJFnEatHI8GSR/h/Nyk/d78rjNYtZgE2srR F5peFEPjXqvSBqMHiLKWvhqazKRwggrOo2hpL7u4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from kgunda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kgunda@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C048060588; Thu, 3 May 2018 09:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525341539; bh=QsN9ZWb6KCeTaj+ffm/z6bQCphFcVtRgxTa+cuMKZNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7dFzHu/uu3oZ4C4+58rBklG6v+gM65QWCbMc57UgJr0qFnl3fU8pPf/fYA4eh51c yY7fY4IF1Qu1/lheu6xFv/K4iJiQXIauV8Za5kIOFqVSpZoXC6GAyyYyQW27qRAoAf Xhs09Op8beuYaQd1A9cgMGsffYwTOHTBfA3nyM00= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C048060588 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kgunda@codeaurora.org From: Kiran Gunda To: bjorn.andersson@linaro.org, Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-leds@vger.kernel.org, Kiran Gunda Subject: [PATCH V1 4/5] backlight: qcom-wled: Add support for OVP interrupt handling Date: Thu, 3 May 2018 15:27:11 +0530 Message-Id: <1525341432-15818-5-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525341432-15818-1-git-send-email-kgunda@codeaurora.org> References: <1525341432-15818-1-git-send-email-kgunda@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org WLED peripheral has over voltage protection(OVP) circuitry and the OVP fault is notified through an interrupt. Though this fault condition rising is due to an incorrect hardware configuration is mitigated in the hardware, it still needs to be detected and handled. Add support for it. When WLED module is enabled, keep OVP fault interrupt disabled for 10 ms to account for soft start delay. Signed-off-by: Kiran Gunda --- drivers/video/backlight/qcom-wled.c | 118 +++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index 2cfba77..80ae084 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -23,14 +23,20 @@ /* From DT binding */ #define WLED_DEFAULT_BRIGHTNESS 2048 - +#define WLED_SOFT_START_DLY_US 10000 #define WLED3_SINK_REG_BRIGHT_MAX 0xFFF /* WLED3 Control registers */ #define WLED3_CTRL_REG_FAULT_STATUS 0x08 +#define WLED3_CTRL_REG_ILIM_FAULT_BIT BIT(0) +#define WLED3_CTRL_REG_OVP_FAULT_BIT BIT(1) +#define WLED4_CTRL_REG_SC_FAULT_BIT BIT(2) + +#define WLED3_CTRL_REG_INT_RT_STS 0x10 #define WLED3_CTRL_REG_MOD_EN 0x46 #define WLED3_CTRL_REG_MOD_EN_MASK BIT(7) +#define WLED3_CTRL_REG_MOD_EN_BIT BIT(7) #define WLED3_CTRL_REG_FREQ 0x4c #define WLED3_CTRL_REG_FREQ_MASK GENMASK(3, 0) @@ -161,9 +167,12 @@ struct wled { u32 short_count; const int *version; int short_irq; + int ovp_irq; bool force_mod_disable; + bool ovp_irq_disabled; struct wled_config cfg; + struct delayed_work ovp_work; int (*wled_set_brightness)(struct wled *wled, u16 brightness); int (*wled_sync_toggle)(struct wled *wled); }; @@ -209,6 +218,32 @@ static int wled4_set_brightness(struct wled *wled, u16 brightness) return 0; } +static void wled_ovp_work(struct work_struct *work) +{ + u32 val; + int rc; + + struct wled *wled = container_of(work, + struct wled, ovp_work.work); + + rc = regmap_read(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + &val); + if (rc < 0) + return; + + if (val & WLED3_CTRL_REG_MOD_EN_BIT) { + if (wled->ovp_irq > 0 && wled->ovp_irq_disabled) { + enable_irq(wled->ovp_irq); + wled->ovp_irq_disabled = false; + } + } else { + if (wled->ovp_irq > 0 && !wled->ovp_irq_disabled) { + disable_irq(wled->ovp_irq); + wled->ovp_irq_disabled = true; + } + } +} + static int wled_module_enable(struct wled *wled, int val) { int rc; @@ -220,7 +255,12 @@ static int wled_module_enable(struct wled *wled, int val) WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK, WLED3_CTRL_REG_MOD_EN_MASK); - return rc; + if (rc < 0) + return rc; + + schedule_delayed_work(&wled->ovp_work, WLED_SOFT_START_DLY_US); + + return 0; } static int wled3_sync_toggle(struct wled *wled) @@ -346,6 +386,36 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled) return IRQ_HANDLED; } +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) +{ + struct wled *wled = _wled; + int rc; + u32 int_sts, fault_sts; + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); + if (rc < 0) { + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", + rc); + return IRQ_HANDLED; + } + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); + if (rc < 0) { + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", + rc); + return IRQ_HANDLED; + } + + if (fault_sts & + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= %x\n", + int_sts, fault_sts); + + return IRQ_HANDLED; +} + static int wled3_setup(struct wled *wled) { u16 addr; @@ -821,6 +891,44 @@ static int wled_configure_short_irq(struct wled *wled, return rc; } +static int wled_configure_ovp_irq(struct wled *wled, + struct platform_device *pdev) +{ + int rc = 0; + u32 val; + + if (*wled->version == WLED_PM8941) + return 0; + + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); + if (wled->ovp_irq < 0) { + dev_dbg(&pdev->dev, "ovp irq is not used\n"); + return 0; + } + + rc = devm_request_threaded_irq(wled->dev, wled->ovp_irq, NULL, + wled_ovp_irq_handler, IRQF_ONESHOT, + "wled_ovp_irq", wled); + if (rc < 0) { + dev_err(wled->dev, "Unable to request ovp_irq (err:%d)\n", + rc); + return 0; + } + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_MOD_EN, &val); + if (rc < 0) + return rc; + + /* Keep OVP irq disabled until module is enabled */ + if (!rc && !(val & WLED3_CTRL_REG_MOD_EN_MASK)) { + disable_irq(wled->ovp_irq); + wled->ovp_irq_disabled = true; + } + + return rc; +} + static const struct backlight_ops wled_ops = { .update_status = wled_update_status, }; @@ -874,10 +982,16 @@ static int wled_probe(struct platform_device *pdev) } } + INIT_DELAYED_WORK(&wled->ovp_work, wled_ovp_work); + rc = wled_configure_short_irq(wled, pdev); if (rc < 0) return rc; + rc = wled_configure_ovp_irq(wled, pdev); + if (rc < 0) + return rc; + val = WLED_DEFAULT_BRIGHTNESS; of_property_read_u32(pdev->dev.of_node, "default-brightness", &val); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project