From patchwork Wed Nov 6 23:31:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3149951 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 2F79C9F47C for ; Wed, 6 Nov 2013 23:32:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 451D420630 for ; Wed, 6 Nov 2013 23:32:34 +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 405392051A for ; Wed, 6 Nov 2013 23:32:33 +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 1VeCZK-0001nq-8U; Wed, 06 Nov 2013 23:31:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeCZ5-0006nm-Qr; Wed, 06 Nov 2013 23:31:11 +0000 Received: from mail-pb0-x233.google.com ([2607:f8b0:400e:c01::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeCZ3-0006ll-Ek for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2013 23:31:09 +0000 Received: by mail-pb0-f51.google.com with SMTP id xa7so208555pbc.38 for ; Wed, 06 Nov 2013 15:30:47 -0800 (PST) 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=rADwYLgwwqqAKeTS8H13oMEOMYjnQyhZgfKJxalxOrw=; b=NCYkADiepbIDK/52cTeCN42Usgz6i9MJThel3wxATab3z2rYm6ahiHEK7G4a13mmtd 6P0LVuWmW7KFGd+00cKcAqpZH2Lw3c+TKpk42xKAorOtTrlEuHHoIC8Duidw6xZv/xNo X88kHV0aNxUUfraovXdnLNg1h01TN8xPkwKy0epT9PzCOQ7fYHx/byIHhLxVI/x2tdbk gUlTh3+639XJrXWiUi9Pa9JZreKEYwtwB1mZKacSc4zlfbxH7LIODHCYXbhfk3xzxj6t LVEBza8eHWhU4lxOA5YT9GK+6ssf89FZtpbZnsDQ6CATC7za2WL8ZKAhkGpwxwPaGNFc spQQ== X-Received: by 10.66.9.7 with SMTP id v7mr6506684paa.4.1383780647718; Wed, 06 Nov 2013 15:30:47 -0800 (PST) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id gf5sm560564pbc.22.2013.11.06.15.30.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2013 15:30:46 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Thu, 07 Nov 2013 08:31:25 +0900 Message-Id: <20131106233125.8117.70912.sendpatchset@w520> In-Reply-To: <20131106233032.8117.71968.sendpatchset@w520> References: <20131106233032.8117.71968.sendpatchset@w520> Subject: [PATCH 03/03] ARM: shmobile: r7s72100 Genmai Multiplatform X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131106_183109_584497_4C5849C8 X-CRM114-Status: UNSURE ( 8.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: horms@verge.net.au, Magnus Damm , laurent.pinchart@ideasonboard.com, 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=-4.1 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: Magnus Damm Add r7s72100 Genmai to SHMOBILE_MULTI. Signed-off-by: Magnus Damm --- arch/arm/boot/dts/Makefile | 1 + arch/arm/mach-shmobile/Kconfig | 7 +++++++ arch/arm/mach-shmobile/Makefile | 1 + arch/arm/mach-shmobile/board-genmai-reference.c | 5 +++++ 4 files changed, 14 insertions(+) --- 0015/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2013-11-06 19:18:41.000000000 +0900 @@ -216,6 +216,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm r8a73a4-ape6evm-reference.dtb \ sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ + r7s72100-genmai-reference.dtb \ r8a7791-koelsch-reference.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ socfpga_vt.dtb --- 0016/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-11-06 19:20:36.000000000 +0900 @@ -20,12 +20,19 @@ comment "SH-Mobile System Type" config ARCH_EMEV2 bool "Emma Mobile EV2" +config ARCH_R7S72100 + bool "RZ/A1H (R7S72100)" + config ARCH_R8A7791 bool "R-Car M2 (R8A77910)" select RENESAS_IRQC comment "SH-Mobile Board Type" +config MACH_GENMAI + bool "Genmai board" + depends on ARCH_R7S72100 + config MACH_KOELSCH bool "Koelsch board" depends on ARCH_R8A7791 --- 0016/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-11-06 19:20:59.000000000 +0900 @@ -56,6 +56,7 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779 # Board objects ifdef CONFIG_ARCH_SHMOBILE_MULTI +obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o else --- 0016/arch/arm/mach-shmobile/board-genmai-reference.c +++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2013-11-06 19:19:53.000000000 +0900 @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -27,7 +28,11 @@ static void __init genmai_add_standard_devices(void) { +#ifdef CONFIG_COMMON_CLK + of_clk_init(NULL); +#else r7s72100_clock_init(); +#endif r7s72100_add_dt_devices(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }