From patchwork Sat Mar 18 16:53:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 740628 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vlpG34cj2z9ryT for ; Sun, 19 Mar 2017 03:54:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QLAX3WuZ"; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5D912B9158A; Sat, 18 Mar 2017 17:53:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sat, 18 Mar 2017 17:53:46 +0100 (CET) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C730EB91585 for ; Sat, 18 Mar 2017 17:53:42 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .linaro. - helo: .mail-lf0-f50.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-lf0-f50.google.com (mail-lf0-f50.google.com [209.85.215.50]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 18 Mar 2017 17:53:42 +0100 (CET) Received: by mail-lf0-f50.google.com with SMTP id y193so42870418lfd.3 for ; Sat, 18 Mar 2017 09:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SfNQkdDHInaUzQp13mVk1WQREdALjQPuL+QTq7nToHo=; b=QLAX3WuZ8eKYGV2OGcUdSdBHdB8AGucqE3+3b0p2hwTajRC3Q8nmJ2AWhCnC3C6sQt rUoRotBNFS3zGwMXQvhUgNnxsVDqlemZrjbuOzmcDjAfOHVHQtbujjQgJ1osLJwnuGIT vQDbQHlD3K6DQUiRDT6iMAqJlAAYFQH2LE58c= 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=SfNQkdDHInaUzQp13mVk1WQREdALjQPuL+QTq7nToHo=; b=dKJCv2HBOszrlDXY56EzhAOdk0FxUFXL1oqdEaK3KpkNBy4h3zbChgd+NzZDEcpqKU tze6ej+dLJU5XMRwzNDr9W76cgx4vPVz4kBr0gPz2htlGu/66HQQfm3oQAgGa5z/Z0Rv x6+hdPueN+7FEHPQGc4M9TvVn6G/DborvtlUap3yN+NIplCAMhq6fZf3VjVSdUNejQBm P0FW4jlpcGvLNGcTcR/CDfnZ8Zmv/RM0WkENDOIjOnBxSSj8JhNpbpbVUrAg/j2QlmNa LRhTabdIs7BbkZEVk9gxGBnU32XQvIKr/bKIcvqv51aGnM2jBsEYe3zO/+fC0o1r76Kw anuQ== X-Gm-Message-State: AFeK/H2Mcq6veEJuIPy/Go31B/bH6oVOzsG1jo6qWqunls8hp63E6F8WDpb2vHi40+5uqBER X-Received: by 10.25.87.200 with SMTP id l191mr6104341lfb.124.1489856021827; Sat, 18 Mar 2017 09:53:41 -0700 (PDT) Received: from localhost.localdomain (c-357171d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.113.53]) by smtp.gmail.com with ESMTPSA id d72sm618702lfe.58.2017.03.18.09.53.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 09:53:40 -0700 (PDT) From: Linus Walleij To: Hans Ulli Kroll , Florian Fainelli , Thomas Gleixner , Jason Cooper , Marc Zyngier Date: Sat, 18 Mar 2017 17:53:25 +0100 Message-Id: <20170318165326.20450-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170318165326.20450-1-linus.walleij@linaro.org> References: <20170318165326.20450-1-linus.walleij@linaro.org> Subject: [OpenWrt-Devel] [PATCH 3/4 v2] irqchip: faraday: fix the trigger types X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: openwrt-devel@openwrt.org, Paulius Zaleckas , Greentime Hu , Janos Laube , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The triggers in the driver were right for high level triggered IRQs but the edge detection on edge triggered IRQs was wrong. After studying a proper driver from Po-Yu Chuang I now know how to handle these right, and we can properly implement low level IRQs as well. The device trees for the Gemini had polarity switched around so these have been fixed to conform to the right polarity as well. Cc: Greentime Hu Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - No changes, just resending with the rest. --- drivers/irqchip/irq-ftintc010.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-ftintc010.c b/drivers/irqchip/irq-ftintc010.c index 81929aa33990..0cc81df6f743 100644 --- a/drivers/irqchip/irq-ftintc010.c +++ b/drivers/irqchip/irq-ftintc010.c @@ -26,7 +26,9 @@ #define FT010_IRQ_SOURCE(base_addr) (base_addr + 0x00) #define FT010_IRQ_MASK(base_addr) (base_addr + 0x04) #define FT010_IRQ_CLEAR(base_addr) (base_addr + 0x08) +/* Selects level- or edge-triggered */ #define FT010_IRQ_MODE(base_addr) (base_addr + 0x0C) +/* Selects active low/high or falling/rising edge */ #define FT010_IRQ_POLARITY(base_addr) (base_addr + 0x10) #define FT010_IRQ_STATUS(base_addr) (base_addr + 0x14) #define FT010_FIQ_SOURCE(base_addr) (base_addr + 0x20) @@ -84,22 +86,25 @@ static int ft010_irq_set_type(struct irq_data *d, unsigned int trigger) mode = readl(FT010_IRQ_MODE(f->base)); polarity = readl(FT010_IRQ_POLARITY(f->base)); - if (trigger & (IRQ_TYPE_LEVEL_HIGH)) { + if (trigger & (IRQ_TYPE_LEVEL_LOW)) { + irq_set_handler_locked(d, handle_level_irq); + mode &= ~BIT(offset); + polarity |= BIT(offset); + } else if (trigger & (IRQ_TYPE_LEVEL_HIGH)) { irq_set_handler_locked(d, handle_level_irq); - /* Disable edge detection */ mode &= ~BIT(offset); polarity &= ~BIT(offset); - } else if (trigger & IRQ_TYPE_EDGE_RISING) { + } else if (trigger & IRQ_TYPE_EDGE_FALLING) { irq_set_handler_locked(d, handle_edge_irq); mode |= BIT(offset); polarity |= BIT(offset); - } else if (trigger & IRQ_TYPE_EDGE_FALLING) { + } else if (trigger & IRQ_TYPE_EDGE_RISING) { irq_set_handler_locked(d, handle_edge_irq); mode |= BIT(offset); polarity &= ~BIT(offset); } else { irq_set_handler_locked(d, handle_bad_irq); - pr_warn("GEMINI IRQ: no supported trigger selected for line %d\n", + pr_warn("Faraday IRQ: no supported trigger selected for line %d\n", offset); }