From patchwork Wed Oct 15 02:58:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Branden X-Patchwork-Id: 38764 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D419A20973 for ; Wed, 15 Oct 2014 03:01:05 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf158830lab.7 for ; Tue, 14 Oct 2014 20:01:04 -0700 (PDT) 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 :in-reply-to:references: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=LiS/JJEl9hLOhFXaYkQKGYC0g43HD7Bck20CJJr6E3A=; b=mRDkC6AZtNN/A+J1ALQk+ihGJCgEIQvChDOFwLhZ304Aq/FbGTcPA2ECNCUcykaboe pdRWHUeCgvVh70zTi3Zr5mQaKGJ/rNRoSY/nSw10ZemFU/5dwsJCoCKszRWHaiwCikYS Ktc6qlnAfDGAHvRndR4T+H2XNWSgqY9z1qq9JuEYW81UZBkF3n36Ts9gDxDPXApxKu0g cAHAh+QvvgN4UNAJL6CyR92Qjjb5OithRH2mIRFi8wXQChbnTrDZk6crF4B5KEPEA29u oATZH5OBM5EDPIb+neiSJ58wUx/y+cB5K0wYCcJ11YmL+ZfjdiuZVd447tN2UHLxUoA3 i+7A== X-Gm-Message-State: ALoCoQld7SSLXkh+xuLiBk8H1bHSPGA3BBy3QjbKT2cJpZNx3dDYasD2l/drBQuriCpQuSbdHtvr X-Received: by 10.112.254.226 with SMTP id al2mr1537374lbd.1.1413342064220; Tue, 14 Oct 2014 20:01:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.44 with SMTP id kv12ls9853lac.44.gmail; Tue, 14 Oct 2014 20:01:03 -0700 (PDT) X-Received: by 10.152.178.197 with SMTP id da5mr266182lac.83.1413342063893; Tue, 14 Oct 2014 20:01:03 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx.google.com with ESMTPS id uc5si10872799lbb.31.2014.10.14.20.01.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 20:01:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id u10so280007lbd.15 for ; Tue, 14 Oct 2014 20:01:03 -0700 (PDT) X-Received: by 10.112.135.229 with SMTP id pv5mr9272191lbb.52.1413342063768; Tue, 14 Oct 2014 20:01:03 -0700 (PDT) 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.112.84.229 with SMTP id c5csp519990lbz; Tue, 14 Oct 2014 20:01:02 -0700 (PDT) X-Received: by 10.70.20.66 with SMTP id l2mr9414574pde.106.1413342062093; Tue, 14 Oct 2014 20:01:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qf3si14643428pdb.30.2014.10.14.20.01.01 for ; Tue, 14 Oct 2014 20:01:02 -0700 (PDT) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756016AbaJODBA (ORCPT + 5 others); Tue, 14 Oct 2014 23:01:00 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:1233 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932094AbaJOC7N (ORCPT ); Tue, 14 Oct 2014 22:59:13 -0400 X-IronPort-AV: E=Sophos;i="5.04,721,1406617200"; d="scan'208";a="48073480" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw3-out.broadcom.com with ESMTP; 14 Oct 2014 20:02:04 -0700 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 14 Oct 2014 19:59:07 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.174.1; Tue, 14 Oct 2014 19:59:16 -0700 Received: from mail.broadcom.com (lbrmn-lnxub113.ric.broadcom.com [10.136.13.65]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 84E1F40FE6; Tue, 14 Oct 2014 19:59:01 -0700 (PDT) From: Scott Branden To: Christian Daudt , Matt Porter , Russell King , , Mike Turquette , Alex Elder , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , "Kumar Gala" , Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Joe Perches , "Mauro Carvalho Chehab" , Antti Palosaari CC: JD Zheng , Ray Jui , , , , Scott Branden Subject: [PATCH v5 6/6] ARM: mach-bcm: Consolidate currently supported IPROC SoCs Date: Tue, 14 Oct 2014 19:58:56 -0700 Message-ID: <1413341936-17606-7-git-send-email-sbranden@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1413341936-17606-1-git-send-email-sbranden@broadcom.com> References: <1413341936-17606-1-git-send-email-sbranden@broadcom.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sbranden@broadcom.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) 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 ARCH_BCM_5301X subarch under ARCH_IPROC architecture. Additional IPROC chipsets that share a lot of commonality should be added under ARCH_IPROC as well. Signed-off-by: Scott Branden --- arch/arm/mach-bcm/Kconfig | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index ecc544a..08e7103 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -33,6 +33,22 @@ menu "iProc SoC based Machine types" which includes the following variants: BCM11300, BCM11320, BCM11350, BCM11360, BCM58300, BCM58302, BCM58303, BCM58305. + + config ARCH_BCM_5301X + bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 + select ARCH_BCM_IPROC + help + Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. + + This is a network SoC line mostly used in home routers and + wifi access points, it's internal name is Northstar. + This inclused the following SoC: BCM53010, BCM53011, BCM53012, + BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707, + BCM4708 and BCM4709. + + Do not confuse this with the BCM4760 which is a totally + different SoC or with the older BCM47XX and BCM53XX based + network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx endmenu config ARCH_BCM_MOBILE @@ -108,27 +124,6 @@ config ARCH_BCM2835 This enables support for the Broadcom BCM2835 SoC. This SoC is used in the Raspberry Pi and Roku 2 devices. -config ARCH_BCM_5301X - bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7 - select ARM_GIC - select CACHE_L2X0 - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select ARM_GLOBAL_TIMER - select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK - help - Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores. - - This is a network SoC line mostly used in home routers and - wifi access points, it's internal name is Northstar. - This inclused the following SoC: BCM53010, BCM53011, BCM53012, - BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707, - BCM4708 and BCM4709. - - Do not confuse this with the BCM4760 which is a totally - different SoC or with the older BCM47XX and BCM53XX based - network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx - config ARCH_BCM_63XX bool "Broadcom BCM63xx DSL SoC" if ARCH_MULTI_V7 depends on MMU