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: 4634251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9D2DDC0338 for ; Mon, 28 Jul 2014 12:54:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3DA920173 for ; Mon, 28 Jul 2014 12:54:48 +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 73F1120109 for ; Mon, 28 Jul 2014 12:54:47 +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 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-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=zsi0bK3XRbByz0KXg0OXrnV8b4v7theyQPzeGhUpH4U=; b=bX5+nCCTzOppErusFaV1p9XkZhSYtkKhE2RTtzasZdYxCau/saL3W6rgbGc8UQ5rOp NkTTiubB3df3EXLMv966Xcu9M0pNKp9KXGMSMS/sSeG3TMUU6qH2F97qZST2vSQpJgK7 /cSWFY1Xtak1xmQQWiOVX9Vzt98QWX63TExCySIqaNuvObRYm9yxk0mu7GmTtNSAI9da Nh3P1qN26Vi0qSiy+naxbii2G1pC5fzgQ2sYaFYOY6d0+d+BvXvIgSge2IQN4ZazGNWp /nzCRBuWNnn4KUKvRTHbJdMq17P8Tc1AF1GhqW7JgZWQrAsh9apKVUii/T1nJ+zei/3I /5Sg== X-Gm-Message-State: ALoCoQkCr8VVjBII8ofEb91wnj9/l8EXNZXq4LFPJdHi/6Xv+wc14DYQ8UID2AdFkX+T49k1KEcn 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 (-) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,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 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