From patchwork Thu Aug 6 18:20:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 247515 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp1744314ilo; Thu, 6 Aug 2020 11:37:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7azU1D3R0BxNqMjRl0VgJlGZXdfRIN5jZWfI/h83kPbKN0kgnorGF9Ay4qKmIf9B3pJGa X-Received: by 2002:a17:906:817:: with SMTP id e23mr5611718ejd.203.1596739044249; Thu, 06 Aug 2020 11:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596739044; cv=none; d=google.com; s=arc-20160816; b=ZofRv4dnFdry0IeJn+rYAYaD2Oi61ybx2osqrJh4igEE/fV+Vy83rCrZhGCb4zKl/+ e1IMPJUw0Vr2meZP5BmWmlMlqClJLz4Cc4l46Qdym+kruhRhMgmkdX5YVEw/IpCgKMJU OT0InpesN9G1Ny00rtft/RLqyDRUW64DZ8Hg8hNN6IpicuC8X1MHJHpv+Kt6S7P/hypm I8yTKX7sAgxhOhcvZYU7TByXXlMphGY38ucR5wqefkjxQNmQp5e6RH9gqAx5swDkZdBU 4I0lQRO9PPRlOD0J0/CgBcb/jRE2bmvfG0F668dEQhTsQNks7OKZB5P2oBVfOJKGHK/K quwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=rsYnBbqzxxaM3Lotff43hYpvmChxH007MvFemULZgDU=; b=Uds9+ZLz+0Vy4yNS3OFhqGaPctjl2D2ou7rghuMQzPT2Dp7fgeCPiZGUCbIT3Pb3g4 B54odRLzEgp9a9TAudgufAOkXuSmI6+VdPmtegD623abz8gXzNfRfSTJRnF+Fna+hNBz wEeJozP5K/48t8W1gt1eT4XkXkqE6OPb4A4mdYzFDuxUO1rLjY0GkJn94bcNovd5s4fD lqc9Sys8k7pwlGAkNEcYNFbdnKQVNVdnukRnzqqoMlcW4rHbKxUaw4O93FBg5M7aQARL CA/hfLmMSSvdPmDUlsITYGdbZ72nEzguboYTrjhdlrcFcjmKLXGB9rsZw39nFImuYzx0 257A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oEnc8CMf; spf=pass (google.com: domain of linux-samsung-soc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-samsung-soc-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 ga10si3783633ejb.372.2020.08.06.11.37.23; Thu, 06 Aug 2020 11:37:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-samsung-soc-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=default header.b=oEnc8CMf; spf=pass (google.com: domain of linux-samsung-soc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-samsung-soc-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 S1727055AbgHFShW (ORCPT + 4 others); Thu, 6 Aug 2020 14:37:22 -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-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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%) -- 2.17.1 Acked-by: Marc Zyngier 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