Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp233518pxb; Wed, 20 Jan 2021 05:54:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj2A4vtt1PpqEblm4KajEWxejJJL3cWHayDVd2deSc0GBEmBxqhwFITNlxkPcf5W4Vf39i X-Received: by 2002:a17:906:660b:: with SMTP id b11mr6738099ejp.458.1611150856250; Wed, 20 Jan 2021 05:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611150856; cv=none; d=google.com; s=arc-20160816; b=tqmVYbTp/WS/F1Hbrx+LFYMZnfNUMQ+mXJY1GQk81p0OUmDVy7jW35ehjxnnM4LFeM X3Pvsfh1/WaFqb61WH/EUe+YcmbH0UdOZ/PZ0ALKdiz6i6v4hy0GE7nh81KnwCqoQpfX rbK9cUT0e1iT2S53Pq1RfXdSJc/GSQjhYxrMha5bZifcS1Dj2+ar4FVZ+Rol/AfBe9z4 wzPXjfV1ZX8iCpnCqbTGLuFfpUCXvbswmkmq/9KnSaJPgo4OZ527d/XvPjEcs0YYS8rm IU9pcC0n4L15SInHwVh2yi9AMKAn6k/NgBQJj+zHJBO4L9cNgBOGweIKKlohB6IRsTte Euzg== 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=sMJChjzatUR3iEo6un/r2xlUtWB+BC94V6pUSwkF9M8=; b=EFIfbitgetd75ihrLSxZFoO+GxYFYAY4PcVZuKiXWJlMT3pUIimGbCwZnszYoEWCRe CePHRHRgcjj4AEw+K35h+nZzZoW/0MletCl45CrSeDJi2pHTSiE8CZkwxqXzJYNxyHGf /J4bDi6fLpEotrdtm+jJeVnhYYPV5G/Gb4p/3A+ls4CBvFJzkScl/xJWiV8lDLikhHew au4TVPozVroLoDcN63LHBm73Uu5UX9d3lQQ+NO9nNtNQp3x1o6rfDZx5jG8b3OgeYBYP /zkUKymHLiC9QtA6s3u0/94KCHx6N9aVs7Icmwb5c4SXaeo7SA5SgzH6mMIDDFRT0TcW Ug5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iF0Znv7S; 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 f13si906301edx.272.2021.01.20.05.53.51; Wed, 20 Jan 2021 05:54:16 -0800 (PST) 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=k20201202 header.b=iF0Znv7S; 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 S1733309AbhATNsD (ORCPT + 99 others); Wed, 20 Jan 2021 08:48:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:57022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389954AbhATNbA (ORCPT ); Wed, 20 Jan 2021 08:31:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4ED52339D; Wed, 20 Jan 2021 13:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611149417; bh=IWIhV7+3ze25aZBEwRA7jw5PWpaQASETcHDgvAEHG6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iF0Znv7SSwFUJbJPBh9VPgsEvubErhedIQsGPjPrZsONQ/WbPPnh+Rgz+UoxToPeI nbYcosgxKTIJGyw2LyEFR4+Cyf1eOjgpqs7KrV1MFfslzvlCKnTVqAuGL0fMmYmsBY 1Un1hFq2DnsPXCPKhgj/0SCT9jnDzRN7aophIe3zJPoSPE50t3Ik7RjqmgaPO7y1qp YGaqlVtfff+2spTZLBvsBd2TkdY7RGNYZu5SnvSAIyjF5mgYDK7CwmBbKu3cUDSgtl TruzSTarfdgLNXbYMkFgDyZQ5P21XVeSsen4l8soZMBWMhmMnfILHyBUDkvny60QQS ZJRs4OtK1KO4g== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Zyngier , Thomas Gleixner Cc: Arnd Bergmann , Barry Song Subject: [PATCH 2/2] irqchip: remove sirfsoc driver Date: Wed, 20 Jan 2021 14:30:08 +0100 Message-Id: <20210120133008.2421897-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120133008.2421897-1-arnd@kernel.org> References: <20210120133008.2421897-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann The CSR SiRF prima2/atlas platforms are getting removed, so this driver is no longer needed. Cc: Barry Song Signed-off-by: Arnd Bergmann --- drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-sirfsoc.c | 134 ---------------------------------- 2 files changed, 135 deletions(-) delete mode 100644 drivers/irqchip/irq-sirfsoc.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 084e11774071..37e3556df127 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_I8259) += irq-i8259.o obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.o obj-$(CONFIG_IRQ_MIPS_CPU) += irq-mips-cpu.o obj-$(CONFIG_IXP4XX_IRQ) += irq-ixp4xx.o -obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o obj-$(CONFIG_JCORE_AIC) += irq-jcore-aic.o obj-$(CONFIG_RDA_INTC) += irq-rda-intc.o obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c deleted file mode 100644 index c86faaa35ca4..000000000000 --- a/drivers/irqchip/irq-sirfsoc.c +++ /dev/null @@ -1,134 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * interrupt controller support for CSR SiRFprimaII - * - * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define SIRFSOC_INT_RISC_MASK0 0x0018 -#define SIRFSOC_INT_RISC_MASK1 0x001C -#define SIRFSOC_INT_RISC_LEVEL0 0x0020 -#define SIRFSOC_INT_RISC_LEVEL1 0x0024 -#define SIRFSOC_INIT_IRQ_ID 0x0038 -#define SIRFSOC_INT_BASE_OFFSET 0x0004 - -#define SIRFSOC_NUM_IRQS 64 -#define SIRFSOC_NUM_BANKS (SIRFSOC_NUM_IRQS / 32) - -static struct irq_domain *sirfsoc_irqdomain; - -static void __iomem *sirfsoc_irq_get_regbase(void) -{ - return (void __iomem __force *)sirfsoc_irqdomain->host_data; -} - -static __init void sirfsoc_alloc_gc(void __iomem *base) -{ - unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; - unsigned int set = IRQ_LEVEL; - struct irq_chip_generic *gc; - struct irq_chip_type *ct; - int i; - - irq_alloc_domain_generic_chips(sirfsoc_irqdomain, 32, 1, "irq_sirfsoc", - handle_level_irq, clr, set, - IRQ_GC_INIT_MASK_CACHE); - - for (i = 0; i < SIRFSOC_NUM_BANKS; i++) { - gc = irq_get_domain_generic_chip(sirfsoc_irqdomain, i * 32); - gc->reg_base = base + i * SIRFSOC_INT_BASE_OFFSET; - ct = gc->chip_types; - ct->chip.irq_mask = irq_gc_mask_clr_bit; - ct->chip.irq_unmask = irq_gc_mask_set_bit; - ct->regs.mask = SIRFSOC_INT_RISC_MASK0; - } -} - -static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs) -{ - void __iomem *base = sirfsoc_irq_get_regbase(); - u32 irqstat; - - irqstat = readl_relaxed(base + SIRFSOC_INIT_IRQ_ID); - handle_domain_irq(sirfsoc_irqdomain, irqstat & 0xff, regs); -} - -static int __init sirfsoc_irq_init(struct device_node *np, - struct device_node *parent) -{ - void __iomem *base = of_iomap(np, 0); - if (!base) - panic("unable to map intc cpu registers\n"); - - sirfsoc_irqdomain = irq_domain_add_linear(np, SIRFSOC_NUM_IRQS, - &irq_generic_chip_ops, base); - sirfsoc_alloc_gc(base); - - writel_relaxed(0, base + SIRFSOC_INT_RISC_LEVEL0); - writel_relaxed(0, base + SIRFSOC_INT_RISC_LEVEL1); - - writel_relaxed(0, base + SIRFSOC_INT_RISC_MASK0); - writel_relaxed(0, base + SIRFSOC_INT_RISC_MASK1); - - set_handle_irq(sirfsoc_handle_irq); - - return 0; -} -IRQCHIP_DECLARE(sirfsoc_intc, "sirf,prima2-intc", sirfsoc_irq_init); - -struct sirfsoc_irq_status { - u32 mask0; - u32 mask1; - u32 level0; - u32 level1; -}; - -static struct sirfsoc_irq_status sirfsoc_irq_st; - -static int sirfsoc_irq_suspend(void) -{ - void __iomem *base = sirfsoc_irq_get_regbase(); - - sirfsoc_irq_st.mask0 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK0); - sirfsoc_irq_st.mask1 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK1); - sirfsoc_irq_st.level0 = readl_relaxed(base + SIRFSOC_INT_RISC_LEVEL0); - sirfsoc_irq_st.level1 = readl_relaxed(base + SIRFSOC_INT_RISC_LEVEL1); - - return 0; -} - -static void sirfsoc_irq_resume(void) -{ - void __iomem *base = sirfsoc_irq_get_regbase(); - - writel_relaxed(sirfsoc_irq_st.mask0, base + SIRFSOC_INT_RISC_MASK0); - writel_relaxed(sirfsoc_irq_st.mask1, base + SIRFSOC_INT_RISC_MASK1); - writel_relaxed(sirfsoc_irq_st.level0, base + SIRFSOC_INT_RISC_LEVEL0); - writel_relaxed(sirfsoc_irq_st.level1, base + SIRFSOC_INT_RISC_LEVEL1); -} - -static struct syscore_ops sirfsoc_irq_syscore_ops = { - .suspend = sirfsoc_irq_suspend, - .resume = sirfsoc_irq_resume, -}; - -static int __init sirfsoc_irq_pm_init(void) -{ - if (!sirfsoc_irqdomain) - return 0; - - register_syscore_ops(&sirfsoc_irq_syscore_ops); - return 0; -} -device_initcall(sirfsoc_irq_pm_init); -- 2.29.2