From patchwork Thu Jun 26 04:05:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4425621 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 590249F333 for ; Thu, 26 Jun 2014 04:09:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B0A720396 for ; Thu, 26 Jun 2014 04:09:14 +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 D0FEE2038C for ; Thu, 26 Jun 2014 04:09:12 +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 1X00xf-0007Ck-4R; Thu, 26 Jun 2014 04:06:59 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X00xT-00073e-5p for linux-arm-kernel@lists.infradead.org; Thu, 26 Jun 2014 04:06:48 +0000 Received: by mail-pb0-f49.google.com with SMTP id rr13so2553465pbb.8 for ; Wed, 25 Jun 2014 21:06:25 -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=kKKe96H6TrvWWIzIAvuKuNoQznfS3u04AmAO98mVp3qLmq8m1u0jqvbPE22pnUja8a gtwzmKCuLPiiMHher+CkFkzvZWUbfQqVCYxDV0Fn3o6d+tC6LqsNaKEQJrCQFmebpZSo i6ZHY0t2D2Y70PJklSkDEM64QkfuTw15qkDSN/Z9JXQLQey2T2Fp1xz0aPdegaxdQtGq d2JOo5Pkoh46SbTyoiiG6OhvoPPZ3W4MLc9HVMK6yW9LVDlAX3ez/EcP5n+r9h8nKiuc WdPsR/Bs/pzCbtZ0Gcd2XiDTfn6kfBUmyN+puA8AEiDZA7FcmS2V2noK/DuqOCAFy51F CaCQ== X-Gm-Message-State: ALoCoQkTSpERzDY11SfNwfuxB+g1gWxTqWV485zO1Dx3DFQVtdoQDT7bkiKm1cX2SSLGdg0nn2F9 X-Received: by 10.66.142.135 with SMTP id rw7mr17794667pab.71.1403755585748; Wed, 25 Jun 2014 21:06:25 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id z3sm27916184pas.15.2014.06.25.21.06.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jun 2014 21:06:24 -0700 (PDT) From: Haojian Zhuang To: yanhaifeng@gmail.com, xuwei5@hisilicon.com, arnd@arndb.de, olof@lixom.net, linux-arm-kernel@lists.infradead.org, khilman@kernel.org, jchxue@gmail.com Subject: [PATCH v4 4/8] ARM: hisi: add ARCH_HISI Date: Thu, 26 Jun 2014 12:05:43 +0800 Message-Id: <1403755547-623-5-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403755547-623-1-git-send-email-haojian.zhuang@linaro.org> References: <1403755547-623-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140625_210647_282304_CDA9C774 X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) 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=-1.9 required=5.0 tests=BAYES_00, T_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