From patchwork Sun Apr 3 14:39:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 8734461 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 51FA29F39A for ; Sun, 3 Apr 2016 14:44:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 188B720219 for ; Sun, 3 Apr 2016 14:44:42 +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 12741201F2 for ; Sun, 3 Apr 2016 14:44:40 +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 1amjEw-0006Wc-1A; Sun, 03 Apr 2016 14:42:58 +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-0004qL-Gv for linux-arm-kernel@lists.infradead.org; Sun, 03 Apr 2016 14:41:00 +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 u33EdWQa028443; Sun, 3 Apr 2016 23:39:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u33EdWQa028443 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1459694393; bh=30Azegc7zf1dUrLzdw5L2+8zC78L4Ifq2aLe7xy/oDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=go/1u2p7lwR2HdEFCxczdpi01j++IaqLdUa9wtWy5tKHCKw+VrZ2bJz2K59517/8d yc/81xfqn174iq9+7WnROhm5xYn965ABsfW4sCatbsOWsSV5VGbQ1Xj1epx9e6VFZy zEGQ9Vl6rzviRp936v5whkzYss37S4pEKiwNukSeXIr5SUX5NlIIxMOBNVd/D8x95m HtjL1SIMy5L7lzV6rzswKv0ZaYYUpX7+y2b4rOfGvvlik1BMBPSvd7KYuon6lFPdEW aglXRfLs8FlChUn0oSAVVz0k04VbTk4/FBf1bJRBVzDM8KuwnigbapIeV3eZQUIs4M 2hKpx2d14h2dA== X-Nifty-SrcIP: [203.136.65.164] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 9/9] ARM: bcm: move mach-bcm/ to platforms/bcm/ Date: Sun, 3 Apr 2016 23:39:27 +0900 Message-Id: <1459694367-18635-10-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_074058_007703_D2F05527 X-CRM114-Status: GOOD ( 10.38 ) 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-bcm => platforms/bcm}/Kconfig | 0 arch/arm/{mach-bcm => platforms/bcm}/Makefile | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h | 0 arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c | 0 arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c | 0 arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c | 0 arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c | 0 arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c | 0 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c | 0 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h | 0 arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c | 0 arch/arm/{mach-bcm => platforms/bcm}/platsmp.c | 0 23 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/{mach-bcm => platforms/bcm}/Kconfig (100%) rename arch/arm/{mach-bcm => platforms/bcm}/Makefile (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h (100%) rename arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h (100%) rename arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c (100%) rename arch/arm/{mach-bcm => platforms/bcm}/platsmp.c (100%) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/platforms/bcm/Kconfig similarity index 100% rename from arch/arm/mach-bcm/Kconfig rename to arch/arm/platforms/bcm/Kconfig diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/platforms/bcm/Makefile similarity index 100% rename from arch/arm/mach-bcm/Makefile rename to arch/arm/platforms/bcm/Makefile diff --git a/arch/arm/mach-bcm/bcm63xx.c b/arch/arm/platforms/bcm/bcm63xx.c similarity index 100% rename from arch/arm/mach-bcm/bcm63xx.c rename to arch/arm/platforms/bcm/bcm63xx.c diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/platforms/bcm/bcm63xx_pmb.c similarity index 100% rename from arch/arm/mach-bcm/bcm63xx_pmb.c rename to arch/arm/platforms/bcm/bcm63xx_pmb.c diff --git a/arch/arm/mach-bcm/bcm63xx_smp.c b/arch/arm/platforms/bcm/bcm63xx_smp.c similarity index 100% rename from arch/arm/mach-bcm/bcm63xx_smp.c rename to arch/arm/platforms/bcm/bcm63xx_smp.c diff --git a/arch/arm/mach-bcm/bcm63xx_smp.h b/arch/arm/platforms/bcm/bcm63xx_smp.h similarity index 100% rename from arch/arm/mach-bcm/bcm63xx_smp.h rename to arch/arm/platforms/bcm/bcm63xx_smp.h diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/platforms/bcm/bcm_5301x.c similarity index 100% rename from arch/arm/mach-bcm/bcm_5301x.c rename to arch/arm/platforms/bcm/bcm_5301x.c diff --git a/arch/arm/mach-bcm/bcm_cygnus.c b/arch/arm/platforms/bcm/bcm_cygnus.c similarity index 100% rename from arch/arm/mach-bcm/bcm_cygnus.c rename to arch/arm/platforms/bcm/bcm_cygnus.c diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/platforms/bcm/bcm_kona_smc.c similarity index 100% rename from arch/arm/mach-bcm/bcm_kona_smc.c rename to arch/arm/platforms/bcm/bcm_kona_smc.c diff --git a/arch/arm/mach-bcm/bcm_kona_smc.h b/arch/arm/platforms/bcm/bcm_kona_smc.h similarity index 100% rename from arch/arm/mach-bcm/bcm_kona_smc.h rename to arch/arm/platforms/bcm/bcm_kona_smc.h diff --git a/arch/arm/mach-bcm/bcm_nsp.c b/arch/arm/platforms/bcm/bcm_nsp.c similarity index 100% rename from arch/arm/mach-bcm/bcm_nsp.c rename to arch/arm/platforms/bcm/bcm_nsp.c diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/platforms/bcm/board_bcm21664.c similarity index 100% rename from arch/arm/mach-bcm/board_bcm21664.c rename to arch/arm/platforms/bcm/board_bcm21664.c diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/platforms/bcm/board_bcm281xx.c similarity index 100% rename from arch/arm/mach-bcm/board_bcm281xx.c rename to arch/arm/platforms/bcm/board_bcm281xx.c diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/platforms/bcm/board_bcm2835.c similarity index 100% rename from arch/arm/mach-bcm/board_bcm2835.c rename to arch/arm/platforms/bcm/board_bcm2835.c diff --git a/arch/arm/mach-bcm/brcmstb.c b/arch/arm/platforms/bcm/brcmstb.c similarity index 100% rename from arch/arm/mach-bcm/brcmstb.c rename to arch/arm/platforms/bcm/brcmstb.c diff --git a/arch/arm/mach-bcm/kona_l2_cache.c b/arch/arm/platforms/bcm/kona_l2_cache.c similarity index 100% rename from arch/arm/mach-bcm/kona_l2_cache.c rename to arch/arm/platforms/bcm/kona_l2_cache.c diff --git a/arch/arm/mach-bcm/kona_l2_cache.h b/arch/arm/platforms/bcm/kona_l2_cache.h similarity index 100% rename from arch/arm/mach-bcm/kona_l2_cache.h rename to arch/arm/platforms/bcm/kona_l2_cache.h diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/platforms/bcm/platsmp-brcmstb.c similarity index 100% rename from arch/arm/mach-bcm/platsmp-brcmstb.c rename to arch/arm/platforms/bcm/platsmp-brcmstb.c diff --git a/arch/arm/mach-bcm/platsmp.c b/arch/arm/platforms/bcm/platsmp.c similarity index 100% rename from arch/arm/mach-bcm/platsmp.c rename to arch/arm/platforms/bcm/platsmp.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 443b125..adb0733 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -735,8 +735,6 @@ source "arch/arm/mach-at91/Kconfig" source "arch/arm/mach-axxia/Kconfig" -source "arch/arm/mach-bcm/Kconfig" - source "arch/arm/mach-berlin/Kconfig" source "arch/arm/mach-clps711x/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 33d031f..b51aefe 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -157,7 +157,6 @@ machine-$(CONFIG_ARCH_ALPINE) += alpine machine-$(CONFIG_ARCH_ARTPEC) += artpec machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia -machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig index 8b3b93a..d2741c0 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/bcm/Kconfig" source "arch/arm/platforms/highbank/Kconfig" source "arch/arm/platforms/mediatek/Kconfig" source "arch/arm/platforms/rockchip/Kconfig" diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile index 2bb3622..4fd91e1 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_BCM) += bcm/ obj-$(CONFIG_ARCH_HIGHBANK) += highbank/ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/