Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3213508pxk; Mon, 5 Oct 2020 04:18:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrgbS7JVw29eWXQYh1pK4ow9/8egE2bGgqc2sWS6EPa+j+j+8WIOw8sSJdbabOc6LUErfp X-Received: by 2002:a05:6402:1716:: with SMTP id y22mr7085506edu.241.1601896708877; Mon, 05 Oct 2020 04:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601896708; cv=none; d=google.com; s=arc-20160816; b=nr+SLxVA4x9v5UY+YMBh8Ue/9c+bRwx/k2fohMiBox2pCpfYfZcJ2W359KQvtctrSk VN4nZ341lAqDmCorqztm0nfitYT+UwxlMpMIVyflwZ0ZRoW3aKMFcZUamM0K2tBVOLoM zgSfGP5hibIZoFPl8ZDDGciiBSggteCfaZhjKSAkc7qHmVNbTojm8vWx+yLLRvwm+CdY Ac8hHzxJq8A36icuHLILb4VayT6/tqkqRTpTMY3kpsSzprsZCE3QjbZ1wqyuYSfySRQy mvIoZYCPNGQ/0pFB+Ipsdrl90irRSv6JBh33auRxDuq/JslH6I91OS55F1FfV6fUxtdo YdWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VQnoW89HEhnMFGJotPuQI4HjPLNmSJXIyHu2ctqJLms=; b=Zc62/KwxMIMv440HXpkZtxhOmeqhIla21fgvu1wKCb/uk0ztcJSI/gd57GNpJ8FJ1t lDIjwlB/dQSwtK9pbAUJSAtkvWfvvrLpmvbEI+QdD5VDgJUnyYl3X53MDbWjI998afx1 ymOtDK5Q2+c34Ezu5y4MMRC2d7wdFbxpKokOxBDbpUuVOsyWEAv5k9pU+tI021QzxLls KJz+GWQElXioCO2KS5I1AAw4D2VgSR9WIekzUfXSP1NN+ld4Y9J9ndRgESKk3vSAPODS TRtJ1jXeh0l0rpfEESo47ofqckS5AbxEwZRTYGXCFzmMRlFfuiNbxxP42aHBdpGVh17+ zdeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qHF4xyv1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j22si7023660edq.572.2020.10.05.04.18.06; Mon, 05 Oct 2020 04:18:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qHF4xyv1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726068AbgJELPA (ORCPT + 99 others); Mon, 5 Oct 2020 07:15:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:57714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725946AbgJELPA (ORCPT ); Mon, 5 Oct 2020 07:15:00 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B9C420774; Mon, 5 Oct 2020 11:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601896499; bh=y6sw+9UqcCw1K4zL+X8JeaJ21hZxWlVi1L/6R4CeGng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qHF4xyv1pf7fp18aIgqyzNRebvaU72Fv9FVNttGRHHGxv5Lnzqr3GOWx8+Jy+s6pN z9hvym2/+6RiuwCZVPOWpOZu5Kna6ZTkRn1v2nah5tHmmDQdtssZ93KJL4rRx+sBcR Y+dYrne0bJ6tQvAJUIL40QQOGdlM+iKRHriK4l4w= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kPOSH-00HLMq-Sj; Mon, 05 Oct 2020 12:14:58 +0100 From: Marc Zyngier To: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Thierry Reding , Jonathan Hunter , Dmitry Osipenko , Sowjanya Komatineni , Venkat Reddy Talla , Thomas Gleixner , kernel-team@android.com Subject: [PATCH 1/3] gpio: tegra186: Allow optional irq parent callbacks Date: Mon, 5 Oct 2020 12:14:41 +0100 Message-Id: <20201005111443.1390096-2-maz@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005111443.1390096-1-maz@kernel.org> References: <20201005111443.1390096-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thierry.reding@gmail.com, jonathanh@nvidia.com, digetx@gmail.com, skomatineni@nvidia.com, vreddytalla@nvidia.com, tglx@linutronix.de, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make the tegra186 GPIO driver resistent to variable depth interrupt hierarchy, which we are about to introduce. No functionnal change yet. Signed-off-by: Marc Zyngier --- drivers/gpio/gpio-tegra186.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c index 178e9128ded0..9500074b1f1b 100644 --- a/drivers/gpio/gpio-tegra186.c +++ b/drivers/gpio/gpio-tegra186.c @@ -430,7 +430,18 @@ static int tegra186_irq_set_type(struct irq_data *data, unsigned int type) else irq_set_handler_locked(data, handle_edge_irq); - return irq_chip_set_type_parent(data, type); + if (data->parent_data) + return irq_chip_set_type_parent(data, type); + + return 0; +} + +static int tegra186_irq_set_wake(struct irq_data *data, unsigned int on) +{ + if (data->parent_data) + return irq_chip_set_wake_parent(data, on); + + return 0; } static void tegra186_gpio_irq(struct irq_desc *desc) @@ -678,7 +689,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->intc.irq_mask = tegra186_irq_mask; gpio->intc.irq_unmask = tegra186_irq_unmask; gpio->intc.irq_set_type = tegra186_irq_set_type; - gpio->intc.irq_set_wake = irq_chip_set_wake_parent; + gpio->intc.irq_set_wake = tegra186_irq_set_wake; irq = &gpio->gpio.irq; irq->chip = &gpio->intc; -- 2.28.0