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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5E81FC433E0 for ; Thu, 6 Aug 2020 18:37:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90C6B221E3 for ; Thu, 6 Aug 2020 18:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596739058; bh=pG1MboF8wBXISDiULzH8o82ZTtVx8IQwYibmbEjCkVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ohqOveHjqCSrH7JRMsWduFCT03gfDUecDzn3xETzI8UX1gwFf0X89JdQM/IkhSaJS Tb7Ai3u4LTHXpUhRVhqR87SJYnR8YhO7vY969lxN1OrtBI1Gj4BchBZgd/ydlxzbiK vqpgiNxWqOehri2SqL41Bc1rnOFvdyGUxytxfhnc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729606AbgHFShY (ORCPT ); Thu, 6 Aug 2020 14:37:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:58954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729278AbgHFSf7 (ORCPT ); Thu, 6 Aug 2020 14:35:59 -0400 Received: from localhost.localdomain (unknown [194.230.155.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39E6C22D73; Thu, 6 Aug 2020 18:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738182; bh=pG1MboF8wBXISDiULzH8o82ZTtVx8IQwYibmbEjCkVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEnc8CMfHBKNgXuR4UcoX7Y8DV1CrAjiplAv0RiLVN59kmo15s7NwCxanfHok5Qt4 Mpq5IW2plSmQS7nby0x+knH5yA4CNQMZiVyJJZj26mx+0+HLnh4axxciMBIBXiLoRr 9WWPdvXKdDFL5WLNH2iIgtfyMSE9rs4MmsKyiX9c= From: Krzysztof Kozlowski To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Krzysztof Kozlowski , Russell King , Thomas Gleixner , Jason Cooper , Marc Zyngier , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 21/41] ARM: s3c24xx: move irqchip driver back into platform Date: Thu, 6 Aug 2020 20:20:38 +0200 Message-Id: <20200806182059.2431-21-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann It was a good idea to move it out at first, but the irqchip code is still tightly connected to the s3c24xx platform code and uses multiple internal header files, so just move it back for the time being to avoid those dependencies. Signed-off-by: Arnd Bergmann Signed-off-by: Krzysztof Kozlowski --- arch/arm/mach-s3c24xx/Makefile | 1 + {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c | 0 drivers/irqchip/Makefile | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c (100%) diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 6692f2de71b2..8c31f84f8c97 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -8,6 +8,7 @@ # core obj-y += common.o +obj-y += irq-s3c24xx.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o diff --git a/drivers/irqchip/irq-s3c24xx.c b/arch/arm/mach-s3c24xx/irq-s3c24xx.c similarity index 100% rename from drivers/irqchip/irq-s3c24xx.c rename to arch/arm/mach-s3c24xx/irq-s3c24xx.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 133f9c45744a..8c983ad774f6 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_LPC32XX) += irq-lpc32xx.o obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o -obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o obj-$(CONFIG_OMPIC) += irq-ompic.o -- 2.17.1 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 2BB7CC433DF for ; Thu, 6 Aug 2020 19:43:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 23C562177B for ; Thu, 6 Aug 2020 19:43:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AsGRtEiZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="oEnc8CMf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23C562177B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=aEGc7WvSsRFMyberBobQg9kLeTWsSOMubphZHx8tvo8=; b=AsGRtEiZGsavstG6sg2zTu5J99 xikOYo/GZ3udd0t9SML0o3rfecQgFmeHgeudwHpGsNLrZnOmDa5A42ZOQGPr89CW9i1S4fMYHnbh/ F3cEEJcFERDRP2KFiIOnycbK+jB3qvWDmeLw1X6KX0FRDbdxU1QWXYIsfcZQtiN+27fWzNqQuUdxo dBuacysWYlU3mfCGEBp1666DhFDVnwb0HUWT5+dZDjxTtmykyyJ4JVoYlxbX004z8gaTa4XVKT9Li 2yiVFzjVVe1y8hXzcn1ly5dJl92o+7qVswoT5f5xtQxehDz9zcbihdvwfSnd1UnLLs/oR/WVX3FYj WLnCM8HQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3kaN-00020A-PP; Thu, 06 Aug 2020 18:25:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3kXe-0008Uo-Fz for linux-arm-kernel@lists.infradead.org; Thu, 06 Aug 2020 18:23:03 +0000 Received: from localhost.localdomain (unknown [194.230.155.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39E6C22D73; Thu, 6 Aug 2020 18:23:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738182; bh=pG1MboF8wBXISDiULzH8o82ZTtVx8IQwYibmbEjCkVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEnc8CMfHBKNgXuR4UcoX7Y8DV1CrAjiplAv0RiLVN59kmo15s7NwCxanfHok5Qt4 Mpq5IW2plSmQS7nby0x+knH5yA4CNQMZiVyJJZj26mx+0+HLnh4axxciMBIBXiLoRr 9WWPdvXKdDFL5WLNH2iIgtfyMSE9rs4MmsKyiX9c= From: Krzysztof Kozlowski To: linux-kernel@vger.kernel.org Subject: [PATCH v2 21/41] ARM: s3c24xx: move irqchip driver back into platform Date: Thu, 6 Aug 2020 20:20:38 +0200 Message-Id: <20200806182059.2431-21-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200806_142302_626693_EC933201 X-CRM114-Status: GOOD ( 16.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, Jason Cooper , Arnd Bergmann , Marc Zyngier , Russell King , Krzysztof Kozlowski , Kukjin Kim , Thomas Gleixner , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann It was a good idea to move it out at first, but the irqchip code is still tightly connected to the s3c24xx platform code and uses multiple internal header files, so just move it back for the time being to avoid those dependencies. Signed-off-by: Arnd Bergmann Signed-off-by: Krzysztof Kozlowski --- arch/arm/mach-s3c24xx/Makefile | 1 + {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c | 0 drivers/irqchip/Makefile | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c (100%) diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 6692f2de71b2..8c31f84f8c97 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -8,6 +8,7 @@ # core obj-y += common.o +obj-y += irq-s3c24xx.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o diff --git a/drivers/irqchip/irq-s3c24xx.c b/arch/arm/mach-s3c24xx/irq-s3c24xx.c similarity index 100% rename from drivers/irqchip/irq-s3c24xx.c rename to arch/arm/mach-s3c24xx/irq-s3c24xx.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 133f9c45744a..8c983ad774f6 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_LPC32XX) += irq-lpc32xx.o obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o -obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o obj-$(CONFIG_OMPIC) += irq-ompic.o -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel