From patchwork Fri Sep 24 17:05:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12516131 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 84CD2C433F5 for ; Fri, 24 Sep 2021 17:07:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69AC160F24 for ; Fri, 24 Sep 2021 17:07:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347464AbhIXRJF (ORCPT ); Fri, 24 Sep 2021 13:09:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345001AbhIXRIx (ORCPT ); Fri, 24 Sep 2021 13:08:53 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35897C06173F; Fri, 24 Sep 2021 10:07:10 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id l6so6893929plh.9; Fri, 24 Sep 2021 10:07:10 -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=eJqOiaR2jHtpg9+BBO4LSB6AnAnZl/L7fEFp553mOqY=; b=ijT76Pw0UGcRTUFjFc0uMiNrNCAt6p5G16afIfJ/2k368lKeRryhqGQuQT5I2jCr5y IBrne0HiGhP81b/hthWHjgQBbCxjvQvm6IxABJL8vz2SkHZZR8hRi0+ry31F9/JaesmI CftbtQijSSGsdf/vPnE4zExUMzIQ11MnhBle0TOkxT1iIZN2iADjU4Ek8TlXjNLiCHbk 0GpNWE5dvSFws1OM1VeHCLtBhncQu6TPU5MEvCrMrsro+kh4oFQ8Q9h98gUgoWHhuESq orSq0FvVlFpKkjNEZeQYH7hwL1sUr/9k8Q/oBlPFtP6XPpjfdoKSYzgHlOdqzsBb8IUy LAjA== 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=eJqOiaR2jHtpg9+BBO4LSB6AnAnZl/L7fEFp553mOqY=; b=PCgW2e2mAiMYdzQGzLR8/ZHsIj8dg3dcOn3AAEzDqR0H+1CipELHx/4tkpObXgUS7j i/svYcEg8645XpT+3SSvyJy1tMccphi0OPGt/u7YznrrJzpIMdpRQYu8G9HW1G3T173d NZcU6fgQAx9MqX4yCtc5XbuHpVoFCYSgh08HNTMjrvCCmcRMfub08lpnED6SPuZaaBpJ EhOhpMNt6dMS98Uc+bqPP2/caqPC8uAnW94oT+S2DiV9r5GsfxMXULkFI+ksI8y8bCAj 6cR3GJUyosqnznZEGB1OjjQOGw5DAVbY1m+2SU0TIvWR3/yDeVB/NGusTKeaDuqznpC/ RS7w== X-Gm-Message-State: AOAM531QJZ3GVXyduF2UGRqD9gzsaeEQwKBz5k3CcR8PJf5YFpn64NvX T0Wa2aBGicgw0pJnXLDmU/biBxVgqF8= X-Google-Smtp-Source: ABdhPJxrbEnCCSD3RpEkz9KvGEjt5zfKk76JXZjw55DyrOHy2ROe+ry2Qanz0Zvq8kaMg4GlP1w8Uw== X-Received: by 2002:a17:90a:cb14:: with SMTP id z20mr3446786pjt.230.1632503229567; Fri, 24 Sep 2021 10:07:09 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k22sm9659312pfi.149.2021.09.24.10.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 10:07:09 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Russell King , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Catalin Marinas , Will Deacon , Yoshinori Sato , Rich Felker , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , Ard Biesheuvel , Mike Rapoport , Linus Walleij , Andrew Morton , Geert Uytterhoeven , Arnd Bergmann , Guenter Roeck , Kefeng Wang , Mark Rutland , Andrey Konovalov , Anshuman Khandual , Valentin Schneider , Ingo Molnar , Peter Zijlstra , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-sh@vger.kernel.org (open list:SUPERH), linux-mips@vger.kernel.org (open list:BROADCOM BMIPS MIPS ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH 09/11] irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER Date: Fri, 24 Sep 2021 10:05:44 -0700 Message-Id: <20210924170546.805663-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210924170546.805663-1-f.fainelli@gmail.com> References: <20210924170546.805663-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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-bcm7120-l2.c | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index dfe54bf9b35f..c7320bed5668 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -123,7 +123,9 @@ config BCM7038_L1_IRQ select GENERIC_IRQ_EFFECTIVE_AFF_MASK config BCM7120_L2_IRQ - bool + tristate "Broadcom STB 7120-style L2 interrupt controller driver" + depends on ARCH_BRCMSTB || BMIPS_GENERIC + default ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index f23d7651ea84..c1676419dee7 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c @@ -347,8 +347,9 @@ static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn, "BCM3380 L2"); } -IRQCHIP_DECLARE(bcm7120_l2_intc, "brcm,bcm7120-l2-intc", - bcm7120_l2_intc_probe_7120); - -IRQCHIP_DECLARE(bcm3380_l2_intc, "brcm,bcm3380-l2-intc", - bcm7120_l2_intc_probe_3380); +IRQCHIP_PLATFORM_DRIVER_BEGIN(bcm7120_l2) +IRQCHIP_MATCH("brcm,bcm7120-l2-intc", bcm7120_l2_intc_probe_7120) +IRQCHIP_MATCH("brcm,bcm3380-l2-intc", bcm7120_l2_intc_probe_3380) +IRQCHIP_PLATFORM_DRIVER_END(bcm7120_l2) +MODULE_DESCRIPTION("Broadcom STB 7120-style L2 interrupt controller driver"); +MODULE_LICENSE("GPL v2");