From patchwork Mon Sep 23 17:20:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Daudt X-Patchwork-Id: 2929171 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A110A9F288 for ; Mon, 23 Sep 2013 17:22:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62AFB2038E for ; Mon, 23 Sep 2013 17:22:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11EFD2033F for ; Mon, 23 Sep 2013 17:22:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VO9pK-0001m2-Tx; Mon, 23 Sep 2013 17:21:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VO9pB-00059E-CV; Mon, 23 Sep 2013 17:21:29 +0000 Received: from mail-pb0-f51.google.com ([209.85.160.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VO9p0-00057D-IA for linux-arm-kernel@lists.infradead.org; Mon, 23 Sep 2013 17:21:20 +0000 Received: by mail-pb0-f51.google.com with SMTP id jt11so3447740pbb.24 for ; Mon, 23 Sep 2013 10:20:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H79VNs8DlLcgWP+j8aYoUlCfv4kyZhDe1PfR2+B1HQY=; b=mtMVnfhB+FtX44EscmLRauvCsWc8rOb/f6aQ2L6Rn9wX1rNRSxuKFOpSVhatGenvhg DKk4MueOSV8IL1Htodh51/kNTrsWVT4xrM+SAxveDatQQM94P1wtqvWeQXogqeHOTZ6t LPXdVj6bmuM6B0KX8sC771uuxVTQRLnndF6VusBVvS/LHcrqn2jSXKuG6WlUikPrIDNn D5xKCIIpZmYoJ5Fp7fWCTaPE1swuousl7HyUw7ygX/A/GLg1o4badEBqVisnwUogh75F xHWSuK4IAV1mT5eSTcy2qz5JwGVgTfuwCkXms2W0dlRLSJn54GlnBU/CxDJ42gNA9bM2 FsbA== X-Gm-Message-State: ALoCoQmPH+Hw1vSGHcdPB13rQHaZlifyoPL0yqEG/f3NF/ehHYfapgZFqidba5Hg7IauvzVFy8IQ X-Received: by 10.68.98.228 with SMTP id el4mr2646537pbb.190.1379956856171; Mon, 23 Sep 2013 10:20:56 -0700 (PDT) Received: from mackenzie.boldstreet.net ([207.230.251.134]) by mx.google.com with ESMTPSA id 7sm39421239paf.22.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Sep 2013 10:20:54 -0700 (PDT) From: Christian Daudt To: Olof Johansson , Arnd Bergmann , Stephen Warren , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Russell King , Daniel Lezcano , Thomas Gleixner , Chris Ball Subject: [PATCH v2 1/4] rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) Date: Mon, 23 Sep 2013 10:20:33 -0700 Message-Id: <1379956836-5866-2-git-send-email-bcm@fixthebug.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379956836-5866-1-git-send-email-bcm@fixthebug.org> References: <1379956836-5866-1-git-send-email-bcm@fixthebug.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130923_132118_801227_74EF8F10 X-CRM114-Status: GOOD ( 10.11 ) X-Spam-Score: 0.8 (/) Cc: Alex Elder , devicetree@vger.kernel.org, Christian Daudt , Hauke Mehrtens , Christian Daudt , linux-mmc@vger.kernel.org, Domenico Andreoli , Matt Porter , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-3.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory. Signed-off-by: Christian Daudt Acked-by: Olof Johansson Changes from v1: - fix alpha ordering in dts/Makefile - break into 4 patches for separate subsys diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 6e49310..efb0132 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig @@ -27,6 +27,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_EFI_PARTITION=y CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_MOBILE=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_743622=y CONFIG_PREEMPT=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6e572c6..89a5064 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -6,6 +6,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_MOBILE=y CONFIG_GPIO_PCA953X=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_KEYSTONE=y diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 69d67f7..af86cda 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -1,5 +1,17 @@ config ARCH_BCM - bool "Broadcom SoC" if ARCH_MULTI_V7 + bool "Broadcom SoC Support" + select ARCH_MULTIPLATFORM + help + This enables support for Broadcom ARM based SoC + chips + +if ARCH_BCM + +menu "Broadcom SoC Selection" + +config ARCH_BCM_MOBILE + bool "Broadcom Mobile SoC" if ARCH_MULTI_V7 + default y depends on MMU select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322 @@ -14,7 +26,11 @@ config ARCH_BCM select TICK_ONESHOT select CACHE_L2X0 help - This enables support for system based on Broadcom SoCs. + This enables support for systems based on Broadcom mobile SoCs. It currently supports the 'BCM281XX' family, which includes BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155 variants. + +endmenu + +endif diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index e3d0303..c2ccd5a 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,6 +10,6 @@ # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -obj-$(CONFIG_ARCH_BCM) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o +obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)