From patchwork Mon Jul 28 12:51:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 34352 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3DC98213FD for ; Mon, 28 Jul 2014 12:54:04 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id uq10sf14887607igb.3 for ; Mon, 28 Jul 2014 05:54:03 -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=+9o9VMpHiFuJHvgWmiedhBlkShtHGAoOQll4swzvXjQ=; b=DBID06ZugO/KHqWAHC7X4ainGdK360lQ2T0LzpsewbnwgZVa1tPGoBANWkMIbAu/b7 uDmlKA7TYbJ72hyTivIkv0hnKgnfs1j7vYH4UptRmG4l3+Bo2MJDvuAjbf9E5ZtX1atV +wUT3DCRk910u42jIRwShTPrpsh7WjUED7u7IGgiiRQ5rs7cNi+aHV8c/OxUaMlr40je yNMVWzWjQSSAeAKNMJcVjLqbHclPf/j2TMk+i3QSxdbdMa+r1hZU0KzmYGyijwmZ2X47 gNpSe8BSaD9ZxQUQy+PkxGWDaUq4MZ29tNH3UOkhFamGu88fUEpIk5XbCL8ViCB0uWWO EXQQ== X-Gm-Message-State: ALoCoQkaWI+KQLATNj5AXNpypdBS0IUJzI16MNWTox/6fz0Hq5Wet3K0xmALcaOqn2BXgHTgIoJK X-Received: by 10.182.246.7 with SMTP id xs7mr15220778obc.15.1406552043782; Mon, 28 Jul 2014 05:54:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.231 with SMTP id z94ls269575qgz.54.gmail; Mon, 28 Jul 2014 05:54:03 -0700 (PDT) X-Received: by 10.52.34.209 with SMTP id b17mr12133984vdj.49.1406552043530; Mon, 28 Jul 2014 05:54:03 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id ls1si12295568vcb.99.2014.07.28.05.54.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 05:54:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so10913185vcb.31 for ; Mon, 28 Jul 2014 05:54:03 -0700 (PDT) X-Received: by 10.53.10.36 with SMTP id dx4mr37821907vdd.0.1406552043433; Mon, 28 Jul 2014 05:54: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.221.37.5 with SMTP id tc5csp164066vcb; Mon, 28 Jul 2014 05:54:02 -0700 (PDT) X-Received: by 10.66.163.38 with SMTP id yf6mr38890606pab.46.1406552042448; Mon, 28 Jul 2014 05:54:02 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id gl10si17728361pbd.156.2014.07.28.05.54.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 05:54:02 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) 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 1XBkQ7-0001vb-IV; Mon, 28 Jul 2014 12:52:51 +0000 Received: from mail-pd0-f181.google.com ([209.85.192.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBkQ3-0001oF-Ex for linux-arm-kernel@lists.infradead.org; Mon, 28 Jul 2014 12:52:48 +0000 Received: by mail-pd0-f181.google.com with SMTP id g10so9854319pdj.40 for ; Mon, 28 Jul 2014 05:52:26 -0700 (PDT) X-Received: by 10.66.139.232 with SMTP id rb8mr3544795pab.130.1406551946261; Mon, 28 Jul 2014 05:52:26 -0700 (PDT) Received: from localhost.localdomain ([61.172.253.147]) by mx.google.com with ESMTPSA id ia2sm17602248pbb.32.2014.07.28.05.52.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 05:52:25 -0700 (PDT) From: Haojian Zhuang To: arnd@arndb.de, xuwei5@hisilicon.com, olof@lixom.net, khilman@linaro.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, yanhaifeng@hisilicon.com, liguozhu@hisilicon.com Subject: [PATCH v5 2/8] ARM: hisi: add ARCH_HISI Date: Mon, 28 Jul 2014 20:51:17 +0800 Message-Id: <1406551883-26154-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406551883-26154-1-git-send-email-haojian.zhuang@linaro.org> References: <1406551883-26154-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140728_055247_528365_9820942E X-CRM114-Status: GOOD ( 10.46 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.192.181 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.181 listed in wl.mailspike.net] Cc: Haojian Zhuang 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+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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 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 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 6721fab..2024f5e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -156,7 +156,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