From patchwork Thu May 6 15:31:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 12242663 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=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 78FC3C43460 for ; Thu, 6 May 2021 16:03:39 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 0496661073 for ; Thu, 6 May 2021 16:03:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0496661073 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L/O9xWOO0RGJ8oBfG1ivSnRqnbneOAcigckRWvNezjY=; b=WaSUjT1ZMUG7ZvQEvlW16V2Pt rZct1oYB+7DN8l6l2/cevQVGa+aC1tb9aa1k3r1fjeJGevhFIVwcnjf+9ho5Fl0zNzz3jgztmFE70 KLB9092O1KtmIT5/OEfXeOY58lOxEb1zTKYZKgGX2lMc8ZLvFpf6g7UZ8QRp8+Jwx+31E0zD5/C1p f9F2HP6bUGblgmeagyl6GS2665a0TSdbyJsxlKLBlJAFEO9lnOjH7iEax+OOiwi1940oJyPG2YXVK 4vceaYa7CNqr6C8U5gqm6iXpjjak3JWJIi/orZEYszWYuSpd2XV8g5tQj+RmF6QWLiGMJ2D7wgT9B Frki4AD/Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1legGl-004frF-1V; Thu, 06 May 2021 15:50:31 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lefzs-004a8l-8g for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 15:33:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=u2GlacQLlZDdLwGJ7V5cF4MYqzhtpb3drIPH2wzcxXA=; b=SbPmsYKykpB16bBF+XfrP6Sr3z isI9I8LDAxEBzJ9rq3RTa1v//agiXlkXUwBCGpZCS+vsUUppdb0pUmecyA1X5IDnH4N0L5Cm+6xYY WpEfv5Y8JC8DPAQRdrzNXH6OKSjxBrOf53arZbCzpoimUaCU+P2S8GFjPzIp6PRnXQ5ydai3LeNrU 2Z+lkPXLkRMHCugqbgWsYqbsYMYxDQy8ypa47yvLCORDKlhaW06iBA379HSktzV8Wgo4aLutu2Gnb qweWbCMQHdzaVHsyvD7cduu9Vw1CLW1KWXarOLU0kGb1/icDUcuyLlBiH6WJr+bh2O93LPmxrL5+Y vFexPf+w==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lefzm-0069jr-CT for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 15:33:02 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6239A616EB; Thu, 6 May 2021 15:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620315175; bh=OfK0Hzd2grREpBUN2tgkKBXXxq0n8pt4CmtN6wgcHqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oxvXQjeGDG52+9/+e+/YCQVhh/+CyB4udA90afhFAk4JgSh0rlqlReB/76rR29MGv vBDOcLPuyYji99nUxMGs8MAQUs/CfjqBrFQOGlyZhzlOYCbPzRbIry4N7MjK2vm/EA JDVDfKK2dnc+LAB+qDx1EgUc5Nu5xKxITmadGS5S3KfVwke50Ng+RcNJ76OIlu8ng+ bsDkyoCFMHt7GefKFLcuvZFd2rL7DeKWVGppdOPLgzBioxhdc3kvTAHwnh/ixTsL+q mlNpCgHwVaJ/7x95QkS4aPN7lMjXKeOqXlDAdoi1F2WtQB8TMYpLxd4lC2R4msPxx8 cfmoxHdbeaqRA== Received: by pali.im (Postfix) id 1AC5E89A; Thu, 6 May 2021 17:32:55 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Lorenzo Pieralisi , Thomas Petazzoni , Rob Herring , Bjorn Helgaas Cc: Russell King , =?utf-8?q?Marek_Beh=C3=BAn?= , Remi Pommarel , Xogium , Tomasz Maciej Nowak , Marc Zyngier , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 37/42] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros by linux PCI_INTERRUPT_* values Date: Thu, 6 May 2021 17:31:48 +0200 Message-Id: <20210506153153.30454-38-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210506153153.30454-1-pali@kernel.org> References: <20210506153153.30454-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210506_083258_493486_650FD4AC X-CRM114-Status: GOOD ( 10.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Header file linux/pci.h defines enum pci_interrupt_pin with corresponding interrupt PCI_INTERRUPT_* values. Signed-off-by: Pali Rohár Reviewed-by: Marek Behún --- drivers/pci/controller/pci-aardvark.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index d99462d99ed8..2258b9ae1084 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -34,10 +34,7 @@ #define PCIE_CORE_DEV_REV_REG 0x8 #define PCIE_CORE_PCIEXP_CAP 0xc0 #define PCIE_CORE_PCIERR_CAP 0x100 -#define PCIE_CORE_INT_A_ASSERT_ENABLE 1 -#define PCIE_CORE_INT_B_ASSERT_ENABLE 2 -#define PCIE_CORE_INT_C_ASSERT_ENABLE 3 -#define PCIE_CORE_INT_D_ASSERT_ENABLE 4 + /* PIO registers base address and register offsets */ #define PIO_BASE_ADDR 0x4000 #define PIO_CTRL (PIO_BASE_ADDR + 0x0) @@ -706,7 +703,7 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) bridge->conf.pref_mem_limit = cpu_to_le16(PCI_PREF_RANGE_TYPE_64); /* Support interrupt A for MSI feature */ - bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE; + bridge->conf.intpin = PCI_INTERRUPT_INTA; bridge->has_pcie = true; bridge->data = pcie;