From patchwork Fri Apr 18 06:05:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 28617 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 218BF2013D for ; Fri, 18 Apr 2014 06:12:28 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf7065530obb.2 for ; Thu, 17 Apr 2014 23:12:27 -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:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=u+fgJHUIE+zVt2YlDQtwY0DfhDStNmP6gCIKspoykUo=; b=TYW+o5/tsci+/xhgr3y6xBtuGmhn6yjfzzBh2rzKGKqsDOFYZ7lcnIBPgd8uMdbGfR Zce4s9Q7RM2K1ZcknxVr57A4oOI0m7VDTk1f7Sf+ar+sgk124rZa9C+uiiIquJ1oW1v4 Q4UW9++kCtKtsGjiMfJR87qw5t/oJWVM9Qbw8Gukl3o667Ql2gAccZKL1cYgYBF0nQrS +N7UwTBVgJbxwNIOLXWFU6xtuAXA1S92TUwxQx6mdCqr1F8dbRJnnrrbjdIX7ILmQtGA NTLaDUxnYDQd/C8XWw9Q6pqp78GdUYmr2VsSRXtr0/yJuNFaM6KFjDVOZQijTsT2q96u hOPg== X-Gm-Message-State: ALoCoQlovlQmCqktiB0/I1V6ZeaqVnLR+xTKiunDnDk7LGPlnNQE3P9cjs0sylLJRGmXyPTX3Rid X-Received: by 10.182.87.2 with SMTP id t2mr9782098obz.2.1397801547565; Thu, 17 Apr 2014 23:12:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.163 with SMTP id a32ls1373907qgf.73.gmail; Thu, 17 Apr 2014 23:12:27 -0700 (PDT) X-Received: by 10.221.66.131 with SMTP id xq3mr666804vcb.43.1397801547460; Thu, 17 Apr 2014 23:12:27 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id dz10si4821417vcb.87.2014.04.17.23.12.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 23:12:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so2124011veb.18 for ; Thu, 17 Apr 2014 23:12:27 -0700 (PDT) X-Received: by 10.52.128.231 with SMTP id nr7mr9737103vdb.17.1397801547389; Thu, 17 Apr 2014 23:12:27 -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.220.221.72 with SMTP id ib8csp89403vcb; Thu, 17 Apr 2014 23:12:27 -0700 (PDT) X-Received: by 10.229.136.135 with SMTP id r7mr16259156qct.17.1397801546885; Thu, 17 Apr 2014 23:12:26 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id w73si11611491qge.9.2014.04.17.23.12.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Apr 2014 23:12:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; 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 1Wb21J-0004Pe-NS; Fri, 18 Apr 2014 06:11:29 +0000 Received: from mail-pb0-f44.google.com ([209.85.160.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wb21H-0002kP-Ri for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 06:11:28 +0000 Received: by mail-pb0-f44.google.com with SMTP id rp16so1166196pbb.31 for ; Thu, 17 Apr 2014 23:10:55 -0700 (PDT) X-Received: by 10.66.171.206 with SMTP id aw14mr20243436pac.48.1397801455484; Thu, 17 Apr 2014 23:10:55 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id tk5sm57498473pbc.63.2014.04.17.23.10.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 23:10:54 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, xuwei5@hisilicon.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org Subject: [PATCH v3 03/13] ARM: hisi: add ARCH_HISI Date: Fri, 18 Apr 2014 14:05:46 +0800 Message-Id: <1397801156-25682-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> References: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140417_231127_950774_B88CAEA3 X-CRM114-Status: GOOD ( 10.66 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.44 listed in list.dnswl.org] Cc: Haojian Zhuang 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: haojian.zhuang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 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 Since multiple ARCH configuration will be appended into mach-hisi directory, add ARCH_HISI as common configuration for different ARCH in mach-hisi. Signed-off-by: Haojian Zhuang --- arch/arm/Makefile | 2 +- arch/arm/mach-hisi/Kconfig | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 41c1931..4c2798a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -154,7 +154,7 @@ machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank -machine-$(CONFIG_ARCH_HI3xxx) += hisi +machine-$(CONFIG_ARCH_HISI) += hisi machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index feee4db..da16efd 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -1,8 +1,16 @@ -config ARCH_HI3xxx - bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7 +config ARCH_HISI + bool "Hisilicon SoC Support" + depends on ARCH_MULTIPLATFORM select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 + +if ARCH_HISI + +menu "Hisilicon platform type" + +config ARCH_HI3xxx + bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7 select CACHE_L2X0 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP @@ -10,3 +18,7 @@ config ARCH_HI3xxx select PINCTRL_SINGLE help Support for Hisilicon Hi36xx/Hi37xx processor family + +endmenu + +endif