From patchwork Tue Feb 12 10:38:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10807641 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDC5D6C2 for ; Tue, 12 Feb 2019 10:46:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA8402B3F4 for ; Tue, 12 Feb 2019 10:46:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE3472B425; Tue, 12 Feb 2019 10:46:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69D562B3F4 for ; Tue, 12 Feb 2019 10:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z3TXJyyJ0MDIV3EbX8MIQKmHLCWIVI28NbNeoo+gbiM=; b=mj0CeJCXnIbmBc 9701UjL618xdaTFc2ZNVyF+q0EhrpApFjJnatfQIGF7vPBVfcb+ANjM1+lNm3bXyIMQEVxBCHx96k nmNWQtg/HrKJoyWflyqcHI/0tghnMtkItYacAE7cFrhcGw9wufBnOQ/3rRvuV98bEFXXD6sucCz0T 5k13mE6AaDaROvhxr1BSANNMfxMA+4E0oHLwG9zI34FwH9rON88iCnJXjeDOsczZCIB4De0/xvPYn DKqg0o1yFGaAXv5ckj65sJLsWnvt9XmcrVSRhLQ8MvcavE94a2gk6F26uyzVxw1ZHgLO7EiuX7EVK pkyXr8R18mgG2YRgR7vg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtVZo-0006Nz-FM; Tue, 12 Feb 2019 10:46:08 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtVTX-0006V1-Lq for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2019 10:40:18 +0000 Received: by mail-wr1-x442.google.com with SMTP id i12so2132274wrw.0 for ; Tue, 12 Feb 2019 02:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E2oKCm2aHyIkLmsWfLt1xuMZ3si46gMPXE7rlXDV4Gg=; b=EEIMo5yeyt6KdFzyppYWPA9MLzhlOwtkwb5U6ilDFIJXCBdoQOnwKQIvQ3hhoTy3OF ULXKI7Y7x7rtjG+ZDMQ1NifNeclNnV7Xqsl1RcC5HXy0mzpYwRi5geFluUSagFwhw/Zj +e5HLrfZWnQm5bHmbrd4eqmtZTf/HqpLRN09wj8LO6TaF1j++mGoXCD88qIZBtIdG3SE 9iqiTXyV3l57cWwPmcYNiDuNuwVUhOAbbBpy0vdeArEBanxAB2sjEXKkRc6cziXpKnV4 AqUddWi1YItsQgTNiuOWvcgRrS3Uvz9YRaCbiId+VQVBAClqukz5KXlm0i6G8r0gnrkn r6Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E2oKCm2aHyIkLmsWfLt1xuMZ3si46gMPXE7rlXDV4Gg=; b=NUd/zHshZQfqFMW1loTIL5pXk41+PiYuj4yL42oMXgnCXODYYTP7T4nIM2ewZQFhAX UTy2t1AiQr400+NqiEO5j15TKynAgwruhVCrDzYW/kJ6nohiuO52tz8iwHrSifSgUs2/ Sy025Kt7yEmx+3IqEG2Q/Nq/8XlSJX1p8WJoHYytEA42ocXta3TdvnLDBo7xeIdITxXl zi7myZcQOPhHSSJ+dO+Gn/6Eqi7T9znXpQd1IxlITzc9bPkpB7WXJSVy3M8ex/Sh+RD5 qQowL5/EAmyzWXUXk4+wPP+HUy+xW/pDYl/JkW+DpXxACyqRHBby7TCre7C5z/2WW3k8 JJOg== X-Gm-Message-State: AHQUAubxczVsXaaVqWkiq9NSXgFSxbaJJ0kjGLEQKk0Bk9X1gcqGqgFn A3jk3vMCgNtfN/D7KCQXdCxUZg== X-Google-Smtp-Source: AHgI3IYZ0e4/pF/fcmBwA6Xw/R/NH+EwMeal/HUk3bAB3+HglsjWwui3/5ABpUNjvxFBEPHB+jzJFw== X-Received: by 2002:adf:f80c:: with SMTP id s12mr2218735wrp.150.1549967978358; Tue, 12 Feb 2019 02:39:38 -0800 (PST) Received: from localhost.localdomain (aputeaux-684-1-38-32.w90-86.abo.wanadoo.fr. [90.86.93.32]) by smtp.gmail.com with ESMTPSA id c14sm3708656wrn.12.2019.02.12.02.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 02:39:37 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier , David Lechner Subject: [PATCH v3 36/37] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Date: Tue, 12 Feb 2019 11:38:34 +0100 Message-Id: <20190212103835.7768-37-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212103835.7768-1-brgl@bgdev.pl> References: <20190212103835.7768-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190212_023940_059709_9B8CD830 X-CRM114-Status: GOOD ( 12.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski The cp-intc driver has now been cleaned up. Move it to drivers/irqchip where it belongs. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/Kconfig | 8 ++------ arch/arm/mach-davinci/Makefile | 2 -- drivers/irqchip/Kconfig | 5 +++++ drivers/irqchip/Makefile | 1 + .../cp_intc.c => drivers/irqchip/irq-davinci-cp-intc.c | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/mach-davinci/cp_intc.c => drivers/irqchip/irq-davinci-cp-intc.c (100%) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 71a4d875dd39..5a59cebc7d0a 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -1,10 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 if ARCH_DAVINCI -config CP_INTC - bool - select IRQ_DOMAIN - config ARCH_DAVINCI_DMx bool @@ -33,13 +29,13 @@ config ARCH_DAVINCI_DA830 select ARCH_DAVINCI_DA8XX # needed on silicon revs 1.0, 1.1: select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE - select CP_INTC + select DAVINCI_CP_INTC config ARCH_DAVINCI_DA850 bool "DA850/OMAP-L138/AM18x based system" depends on !ARCH_DAVINCI_DMx || (AUTO_ZRELADDR && ARM_PATCH_PHYS_VIRT) select ARCH_DAVINCI_DA8XX - select CP_INTC + select DAVINCI_CP_INTC config ARCH_DAVINCI_DA8XX bool diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index 983865a99616..f76a8482784f 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -18,8 +18,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DM365) += dm365.o devices.o obj-$(CONFIG_ARCH_DAVINCI_DA830) += da830.o devices-da8xx.o usb-da8xx.o obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o devices-da8xx.o usb-da8xx.o -obj-$(CONFIG_CP_INTC) += cp_intc.o - # Board specific obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o pdata-quirks.o obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index ea0eb82bf1d2..48fc5024c073 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -134,6 +134,11 @@ config DAVINCI_AINTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config DAVINCI_CP_INTC + bool + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + config DW_APB_ICTL bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 623e0ec5f9d0..e6cd0c98eff2 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_ATH79) += irq-ath79-misc.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o obj-$(CONFIG_DAVINCI_AINTC) += irq-davinci-aintc.o +obj-$(CONFIG_DAVINCI_CP_INTC) += irq-davinci-cp-intc.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_FARADAY_FTINTC010) += irq-ftintc010.o obj-$(CONFIG_ARCH_HIP04) += irq-hip04.o diff --git a/arch/arm/mach-davinci/cp_intc.c b/drivers/irqchip/irq-davinci-cp-intc.c similarity index 100% rename from arch/arm/mach-davinci/cp_intc.c rename to drivers/irqchip/irq-davinci-cp-intc.c