From patchwork Thu Nov 7 16:32:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 289419 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1467F2C0087 for ; Fri, 8 Nov 2013 03:35:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AA8D4A3B6; Thu, 7 Nov 2013 17:35:13 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ra7WcwhdDzfb; Thu, 7 Nov 2013 17:35:13 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CC194A3D9; Thu, 7 Nov 2013 17:33:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F7AF4A395 for ; Thu, 7 Nov 2013 17:33:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ug6HifmHWylJ for ; Thu, 7 Nov 2013 17:33:48 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f201.google.com (mail-ob0-f201.google.com [209.85.214.201]) by theia.denx.de (Postfix) with ESMTPS id 18EFA4A38A for ; Thu, 7 Nov 2013 17:33:29 +0100 (CET) Received: by mail-ob0-f201.google.com with SMTP id vb8so53752obc.2 for ; Thu, 07 Nov 2013 08:33:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M/+Kwr8L3wlfstuEUs5i44BAqOw1QVGuYh+vLSo9PAk=; b=MCKYKf5ftIshFFBxYXGQaybmvNLzKs/tS04wXYr8WuGoVLksVW2b/eFGWt+eIGBY/s ip/jjOOSIAZrhxmz+9fwLdUAjBIeD1ArwQYJfkoj0jiPuhUu0PpqGegii6UlXd/9Vr8F fsu+HKHHoulxKD025yki6wsNI3sIimMNGyEQd00SS8MEf16O8/6LA/tOpP9JS3RfyjKc tjTzMV6deFR/JRKk4gimeRgW91m26Qs0orBdCwzM9RemtqJRCRqqn5cA20D7zL0k0qtz vd0OWfFA+r00tD9qkhHBAJJBNX3shHgf/ZnMYxg8i2E3jTmOruSk8bUSmXkoZAr/27Cq Tq4A== X-Gm-Message-State: ALoCoQnuweOVh7Wb6LN6lG5Cz2PV2Fn8p7kLKKk7DdFDOckTSxwYpeakoEiIv0z7sNgjEAvcG6wUEzysBGcITHEcgjrtKdDH516oC5Wn0lQbBv+QvNJg5825stfWdGn8SPlRd7iCpPhjaVTN4GifDAPCDF9qNUplX9K5AsRAQnrQpGLGxsBqNcpJOQztXwM9PNaTg0/K4ZWE X-Received: by 10.182.53.165 with SMTP id c5mr3221117obp.0.1383842007974; Thu, 07 Nov 2013 08:33:27 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id k45si611771yhn.4.2013.11.07.08.33.27 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Nov 2013 08:33:27 -0800 (PST) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id CD41B5A4279; Thu, 7 Nov 2013 08:33:27 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 13BEF221979; Thu, 7 Nov 2013 09:32:33 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 7 Nov 2013 09:32:06 -0700 Message-Id: <1383841933-1800-11-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.4.1 In-Reply-To: <1383841933-1800-1-git-send-email-sjg@chromium.org> References: <1383841933-1800-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , u-boot-review@google.com Subject: [U-Boot] [PATCH v6 10/17] dm: Set up driver model after relocation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Make driver model available after relocation, by setting up data structures and scanning for devices using compiled-in platform_data and (when available) the device tree. Signed-off-by: Simon Glass --- Changes in v6: - Rename platform_data to platdata Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None common/board_r.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/common/board_r.c b/common/board_r.c index 86ca1cb..162562b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -18,6 +18,7 @@ #ifdef CONFIG_HAS_DATAFLASH #include #endif +#include #include #include #if defined(CONFIG_CMD_IDE) @@ -51,7 +52,9 @@ #ifdef CONFIG_X86 #include #endif +#include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -263,6 +266,33 @@ static int initr_malloc(void) return 0; } +#ifdef CONFIG_DM +static int initr_dm(void) +{ + int ret; + + ret = dm_init(); + if (ret) { + debug("dm_init() failed: %d\n", ret); + return ret; + } + ret = dm_scan_platdata(); + if (ret) { + debug("dm_scan_platdata() failed: %d\n", ret); + return ret; + } +#ifdef CONFIG_OF_CONTROL + ret = dm_scan_fdt(gd->fdt_blob); + if (ret) { + debug("dm_scan_fdt() failed: %d\n", ret); + return ret; + } +#endif + + return 0; +} +#endif + __weak int power_init_board(void) { return 0; @@ -761,6 +791,9 @@ init_fnc_t init_sequence_r[] = { initr_barrier, initr_malloc, bootstage_relocate, +#ifdef CONFIG_DM + initr_dm, +#endif #ifdef CONFIG_ARCH_EARLY_INIT_R arch_early_init_r, #endif