From patchwork Thu Dec 25 08:34:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 5541241 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 1C3E19F2E2 for ; Thu, 25 Dec 2014 08:38:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25697201DD for ; Thu, 25 Dec 2014 08:38:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39337201BB for ; Thu, 25 Dec 2014 08:38:19 +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 1Y43tv-0001PO-Ig; Thu, 25 Dec 2014 08:36:07 +0000 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y43tH-0000YQ-U0 for linux-arm-kernel@lists.infradead.org; Thu, 25 Dec 2014 08:35:28 +0000 Received: by mail-pa0-f51.google.com with SMTP id ey11so11433752pad.24 for ; Thu, 25 Dec 2014 00:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aImN1gT+uBMeNtqdfmno5tket8Ey8L1MQcHvu1TpSpQ=; b=VyRM+GG9xqdk0J7CIHztOf/3GyXir2sxsr5W8lR6qtvRx5Ne951lPeKGhUXPw4nsLn +erSvRLTCgj8pdxSWbueTU0xXs515dmwvs6TxOWVIS8dH2IbGZyRDFadDOsW+VfhoVAC wK6u8+gprCnbzgiNAg4nsjve0OY89JxyicusPAtdhvuvz9NuBRRawh904+IHGTHCUwXc wmiSGaFlDERtrq5pEgqtl07+G4Ivqgs6AZCwJC554joqtXrmdlFPaWzg8NMkYsFnoEnd 7uXUGVP9pWkoDymxxO+p/6hwoCDhMNZ8txRmSP/h9FmBflIBAHLZWa0Tw7tws5JLrekK 6PcQ== X-Received: by 10.66.117.231 with SMTP id kh7mr28244864pab.144.1419496506924; Thu, 25 Dec 2014 00:35:06 -0800 (PST) Received: from localhost.localdomain ([117.136.8.21]) by mx.google.com with ESMTPSA id qy3sm541395pbc.4.2014.12.25.00.35.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Dec 2014 00:35:06 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: arnd@arndb.de, olof@lixom.net, khilman@linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] ARM: sirf: add atlas7 machine support Date: Thu, 25 Dec 2014 16:34:18 +0800 Message-Id: <1419496460-4929-3-git-send-email-21cnbao@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1419496460-4929-1-git-send-email-21cnbao@gmail.com> References: <1419496460-4929-1-git-send-email-21cnbao@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141225_003528_063141_9C748C45 X-CRM114-Status: GOOD ( 12.24 ) X-Spam-Score: -0.8 (/) Cc: Barry Song , workgroup.linux@csr.com, Zhiwu Song X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Zhiwu Song atlas7 is next-gen auto soc from CSR. It could bring to customers most integrated SoC solution: - World leading Bluetooth 4.0 and GNSS baseband - Audio processing, analog CODEC and ADC - Analog video input - SDR accelerators Signed-off-by: Zhiwu Song Signed-off-by: Barry Song --- Documentation/devicetree/bindings/arm/sirf.txt | 2 ++ arch/arm/mach-prima2/Kconfig | 13 ++++++++++++- arch/arm/mach-prima2/common.c | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/sirf.txt b/Documentation/devicetree/bindings/arm/sirf.txt index c6ba6d3..018de18 100644 --- a/Documentation/devicetree/bindings/arm/sirf.txt +++ b/Documentation/devicetree/bindings/arm/sirf.txt @@ -3,7 +3,9 @@ CSR SiRFprimaII and SiRFmarco device tree bindings. Required root node properties: - compatible: + - "sirf,atlas7-cb" : atlas7 device based board - "sirf,prima2-cb" : prima2 "cb" evaluation board - "sirf,marco-cb" : marco "cb" evaluation board + - "sirf,atlas7" : atlas7 device based board - "sirf,prima2" : prima2 device based board - "sirf,marco" : marco device based board diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 042f693..e8f17c9 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -11,7 +11,7 @@ menuconfig ARCH_SIRF if ARCH_SIRF -comment "CSR SiRF atlas6/primaII/Marco/Polo Specific Features" +comment "CSR SiRF atlas6/primaII/Marco/Atlas7 Specific Features" config ARCH_ATLAS6 bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform" @@ -20,6 +20,17 @@ config ARCH_ATLAS6 help Support for CSR SiRFSoC ARM Cortex A9 Platform +config ARCH_ATLAS7 + bool "CSR SiRFSoC ATLAS7 ARM Cortex A7 Platform" + default y + select ARM_GIC + select CPU_V7 + select HAVE_ARM_SCU if SMP + select HAVE_SMP + select SMP_ON_UP if SMP + help + Support for CSR SiRFSoC ARM Cortex A7 Platform + config ARCH_PRIMA2 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" default y diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index a860ea2..2f45d48 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c @@ -75,3 +75,18 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") .dt_compat = marco_dt_match, MACHINE_END #endif + +#ifdef CONFIG_ARCH_ATLAS7 +static const char *atlas7_dt_match[] __initdata = { + "sirf,atlas7", + NULL +}; + +DT_MACHINE_START(ATLAS7_DT, "Generic ATLAS7 (Flattened Device Tree)") + /* Maintainer: Barry Song */ + .smp = smp_ops(sirfsoc_smp_ops), + .map_io = sirfsoc_map_io, + .init_late = sirfsoc_init_late, + .dt_compat = atlas7_dt_match, +MACHINE_END +#endif