From patchwork Sun Apr 3 14:39:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 8734421 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 235229F39A for ; Sun, 3 Apr 2016 14:43:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F8CF201EF for ; Sun, 3 Apr 2016 14:43:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC6C4201EC for ; Sun, 3 Apr 2016 14:43:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1amjDR-000568-TE; Sun, 03 Apr 2016 14:41:25 +0000 Received: from conuserg-12.nifty.com ([210.131.2.79]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1amjCZ-0004le-To for linux-arm-kernel@lists.infradead.org; Sun, 03 Apr 2016 14:40:35 +0000 Received: from grover.sesame (FL1-203-136-65-164.osk.mesh.ad.jp [203.136.65.164]) (authenticated) by conuserg-12.nifty.com with ESMTP id u33EdWQX028443; Sun, 3 Apr 2016 23:39:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u33EdWQX028443 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1459694388; bh=1PLyEVoB605zJMti8kxeKKcXMac1hoDUY+0EJClo0po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YDVoZWvh9hGC99lWjRbhLu+KS/t4LyFAkDVmfyWQ6AaCTI5ehvt19+r+/Exj2GDfI LrG8iavx4cCb/DAzZZxurcqFAyLAVOWqD0/YfWrfLgk9ouao6bgDI3kBlRe/YmDWCW QKl1sDEsIn1KmyZbmcIq+a0M40WhX+qiNMqAE++dmO6HHO5irYtD/+4W2v/y1Ge9ES tD5Ku87aCqjgWtNpUhsIGCHlHDeMaE0pngIPgqx8VaZXVJW9Abm4f/a7oVhj9HC3Vm rzjwUz7/znCD28U8mq1vZYFJXNaLnqOxGNUZewhIFqwkQm/oMnIYzuX61ogV6kM3yq 88vZQwjIHsdIA== X-Nifty-SrcIP: [203.136.65.164] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 6/9] ARM: rockchip: move mach-rockchip/ to platforms/rockchip/ Date: Sun, 3 Apr 2016 23:39:24 +0900 Message-Id: <1459694367-18635-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459694367-18635-1-git-send-email-yamada.masahiro@socionext.com> References: <1459694367-18635-1-git-send-email-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160403_074032_469395_26A8CD35 X-CRM114-Status: GOOD ( 10.47 ) X-Spam-Score: -1.2 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Arnd Bergmann , Marcus Cooper , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Russell King , linux-kernel@vger.kernel.org, Masahiro Yamada , Mark Brown , Olof Johansson , Maxime Ripard MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Masahiro Yamada --- arch/arm/Kconfig | 2 -- arch/arm/Makefile | 1 - arch/arm/platforms/Kconfig | 1 + arch/arm/platforms/Makefile | 1 + arch/arm/{mach-rockchip => platforms/rockchip}/Kconfig | 0 arch/arm/{mach-rockchip => platforms/rockchip}/Makefile | 0 arch/arm/{mach-rockchip => platforms/rockchip}/core.h | 0 arch/arm/{mach-rockchip => platforms/rockchip}/headsmp.S | 0 arch/arm/{mach-rockchip => platforms/rockchip}/platsmp.c | 0 arch/arm/{mach-rockchip => platforms/rockchip}/pm.c | 0 arch/arm/{mach-rockchip => platforms/rockchip}/pm.h | 0 arch/arm/{mach-rockchip => platforms/rockchip}/rockchip.c | 0 arch/arm/{mach-rockchip => platforms/rockchip}/sleep.S | 0 13 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/{mach-rockchip => platforms/rockchip}/Kconfig (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/Makefile (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/core.h (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/headsmp.S (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/platsmp.c (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/pm.c (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/pm.h (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/rockchip.c (100%) rename arch/arm/{mach-rockchip => platforms/rockchip}/sleep.S (100%) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/platforms/rockchip/Kconfig similarity index 100% rename from arch/arm/mach-rockchip/Kconfig rename to arch/arm/platforms/rockchip/Kconfig diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/platforms/rockchip/Makefile similarity index 100% rename from arch/arm/mach-rockchip/Makefile rename to arch/arm/platforms/rockchip/Makefile diff --git a/arch/arm/mach-rockchip/core.h b/arch/arm/platforms/rockchip/core.h similarity index 100% rename from arch/arm/mach-rockchip/core.h rename to arch/arm/platforms/rockchip/core.h diff --git a/arch/arm/mach-rockchip/headsmp.S b/arch/arm/platforms/rockchip/headsmp.S similarity index 100% rename from arch/arm/mach-rockchip/headsmp.S rename to arch/arm/platforms/rockchip/headsmp.S diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/platforms/rockchip/platsmp.c similarity index 100% rename from arch/arm/mach-rockchip/platsmp.c rename to arch/arm/platforms/rockchip/platsmp.c diff --git a/arch/arm/mach-rockchip/pm.c b/arch/arm/platforms/rockchip/pm.c similarity index 100% rename from arch/arm/mach-rockchip/pm.c rename to arch/arm/platforms/rockchip/pm.c diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/platforms/rockchip/pm.h similarity index 100% rename from arch/arm/mach-rockchip/pm.h rename to arch/arm/platforms/rockchip/pm.h diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/platforms/rockchip/rockchip.c similarity index 100% rename from arch/arm/mach-rockchip/rockchip.c rename to arch/arm/platforms/rockchip/rockchip.c diff --git a/arch/arm/mach-rockchip/sleep.S b/arch/arm/platforms/rockchip/sleep.S similarity index 100% rename from arch/arm/mach-rockchip/sleep.S rename to arch/arm/platforms/rockchip/sleep.S diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ce9ba91..51e2663 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -810,8 +810,6 @@ source "arch/arm/mach-qcom/Kconfig" source "arch/arm/mach-realview/Kconfig" -source "arch/arm/mach-rockchip/Kconfig" - source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/mach-spear/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 9850f92..923be10 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -199,7 +199,6 @@ machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_QCOM) += qcom machine-$(CONFIG_ARCH_REALVIEW) += realview -machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig index 18a1e85..ce6ed8a 100644 --- a/arch/arm/platforms/Kconfig +++ b/arch/arm/platforms/Kconfig @@ -1,5 +1,6 @@ # This is sorted alphabetically by directory pathname. +source "arch/arm/platforms/rockchip/Kconfig" source "arch/arm/platforms/socfpga/Kconfig" source "arch/arm/platforms/sunxi/Kconfig" source "arch/arm/platforms/uniphier/Kconfig" diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile index e37786d..bf88c66e 100644 --- a/arch/arm/platforms/Makefile +++ b/arch/arm/platforms/Makefile @@ -1,5 +1,6 @@ # This list sorted alphanumerically by CONFIG_* macro name. +obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/