From patchwork Wed Apr 7 04:10:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 49568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9013FB7D60 for ; Wed, 7 Apr 2010 14:32:14 +1000 (EST) Received: from localhost ([127.0.0.1]:40207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzMoE-0003Ji-Nf for incoming@patchwork.ozlabs.org; Wed, 07 Apr 2010 00:24:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzMbA-000098-Js for qemu-devel@nongnu.org; Wed, 07 Apr 2010 00:10:40 -0400 Received: from [140.186.70.92] (port=34769 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzMb9-000082-Br for qemu-devel@nongnu.org; Wed, 07 Apr 2010 00:10:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzMb7-0001pX-TD for qemu-devel@nongnu.org; Wed, 07 Apr 2010 00:10:39 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:37776) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzMb7-0001mu-O8 for qemu-devel@nongnu.org; Wed, 07 Apr 2010 00:10:37 -0400 Received: by mail-pz0-f204.google.com with SMTP id 42so139118pzk.4 for ; Tue, 06 Apr 2010 21:10:37 -0700 (PDT) Received: by 10.142.9.10 with SMTP id 10mr2976028wfi.42.1270613437349; Tue, 06 Apr 2010 21:10:37 -0700 (PDT) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id 23sm3317366pzk.6.2010.04.06.21.10.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 06 Apr 2010 21:10:35 -0700 (PDT) Received: from [127.0.1.1] (localhost [127.0.0.1]) by angua (Postfix) with ESMTP id BA51E1121; Tue, 6 Apr 2010 22:10:33 -0600 (MDT) From: Grant Likely To: qemu-devel@nongnu.org, devicetree-discuss@lists.ozlabs.org, jeremy.kerr@canonical.com Date: Tue, 06 Apr 2010 22:10:33 -0600 Message-ID: <20100407041033.20274.72493.stgit@angua> In-Reply-To: <20100407040129.20274.44284.stgit@angua> References: <20100407040129.20274.44284.stgit@angua> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [RFC PATCH 7/7] devicetree: Add fdt_populate hook to smc91x device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Grant Likely --- hw/smc91c111.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/hw/smc91c111.c b/hw/smc91c111.c index b7398c9..300d209 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -721,8 +721,28 @@ static int smc91c111_init1(SysBusDevice *dev) return 0; } +#ifdef CONFIG_FDT +#include +static int smc91c111_fdt_populate(SysBusDevice *dev, void *fdt, int offset) +{ + smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev); + int rc; + + rc = fdt_setprop_string(fdt, offset, "compatible", "smc,91c111"); + if (rc < 0) + return rc; + + rc = fdt_setprop(fdt, offset, "local-mac-address", s->conf.macaddr.a, + sizeof(s->conf.macaddr.a)); + return 0; +} +#endif + static SysBusDeviceInfo smc91c111_info = { .init = smc91c111_init1, +#ifdef CONFIG_FDT + .fdt_populate = smc91c111_fdt_populate, +#endif .qdev.name = "smc91c111", .qdev.size = sizeof(smc91c111_state), .qdev.props = (Property[]) {