From patchwork Fri Feb 21 00:16:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 25093 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E9EC203C6 for ; Fri, 21 Feb 2014 00:16:48 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf7027606pab.11 for ; Thu, 20 Feb 2014 16:16:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=TTTI0L5wn37P+F0HhdIvrxYwS0Kwb7oOENXDP2Mpxno=; b=N132Wczu4wq6Pj90mf6XYLCD+rRQgwU8t6FPj+kKyhv/jFMPf1PVLa0WsJDx+EtTiT lEj3tscElmMjkTK8zM6Q+t2BO2Ma0PiWni+z1iqdhQZXq7lVoflFbv6Pm/97KGSHZ5tq dhi/twfTv0JREBgjUhcIXTp1v7dNYhaqtToK1j/f9wHoyXeocAMWPlttIDOJmK7FazS1 7LTEgXZk2SfpKo+v5cqDyqvPmKWdA34IJT0VthXTmB02MnPQ9QsFiNHrgFrAapwYToE0 DjpcbidpjefatouxtE8xlXLpYlbwY7HK4UQ12wsqvDz89rbdplCukJ/6JjYAXW9Vj9RJ 2LJA== X-Gm-Message-State: ALoCoQnC7xPn1jv1rbtYuHgJgbbjYNoSliNjC1nQUCjiFz55w8NmlSE1jeGoaPA+NeqrlRVSwcku X-Received: by 10.66.150.106 with SMTP id uh10mr2078655pab.13.1392941807595; Thu, 20 Feb 2014 16:16:47 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.72 with SMTP id e66ls784483qge.67.gmail; Thu, 20 Feb 2014 16:16:47 -0800 (PST) X-Received: by 10.221.27.194 with SMTP id rr2mr2880003vcb.60.1392941807378; Thu, 20 Feb 2014 16:16:47 -0800 (PST) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id ke3si2238484veb.103.2014.02.20.16.16.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Feb 2014 16:16:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id lh14so2652759vcb.10 for ; Thu, 20 Feb 2014 16:16:47 -0800 (PST) X-Received: by 10.52.106.166 with SMTP id gv6mr2312018vdb.86.1392941807265; Thu, 20 Feb 2014 16:16:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp99080vcz; Thu, 20 Feb 2014 16:16:46 -0800 (PST) X-Received: by 10.66.166.175 with SMTP id zh15mr5505569pab.36.1392941805614; Thu, 20 Feb 2014 16:16:45 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nc5si5177505pab.68.2014.02.20.16.16.44; Thu, 20 Feb 2014 16:16:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756832AbaBUAQS (ORCPT + 26 others); Thu, 20 Feb 2014 19:16:18 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:7878 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756186AbaBUAQO (ORCPT ); Thu, 20 Feb 2014 19:16:14 -0500 X-IronPort-AV: E=Sophos;i="4.97,515,1389772800"; d="scan'208";a="15974529" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw1-out.broadcom.com with ESMTP; 20 Feb 2014 16:50:47 -0800 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 20 Feb 2014 16:16:12 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.3.174.1; Thu, 20 Feb 2014 16:16:12 -0800 Received: from mail.broadcom.com (lbrmn-lnxub70.ric.broadcom.com [10.136.8.215]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 1E336EEBB6; Thu, 20 Feb 2014 16:16:12 -0800 (PST) From: Markus Mayer To: Stephen Warren , Matt Porter , Christian Daudt CC: ARM Kernel List , "Linux Kernel Mailing List" Subject: [PATCH] ARM: bcm2835: Move to mach-bcm directory Date: Thu, 20 Feb 2014 16:16:11 -0800 Message-ID: <1392941771-15774-1-git-send-email-markus.mayer@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: markus.mayer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move the bcm2835 board file into the mach-bcm directory. This allows us to get rid of the mach-bcm2835 directory with the associated Kconfig and Makefile. Signed-off-by: Markus Mayer --- MAINTAINERS | 2 +- arch/arm/Kconfig | 2 -- arch/arm/Makefile | 1 - arch/arm/mach-bcm/Kconfig | 16 ++++++++++++++++ arch/arm/mach-bcm/Makefile | 2 ++ .../bcm2835.c => mach-bcm/board_bcm2835.c} | 0 arch/arm/mach-bcm2835/Kconfig | 15 --------------- arch/arm/mach-bcm2835/Makefile | 1 - 8 files changed, 19 insertions(+), 20 deletions(-) rename arch/arm/{mach-bcm2835/bcm2835.c => mach-bcm/board_bcm2835.c} (100%) delete mode 100644 arch/arm/mach-bcm2835/Kconfig delete mode 100644 arch/arm/mach-bcm2835/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index fb08dce..6e94e26 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1875,7 +1875,7 @@ M: Stephen Warren L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git S: Maintained -F: arch/arm/mach-bcm2835/ +F: arch/arm/mach-bcm/board_bcm2835.c F: arch/arm/boot/dts/bcm2835* F: arch/arm/configs/bcm2835_defconfig F: drivers/*/*bcm2835* diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e254198..bde2237 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -936,8 +936,6 @@ source "arch/arm/mach-at91/Kconfig" source "arch/arm/mach-bcm/Kconfig" -source "arch/arm/mach-bcm2835/Kconfig" - source "arch/arm/mach-berlin/Kconfig" source "arch/arm/mach-clps711x/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08a9ef5..7743fb9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -143,7 +143,6 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_BCM) += bcm -machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index b1aa6a9..4e466e9 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -32,6 +32,22 @@ config ARCH_BCM_MOBILE BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155 variants. +config ARCH_BCM2835 + bool "Broadcom BCM2835 family" if ARCH_MULTI_V6 + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select ARM_ERRATA_411920 + select ARM_TIMER_SP804 + select CLKDEV_LOOKUP + select CLKSRC_OF + select CPU_V6 + select GENERIC_CLOCKEVENTS + select PINCTRL + select PINCTRL_BCM2835 + help + This enables support for the Broadcom BCM2835 SoC. This SoC is + used in the Raspberry Pi and Roku 2 devices. + endmenu endif diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index c2ccd5a..0ad2938 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -11,5 +11,7 @@ # GNU General Public License for more details. obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o +obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o + plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec) diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c similarity index 100% rename from arch/arm/mach-bcm2835/bcm2835.c rename to arch/arm/mach-bcm/board_bcm2835.c diff --git a/arch/arm/mach-bcm2835/Kconfig b/arch/arm/mach-bcm2835/Kconfig deleted file mode 100644 index d1f9612..0000000 --- a/arch/arm/mach-bcm2835/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -config ARCH_BCM2835 - bool "Broadcom BCM2835 family" if ARCH_MULTI_V6 - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select ARM_ERRATA_411920 - select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select CLKSRC_OF - select CPU_V6 - select GENERIC_CLOCKEVENTS - select PINCTRL - select PINCTRL_BCM2835 - help - This enables support for the Broadcom BCM2835 SoC. This SoC is - used in the Raspberry Pi and Roku 2 devices. diff --git a/arch/arm/mach-bcm2835/Makefile b/arch/arm/mach-bcm2835/Makefile deleted file mode 100644 index 4c3892f..0000000 --- a/arch/arm/mach-bcm2835/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y += bcm2835.o