From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 E8210C282CA for ; Tue, 12 Feb 2019 10:40:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAD8220818 for ; Tue, 12 Feb 2019 10:40:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="EEIMo5ye" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729204AbfBLKj7 (ORCPT ); Tue, 12 Feb 2019 05:39:59 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44946 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729151AbfBLKjj (ORCPT ); Tue, 12 Feb 2019 05:39:39 -0500 Received: by mail-wr1-f67.google.com with SMTP id v16so2058078wrn.11 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=naznNoX9TBQrvjCXyJYEFzkTfWI9gaXqgAnT7sgydr8gzk165vmtNTMuf+TZGrX9gM z/VzC9PhVbU3Ds5ORZhrHai9hZnoNVDezW7H7qdPvgzhLap2fmzVtFZKZFHeC/jFpLFM RLStF2J+Mfd1eBBNk0GZRhnqbn2eZ4MxNTxNZ1n516RubPuT3bWhL+ONNaqN/yWNyCd4 IJLa9W8zqK+a46+Ru3hz7eOkn4PEsh435d5h6vY2OR2ZOIt559cccuacrl6AKNOgVR26 PlmZNWgpEAWF2dd8fOPg/HT7PDAOjKJXr3+f1LvZwRGAhdqh9FlNv4znqym0zjRVDt2G Kg/Q== X-Gm-Message-State: AHQUAuaP5XhPEYfZD5zc6Ah0+nEdkYsINv81MKuA88O1qwk3PfPUAaFg SRwHmUbCqc6JJbyUBqMdqiRgeQ== 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski 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 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- 2.20.1