From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756096Ab1BWCWi (ORCPT ); Tue, 22 Feb 2011 21:22:38 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:47790 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755998Ab1BWCWg (ORCPT ); Tue, 22 Feb 2011 21:22:36 -0500 Subject: [PATCH v4 6/7] arm/dt: Basic tegra devicetree support To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Grant Likely Cc: Nicolas Pitre , Russell King Date: Tue, 22 Feb 2011 19:22:34 -0700 Message-ID: <20110223022234.18318.90592.stgit@localhost6.localdomain6> In-Reply-To: <20110223021524.18318.71902.stgit@localhost6.localdomain6> References: <20110223021524.18318.71902.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds adds very basic support for booting tegra with a device tree. It simply allows the existing machine_descs to match against the tegra compatible values so that the kernel can boot. Kernel parameters and the initrd pointer is read out of the tree instead of atags. This is not complete device tree support. This change will be reverted when a new machine_desc is added that can populate the device registrations directly from data in the tree instead of using hard coded data. That change will be made in a future patch. v2: Fixed cut-and-paste error in commit text Signed-off-by: Grant Likely --- arch/arm/mach-tegra/board-harmony.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index b9dbdb1..99884e9 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -113,6 +113,11 @@ static void __init tegra_harmony_init(void) platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices)); } +static const char * tegra_harmony_board_compat[] = { + "nvidia,harmony", + NULL +}; + MACHINE_START(HARMONY, "harmony") .boot_params = 0x00000100, .fixup = tegra_harmony_fixup, @@ -120,4 +125,5 @@ MACHINE_START(HARMONY, "harmony") .init_machine = tegra_harmony_init, .map_io = tegra_map_common_io, .timer = &tegra_timer, + .dt_compat = tegra_harmony_board_compat, MACHINE_END