From patchwork Thu Feb 28 07:19:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2195691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 185A3DF2A2 for ; Thu, 28 Feb 2013 07:24:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UAxmp-0004uV-U7; Thu, 28 Feb 2013 07:20:15 +0000 Received: from mail-pb0-f52.google.com ([209.85.160.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UAxmQ-0004rI-92 for linux-arm-kernel@lists.infradead.org; Thu, 28 Feb 2013 07:19:52 +0000 Received: by mail-pb0-f52.google.com with SMTP id ma3so909152pbc.39 for ; Wed, 27 Feb 2013 23:19:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=AmHsKP3XI6ZccPFy0MfXOT0EmU2K1W35HyBp+EXZc1k=; b=lm3rDT3fipWBTiE83js8hLNhH41KVQiEagbOqXDQqH7e+XIYnmVt7Q3zByqBwrYJMy 0KsJqgg9RvC1Rv5kIB0aRHRIZ5LUfJ4kDuchJ9SGl8NwWbCS4ocE0Qpjp3I1XpB3c7/O fDxH3Tk+GB67l9KbI65Md7rgYj6IH3+VPmdO231Yt0giVw9JdbDKUO2BeAnzEOg1AnNr 42fATMJNRJyaM79AslVBOeOGYHK0mEClTwUessL5N86VbbeBLd325Io9nMZaBO9x9QXA fzkNukQURrwU4dLTSNH4F1CDF7bY3NdnKLcm4UppPF1ZYeraJ8/n+XrzCe5Ec95X6Lbk O0cg== X-Received: by 10.68.244.162 with SMTP id xh2mr7643605pbc.55.1362035988731; Wed, 27 Feb 2013 23:19:48 -0800 (PST) Received: from localhost.localdomain ([140.206.155.71]) by mx.google.com with ESMTPS id k7sm8255069paz.13.2013.02.27.23.19.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Feb 2013 23:19:47 -0800 (PST) From: Haojian Zhuang To: jone.lixin@huawei.com, arnd@arndb.de, olof@lixom.net, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/7] ARM: hs: add board support with device tree Date: Thu, 28 Feb 2013 15:19:22 +0800 Message-Id: <1362035966-17628-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362035966-17628-1-git-send-email-haojian.zhuang@linaro.org> References: <1362035966-17628-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQnQJa7jSEj4iq45hAG4Zkz6zEdULuEpRZPDfm8RKqQbabxNTt5VPEz/oi9P0phF4hVNIy8v X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130228_021950_499515_BF05C40E X-CRM114-Status: GOOD ( 17.84 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.52 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Haojian Zhuang , patches@linaro.org 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add board support with device tree for Hisilicon Hi36xx/Hi37xx platform. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 2 ++ arch/arm/Makefile | 1 + arch/arm/mach-hs/Kconfig | 23 +++++++++++++ arch/arm/mach-hs/Makefile | 5 +++ arch/arm/mach-hs/hs-dt.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+) create mode 100644 arch/arm/mach-hs/Kconfig create mode 100644 arch/arm/mach-hs/Makefile create mode 100644 arch/arm/mach-hs/hs-dt.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dedf02b..dfe70aa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1055,6 +1055,8 @@ source "arch/arm/mach-h720x/Kconfig" source "arch/arm/mach-highbank/Kconfig" +source "arch/arm/mach-hs/Kconfig" + source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-iop32x/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ee4605f..08a913b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -149,6 +149,7 @@ machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_H720X) += h720x machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_HS) += hs machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x diff --git a/arch/arm/mach-hs/Kconfig b/arch/arm/mach-hs/Kconfig new file mode 100644 index 0000000..491c6da --- /dev/null +++ b/arch/arm/mach-hs/Kconfig @@ -0,0 +1,23 @@ +config ARCH_HS + bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select CACHE_L2X0 + select CACHE_PL310 + select PINCTRL + select PINCTRL_SINGLE + select SERIAL_AMBA_PL011 + select SERIAL_AMBA_PL011_CONSOLE + help + Support for Hisilicon Hi36xx/Hi37xx processor family + +if ARCH_HS + +config MACH_HS_DT + bool "Hisilicon Development Board" + default y + help + Say 'Y' here if you want to support the Hisilicon Development + Board. + +endif diff --git a/arch/arm/mach-hs/Makefile b/arch/arm/mach-hs/Makefile new file mode 100644 index 0000000..d79ecb5 --- /dev/null +++ b/arch/arm/mach-hs/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for Hisilicon Hi36xx/Hi37xx processors line +# + +obj-$(CONFIG_MACH_HS_DT) += hs-dt.o diff --git a/arch/arm/mach-hs/hs-dt.c b/arch/arm/mach-hs/hs-dt.c new file mode 100644 index 0000000..813ebb0 --- /dev/null +++ b/arch/arm/mach-hs/hs-dt.c @@ -0,0 +1,83 @@ +/* + * (Hisilicon's Hi36xx/Hi37xx SoC based) flattened device tree enabled machine + * + * Copyright (c) 2012-2013 Hisilicon Ltd. + * Copyright (c) 2012-2013 Linaro Ltd. + * + * Author: Haojian Zhuang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static struct of_device_id hs_timer_match[] __initdata = { + { .compatible = "arm,sp804", }, + {} +}; + +static struct clk_lookup sp804_lookup = { + .dev_id = "sp804", + .clk = NULL, +}; + +extern void __init hs_init_clocks(void); +static void __init hs_timer_init(void) +{ + struct device_node *node = NULL; + void __iomem *base; + int irq; + + hs_init_clocks(); + + node = of_find_matching_node(NULL, hs_timer_match); + WARN_ON(!node); + if (!node) { + pr_err("Failed to find sp804 timer\n"); + return; + } + base = of_iomap(node, 0); + WARN_ON(!base); + + /* timer0 is used as clock event, and timer1 is clock source. */ + irq = irq_of_parse_and_map(node, 0); + WARN_ON(!irq); + + sp804_lookup.clk = of_clk_get(node, 0); + clkdev_add(&sp804_lookup); + + sp804_clocksource_and_sched_clock_init(base + TIMER_2_BASE, "timer1"); + sp804_clockevents_init(base, irq, "timer0"); +} + +static void __init hs_init(void) +{ + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); +} + +static const char *hs_compat[] __initdata = { + "hisilicon,hi3620-hi4511", + NULL, +}; + +DT_MACHINE_START(HS_DT, "Hisilicon Hi36xx/Hi37xx (Flattened Device Tree)") + /* Maintainer: Haojian Zhuang */ + .map_io = debug_ll_io_init, + .init_irq = irqchip_init, + .init_time = hs_timer_init, + .init_machine = hs_init, + .dt_compat = hs_compat, +MACHINE_END