From patchwork Tue Oct 19 21:58:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7C56C433EF for ; Tue, 19 Oct 2021 22:05:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B382961260 for ; Tue, 19 Oct 2021 22:05:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B382961260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=eWraK/BnNDvV2vvHd/nsF6eLUp8A4WhxCkMrqMvqQiA=; b=D9Ps6+tbklpfqJ t7VXki49mZc7BKOHh8Ap3WcioeqCrM0iOipmwS5mFIqGTnCwZ2QXYwNlf+J/3wqURadLYUL7+xBbO lqs4JAnvFhf99NsiI/xg2Yt8ZqRVF71EZ/1i0uYAX8m2fT9t+6tERqGSggK/IIm3jbmehe2+RppTG FWIV+z/+DE/BXAYFZiU8CQ2aQhnl55RFXoy9i25ov5U5NA5VnY5gimQuDXrW0HeRnaXQCto1EtkIW k5tXEEVZWpcqo9WWNIeupgNt0lhYrhQlnY+FbPBusGz6TbK6HgdFDbYGroCBVxA2BG1wKT75JSsmQ V3+MgaoB6N4cw93PlWHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxDQ-002lBv-9z; Tue, 19 Oct 2021 22:04:12 +0000 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8f-002iuH-2Z for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:18 +0000 Received: by mail-pg1-x52c.google.com with SMTP id 136so862006pgc.2 for ; Tue, 19 Oct 2021 14:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c8Bh3Ui9YNGBrxgDKS29OGaqvTCLClNr/nEGx5BqRmI=; b=dgqh2Eqhu+SfYYXYGbhsVilHapzEJ4OIDr1BtT0zoO05zpsy/wA5LbMzHctCKYnuQx Q0bIqbzAzKQwxjJn26zO+bYhhJlyY+53hoVZ5q/J3KsWY58jm0PILctaAQ7Nr24PFhLb HTQY2Av9jkP/SmrmdIShdLYdbLf4d/GCs1HihLWv8thq0MFbiapI1qzzSbGbA9uW9tqZ pfxFRyeAb40kvS1knlN/uOK81VJZNbYsu+cYH6xcsk6jRvma0KE16RmMH7VxhGY5NPQ3 kk1Z7As/8cfqHlKefmp1xpcoDjElcmxox4m+7WFBpizRLpwQc1K407bngwoZK7CCQ7ca LZgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c8Bh3Ui9YNGBrxgDKS29OGaqvTCLClNr/nEGx5BqRmI=; b=WZJSjYg9QcEr4oAQUNKQBJX0fl1mWaXUI4ujIkIS/5nZRY8h7gK8uV4G0Zz7BcDiQk NDAUh6z6DopTWdvP14xS1G52uV16w38dlCJ22R152Ajfpsr21aRoCc9gYrKwowKeRRR9 oexMYmaFedfigPFl8IFF2ylJsjYRzzQ7Tmx/sUCTs1BGuE92fGG4FZJXX3ilpBozjXdA gusHwgouZ1fDS5BIwngt2HbOHHhjebWXgCE1wNjSP07A3WW1avKpEMeOZhaKDWBfE6nI xsfKpcUH+pFcKJ4t+3fLndEqEw+b0TAZmlO1CbzwchXoXXuaE8YRvaVEhZ0Oc9Tu2K8R dylQ== X-Gm-Message-State: AOAM5326Ubwhz1IOI/F675jYL7V6iMW7scwAOxH20m1KBmTeUWbWlc+E 5Mm6ecF8r/791IzeLg+5SrxCokt42mo= X-Google-Smtp-Source: ABdhPJyau3kDcMWS70+R/w5sw3Fb11r/gal7Glmb2cGuuWx6ZK/a1vJ8yzGBjBB5Xp/mGuHAYq52hA== X-Received: by 2002:a63:724b:: with SMTP id c11mr9662708pgn.59.1634680755869; Tue, 19 Oct 2021 14:59:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:15 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 09/14] irqchip/irq-brcmstb-l2: Switch to IRQCHIP_PLATFORM_DRIVER Date: Tue, 19 Oct 2021 14:58:50 -0700 Message-Id: <20211019215855.1920099-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145917_158773_DC4933CB X-CRM114-Status: GOOD ( 16.14 ) 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 Allow the user selection and building of this interrupt controller driver as a module since it is used on ARM/ARM64 based systems as a second level interrupt controller hanging off the ARM GIC and is therefore loadable during boot. Signed-off-by: Florian Fainelli --- drivers/irqchip/Kconfig | 4 +++- drivers/irqchip/irq-brcmstb-l2.c | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 3022f6137096..dfe54bf9b35f 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -128,7 +128,9 @@ config BCM7120_L2_IRQ select IRQ_DOMAIN config BRCMSTB_L2_IRQ - bool + tristate "Broadcom STB generic L2 interrupt controller driver" + depends on ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC + default ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index 8e0911561f2d..06364ba67d1d 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c @@ -271,20 +271,24 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, } static int __init brcmstb_l2_edge_intc_of_init(struct device_node *np, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { return brcmstb_l2_intc_of_init(np, parent, &l2_edge_intc_init); } -IRQCHIP_DECLARE(brcmstb_l2_intc, "brcm,l2-intc", brcmstb_l2_edge_intc_of_init); -IRQCHIP_DECLARE(brcmstb_hif_spi_l2_intc, "brcm,hif-spi-l2-intc", - brcmstb_l2_edge_intc_of_init); -IRQCHIP_DECLARE(brcmstb_upg_aux_aon_l2_intc, "brcm,upg-aux-aon-l2-intc", - brcmstb_l2_edge_intc_of_init); static int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { return brcmstb_l2_intc_of_init(np, parent, &l2_lvl_intc_init); } -IRQCHIP_DECLARE(bcm7271_l2_intc, "brcm,bcm7271-l2-intc", - brcmstb_l2_lvl_intc_of_init); + +IRQCHIP_PLATFORM_DRIVER_BEGIN(brcmstb_l2) +IRQCHIP_MATCH("brcm,l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,hif-spi-l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,upg-aux-aon-l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,bcm7271-l2-intc", brcmstb_l2_lvl_intc_of_init) +IRQCHIP_PLATFORM_DRIVER_END(brcmstb_l2) +MODULE_DESCRIPTION("Broadcom STB generic L2 interrupt controller"); +MODULE_LICENSE("GPL v2");