From patchwork Thu Oct 10 20:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 175860 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2806410ill; Thu, 10 Oct 2019 13:40:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlicQQ1VvGTdlOxcnun5WbeIhFG+G40LZt+aYVS09sAB/zwldB6km9KoDVnmFtp4AeUmN5 X-Received: by 2002:a17:906:6d89:: with SMTP id h9mr9839023ejt.169.1570740033975; Thu, 10 Oct 2019 13:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570740033; cv=none; d=google.com; s=arc-20160816; b=xZj6AgfVJiOdtQSHqckatOV+aOUzWTtreE7Y4YQ9o+IVX6p5UE8vjMLitgrvvWgl0q IYodWbq0RepaxG8NdScRZlVcpG2f+D6oaDDGL3kEkdUgCbEO1MXldYMKxTBcvJIn4ZLg Wjg8H+4lEfGBatpZVq9lo86kjqyCcXb64hCsFgD8q1tWyi/x9NoK0f7RqP11A0yMoK6q WQrzv4W4BJm7U1o34oSA6VfZsP4yQ20rH9jVUy9YQc8zjnGYnTJMt6toNzGeWRGNIb4+ AOKxqaEjU2k27LdXOOsTd3/nsJ0czkduhyyRWBhSvs2hjaIviA04FV9nulHUjCbyTFzd FnfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IPJvpDFbBIdvpPdKk/dblZ+oKxsLI2y+2rBbhmuu+Qw=; b=IxrC6V3rK5qdYgc/01CrXmtTVu26aBEiuSxjFBe8QzpLuH4hRvjRQPnMqjpN/CG+de tovM+6x0kzIfY7qa0tuNEs33ThuWGaQbtTvydDGonGjO4AlHrL2JrKFe4lTi1FIW4TpB jBlek5Yte8FGiE1+93ok+Ie7tfXkgAg8+rrT4c7ChSSbXYy5IyDJmfq7F+79X0pt6d45 LvwdZTK3ddU73Z+Xz+aE4GgyqQYw6QbFizqUoOSO2nv69abCnSIGFRtN1r8no95igT+V XE2QMx8oomlt74oZr3QJLzEPx2tmFRAFg5+rGcGCCbYbolLrB7jQeX+8k3cbS9ThfAXK 33xA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b31si4988699ede.12.2019.10.10.13.40.33; Thu, 10 Oct 2019 13:40:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726698AbfJJUkb (ORCPT + 3 others); Thu, 10 Oct 2019 16:40:31 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:42177 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726423AbfJJUkb (ORCPT ); Thu, 10 Oct 2019 16:40:31 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M1JJC-1iFv8y1hxS-002m0W; Thu, 10 Oct 2019 22:40:18 +0200 From: Arnd Bergmann To: Kukjin Kim , Krzysztof Kozlowski , Thomas Gleixner , Jason Cooper , Marc Zyngier Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 14/36] ARM: s3c: move irqchip driver back into platform Date: Thu, 10 Oct 2019 22:29:58 +0200 Message-Id: <20191010203043.1241612-14-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191010203043.1241612-1-arnd@arndb.de> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:tpUU70kK2mbi+5FuJ7O/HDHJNvQ8Wxs2kgX7rE8BR+L60lBoHF3 wudUVfEaPZ9r7AlBGTwQ0IxuvapY4pSNPE0QBHfF+o50E83eu4tVD1qYwE6XUbr46E4S4CB PLET0g3wo0KgjbRE2wat355k7aL1MgVVW0+pgArdBYfiF+X0dI8YgaMNmtJufHX+aYCzOCC HLscEytGGJ2sXXgaVEk4Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Q6XMjTeUzfA=:kDFlER7V334bXhY74s+aIR u3ogHMtNrh4V/IPMBwdJUxAYexjVtwtYWli4YpVUT7eNc94Edi1n6HlrJIT3Uks3xzHL/Aiio sD8r5yaB2audjRtGokFlBjtEuOm7dgB557Hm/0scEcKcwYGcwCiavuJnuDBDQzoZdIse5+HNM wUZdOy6PjZNPA9SktuBKQElsVX3i8z+G5zu60ry63tPG2frH28OPRI68mi7dXmF0kS73Bs/5V WG9oUYkTlVkbTjccpzyGqxfx/VNO64NkG/byVmT+q65qidyLadkd6N/Jxk3onG5nYu7RwYW5R 0wh+OpcUzPA9UcyHIyAgtQko0pOgGhh0HoK7cN/hshmtbympJdYcnThHxrLRCkGYRVMCvaCSU TRjDydkbrRcIfpLkmHkzsnp2/xB0Y0OzqPaYELfgNmeDK2ffk+/fTLv/TTjPxjrfi+7qGtV85 5tZyZP2zRKeXl2v2WSuFI1MEteHrEAMvcbZxUnczyfgifZAmGCs0lJInkdsUHUFgO4gNihHFw LrCLW2UIBcGQilEpQwTdEVuIs9l2G4qMXEWEU4MO3/eKTz2fJ9VDyPTaD+Co0sajf0G79Nhna gaY2z0GpLjtT3mBAc5ZoNW2+gTqZyq3f6yxcHVV36U3mrTpVuDwMfO4PNLdzaf+zbyRL+UV3j GXpPl0v4G4zeFjWXEz3Tk74cp2kX54MIv8VU5t1Ya9geXNK21FwDWVFVPMYm6ROCBCP9id4fv Kfi/qwP3bzpB1PPfNq4j22rsXokzBVv5L/hJ4+RDaaJNYMPkgF9R44FmHBoP5iAb5i8g58ysk 2mU0CR+ieJGPiyJVIxXINQfBSh6Ta/XGRX+d92EOigqJWVxAgawm0txOak/khOmw1qmLpnWNm 1G2OwpElH6YpJGzp7AAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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 --- 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.20.0 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 cc7c43932f16..92864e496251 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