From patchwork Wed Sep 4 03:46:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2853480 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 DA9AFC0AB5 for ; Wed, 4 Sep 2013 03:48:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFF452034A for ; Wed, 4 Sep 2013 03:48:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C259B20324 for ; Wed, 4 Sep 2013 03:48:06 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VH43t-0004Nd-N1; Wed, 04 Sep 2013 03:47:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VH43S-00023J-Nt; Wed, 04 Sep 2013 03:46:54 +0000 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VH43Q-00022B-1A for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2013 03:46:52 +0000 Received: by mail-pd0-f180.google.com with SMTP id y10so6873288pdj.39 for ; Tue, 03 Sep 2013 20:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=raNyn3tWvGD/i6UxgdU+/zu24bB3NrypxxxXacemkNU=; b=mZ8T8WBgXTIPFECPJDaBM56b8lMVRVBCVyDxgux6lPVc1a7nmGdQTzeD1wGv0J7Cnr H1fvpwHsxbaMUhTfSCeWRCghKVK3mpakgeYYaQB9Wo99+lSmCyghJ2FA4tyv4wHv6Pii RvJ22GafnjHAIsmCn1e+yQOAZ5k8aSBdK20K1dEfGQHbTIqGRkjW4wyJa8aX8/1lYEF8 Iw6LXV40c0tdxF0f4aW/gCxF2XLuz0WFecF5Atm2dQ55kfdQgNFYSFaR2JQWyjUbp+13 23BABbZijAhso3qYxkxoILKD7qk0WFi7BmYavJJsYOYcjBIYu/EwKoj1nr5yL1Ajgu1A 15LQ== X-Received: by 10.68.52.200 with SMTP id v8mr962796pbo.48.1378266391031; Tue, 03 Sep 2013 20:46:31 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id mr3sm26014281pbb.27.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 20:46:30 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Wed, 04 Sep 2013 12:46:49 +0900 Message-Id: <20130904034649.12546.87340.sendpatchset@w520> In-Reply-To: <20130904034525.12546.24775.sendpatchset@w520> References: <20130904034525.12546.24775.sendpatchset@w520> Subject: [PATCH 04/04] ARM: shmobile: Koelsch support X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130903_234652_286474_1D4C02CC X-CRM114-Status: GOOD ( 14.61 ) X-Spam-Score: -2.0 (--) Cc: ryo.kataoka.wt@renesas.com, kuninori.morimoto.gx@renesas.com, arnd@arndb.de, Magnus Damm , hisashi.nakamura.ak@renesas.com, horms@verge.net.au, yoshikazu.fujikawa.ue@renesas.com, olof@lixom.net, linux-arm-kernel@lists.infradead.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 X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Hisashi Nakamura Koelsch base board support making use of 2 GiB of memory, the r8a7791 SoC with the SCIF0 serial port and CA15 with CMT timer. Signed-off-by: Hisashi Nakamura Signed-off-by: Ryo Kataoka [damm@opensource.se: Forward ported to upstream, dropped not-yet-ready SMP/PFC] Signed-off-by: Magnus Damm --- arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/r8a7791-koelsch.dts | 32 +++++++++++++++++++++++ arch/arm/mach-shmobile/Kconfig | 5 +++ arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-koelsch.c | 44 ++++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+) --- 0001/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2013-09-03 21:18:57.000000000 +0900 @@ -190,6 +190,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm r8a7740-armadillo800eva-reference.dtb \ r8a7779-marzen.dtb \ r8a7779-marzen-reference.dtb \ + r8a7791-koelsch.dtb \ r8a7790-lager.dtb \ r8a7790-lager-reference.dtb \ sh73a0-kzm9g.dtb \ --- /dev/null +++ work/arch/arm/boot/dts/r8a7791-koelsch.dts 2013-09-03 21:18:58.000000000 +0900 @@ -0,0 +1,32 @@ +/* + * Device Tree Source for the Koelsch board + * + * Copyright (C) 2013 Renesas Electronics Corporation + * Copyright (C) 2013 Renesas Solutions Corp. + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +/dts-v1/; +/include/ "r8a7791.dtsi" + +/ { + model = "Koelsch"; + compatible = "renesas,koelsch", "renesas,r8a7791"; + + chosen { + bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; + }; + + memory@40000000 { + device_type = "memory"; + reg = <0 0x40000000 0 0x80000000>; + }; + + lbsc { + #address-cells = <1>; + #size-cells = <1>; + }; +}; --- 0003/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-09-03 21:18:57.000000000 +0900 @@ -219,6 +219,11 @@ config MACH_LAGER_REFERENCE This is intended to aid developers +config MACH_KOELSCH + bool "Koelsch board" + depends on ARCH_R8A7791 + select USE_OF + config MACH_KZM9D bool "KZM9D board" depends on ARCH_EMEV2 --- 0003/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-09-03 21:18:57.000000000 +0900 @@ -61,6 +61,7 @@ obj-$(CONFIG_MACH_LAGER) += board-lager. obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o +obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o --- 0001/arch/arm/mach-shmobile/Makefile.boot +++ work/arch/arm/mach-shmobile/Makefile.boot 2013-09-03 21:22:48.000000000 +0900 @@ -6,6 +6,7 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 +loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 --- /dev/null +++ work/arch/arm/mach-shmobile/board-koelsch.c 2013-09-03 21:18:58.000000000 +0900 @@ -0,0 +1,44 @@ +/* + * Koelsch board support + * + * Copyright (C) 2013 Renesas Electronics Corporation + * Copyright (C) 2013 Renesas Solutions Corp. + * Copyright (C) 2013 Magnus Damm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include + +static void __init koelsch_add_standard_devices(void) +{ + r8a7791_clock_init(); + r8a7791_add_dt_devices(); +} + +static const char * const koelsch_boards_compat_dt[] __initconst = { + "renesas,koelsch", + NULL, +}; + +DT_MACHINE_START(KOELSCH_DT, "koelsch") + .init_early = r8a7791_init_early, + .init_machine = koelsch_add_standard_devices, + .dt_compat = koelsch_boards_compat_dt, +MACHINE_END