From patchwork Wed Oct 24 05:48:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 1635641 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 0C045DF2AB for ; Wed, 24 Oct 2012 05:49:48 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TQtpA-0005h8-Al; Wed, 24 Oct 2012 05:48:16 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TQtp6-0005gu-C8 for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 05:48:13 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so84307daj.36 for ; Tue, 23 Oct 2012 22:48:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=eTJSda6M42Q7NYnfNKvQ8H1YLvdOUTKs35F3rbDOkug=; b=bczCrVKSP7HVJiWw0Q/gS4Lw51KAz9O5yrRe7tEwhyq4CPuexmBm5ErLw2dbOQDuCj gPvORr++EGnh00UOc4GnH6PWAqwPT3yyReGCzBQeWf0w9kYTWLF4bT7Kf2cxSCHkQHdl Yaykm/sCdZA7RSR7JF26JEvNwu1LgqOKnzf9/tU00DSC725Z2M4KjAQ9lvC0cX6QCt6i wl99EV4yCOClS0BGZMCmLR+6HXwrENdO1vRhQNIj8rZzK75z87geQeYD9HRFZUDErxVW 5bXoqZ3DzmppJ/wnl4I6lPMT9NJ5VGBWuYFppESFD5ptKiHZS+nQ6PrZ963iCZKtLhO8 pkHg== Received: by 10.68.220.169 with SMTP id px9mr47868229pbc.14.1351057688974; Tue, 23 Oct 2012 22:48:08 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id x8sm8947329paw.16.2012.10.23.22.48.06 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2012 22:48:08 -0700 (PDT) From: Nobuhiro Iwamatsu To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: mach-shmobile: Use DT_MACHINE for mackerel Date: Wed, 24 Oct 2012 14:48:00 +0900 Message-Id: <1351057680-4755-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkCm8/UNMW8uVXZZ02J41duD6ftQaluv2weHIr4K4yWaF9tzGm/WKskdJ01f05W8eFOuGDI X-Spam-Note: CRM114 invocation failed 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.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Nobuhiro Iwamatsu , horms@verge.net.au X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use DT_MACHINE_START() on the sh7372 based mackerel board. Also include a tiny DTS file to describe the board and update the Kconfig dependencies to select CONFIG_USE_OF. Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/sh7372-mackerel.dts | 22 ++++++++++++++++++++++ arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/board-mackerel.c | 8 +++++++- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9f..a9d8a10 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -77,7 +77,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ r8a7740-armadillo800eva.dtb \ - sh73a0-kzm9g.dtb + sh73a0-kzm9g.dtb \ + sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ spear1340-evb.dtb dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts new file mode 100644 index 0000000..286f0ca --- /dev/null +++ b/arch/arm/boot/dts/sh7372-mackerel.dts @@ -0,0 +1,22 @@ +/* + * Device Tree Source for the mackerel board + * + * Copyright (C) 2012 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/ "skeleton.dtsi" + +/ { + model = "Mackerel (AP4 EVM 2nd)"; + compatible = "renesas,mackerel"; + + memory { + device_type = "memory"; + reg = <0x40000000 0x10000000>; + }; +}; diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 8ae100c..0750d9c 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -95,6 +95,7 @@ config MACH_MACKEREL select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR select SND_SOC_AK4642 if SND_SIMPLE_CARD + select USE_OF config MACH_KOTA2 bool "KOTA2 board" diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 0c27c81..39b8f2e 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1651,7 +1651,12 @@ static void __init mackerel_init(void) pm_clk_add(&hdmi_lcdc_device.dev, "hdmi"); } -MACHINE_START(MACKEREL, "mackerel") +static const char *mackerel_boards_compat_dt[] __initdata = { + "renesas,mackerel", + NULL, +}; + +DT_MACHINE_START(MACKEREL_DT, "mackerel") .map_io = sh7372_map_io, .init_early = sh7372_add_early_devices, .init_irq = sh7372_init_irq, @@ -1659,4 +1664,5 @@ MACHINE_START(MACKEREL, "mackerel") .init_machine = mackerel_init, .init_late = sh7372_pm_init_late, .timer = &shmobile_timer, + .dt_compat = mackerel_boards_compat_dt, MACHINE_END