From nobody Tue Oct 28 12:35:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515463930002343.4810594471081; Mon, 8 Jan 2018 18:12:10 -0800 (PST) Received: from localhost ([::1]:46237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYjOb-0001SS-98 for importer@patchew.org; Mon, 08 Jan 2018 21:12:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYjEc-0002Dl-PF for qemu-devel@nongnu.org; Mon, 08 Jan 2018 21:01:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYjEZ-0002Vt-II for qemu-devel@nongnu.org; Mon, 08 Jan 2018 21:01:50 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:40028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYjEZ-0002Vg-Cl; Mon, 08 Jan 2018 21:01:47 -0500 Received: by mail-qk0-x242.google.com with SMTP id d18so6335344qke.7; Mon, 08 Jan 2018 18:01:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r22sm8605027qtc.71.2018.01.08.18.01.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 18:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JGdW9JhJtOrnqQi4x9aT/c1nsEvibtllUaBMMBMXyXI=; b=T0BF/Kbev6xI+EfjfhhN0iFvUPeBYo+B34IXP+lAXlCWeh7hhtPct4yYqfjUpM1bhC pcHg1NfmVzZWocJ0+SmK2FYV0mSsvh+qHiXQVR+GEpU30F0Y76YPmb7DiRsQPr1M1GaK WMosaO0goK2QrZmATFHqKiVJ5m93/PbTMbRqHyhMTTlCuBOVzk3F3xowSnwY/R9goe4B jq+Q8tFTQN0ih3GsCv9zxbPFVkvasDvPoItZmTGo/HHfOtkcWQE9yXkyTX2sTaNQIhpg pyXK+UrdT+AhbBXTku8xOeSrKuGcf3/iC/7gQcwyWLa5N2bmEHUnfs51LYRrg/yriWlz JBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JGdW9JhJtOrnqQi4x9aT/c1nsEvibtllUaBMMBMXyXI=; b=LHBf0UCLM6n2ylWZ7eQP9tZxWSTgcLpyO74tV3uV/dclZD7NE5GzMqnJ4qa78w3JAS sgUNO3Pvnu9maNpu78zEIe+qq/XtMYLTxhEPCYYek4M8j7FP63RJnXqLRfYIj8KFc0O6 fzGxt+w3o3eo/KGALqdDP/7ljhYSZ06wkd1seRPWpc7MOqgRo8/Z7x3zeAo/w09APKpg WW6SbYowtjEabuvyn9kjAlnRyzC+M3KiMv3ryEQsGUxWYrFljaUhVEKPvYpBqPFhf4fr vNZRim7rfcXs1f4Dcbecbha0Ni7OnC4pfEuYj4g+s6JoQwnvPFiwSaHetHCSEmMcsyvY lxNg== X-Gm-Message-State: AKwxytfk/QrrOMaBdrFgDpws6D8pij8F58sdtdVZYuCz55uugKh6NaFX i1h1ezri6Lxh5ytSbRqr8b623xgyfX4= X-Google-Smtp-Source: ACJfBoteQpc8Q1JEeCSRPFeBT1NlbLeDMiLAVEQe5U+7XmJ2Aj0uZ7w/PMEAPzXdXDb/Q9uwVgIe5w== X-Received: by 10.55.78.149 with SMTP id c143mr10912441qkb.30.1515463306820; Mon, 08 Jan 2018 18:01:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov , Eduardo Habkost Date: Mon, 8 Jan 2018 23:00:54 -0300 Message-Id: <20180109020054.32553-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180109020054.32553-1-f4bug@amsat.org> References: <20180109020054.32553-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [RFC PATCH v2 9/9] hw/arm/xlnx-zynqmp: use Linux FDT names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Edgar E. Iglesias" , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xlnx-zynqmp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..fdcd6801b6 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -24,6 +24,7 @@ #include "exec/address-spaces.h" #include "sysemu/kvm.h" #include "kvm_arm.h" +#include "hw/sysbus-fdt.h" =20 #define GIC_NUM_SPI_INTR 160 =20 @@ -138,6 +139,7 @@ static void xlnx_zynqmp_init(Object *obj) XlnxZynqMPState *s =3D XLNX_ZYNQMP(obj); int i; int num_apus =3D MIN(smp_cpus, XLNX_ZYNQMP_NUM_APU_CPUS); + const char *type_name; =20 for (i =3D 0; i < num_apus; i++) { object_initialize(&s->apu_cpu[i], sizeof(s->apu_cpu[i]), @@ -150,12 +152,14 @@ static void xlnx_zynqmp_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default()); =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { - object_initialize(&s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM); + type_name =3D type_resolve_fdt_alias("cdns,zynqmp-gem"); + object_initialize(&s->gem[i], sizeof(s->gem[i]), type_name); qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default()); } =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) { - object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UA= RT); + type_name =3D type_resolve_fdt_alias("xlnx,zynqmp-uart"); + object_initialize(&s->uart[i], sizeof(s->uart[i]), type_name); qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); } =20 @@ -175,13 +179,15 @@ static void xlnx_zynqmp_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default()); } =20 - object_initialize(&s->qspi, sizeof(s->qspi), TYPE_XLNX_ZYNQMP_QSPIPS); + type_name =3D type_resolve_fdt_alias("xlnx.zynq-qspi"); + object_initialize(&s->qspi, sizeof(s->qspi), type_name); qdev_set_parent_bus(DEVICE(&s->qspi), sysbus_get_default()); =20 object_initialize(&s->dp, sizeof(s->dp), TYPE_XLNX_DP); qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default()); =20 - object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); + type_name =3D type_resolve_fdt_alias("xlnx,axi-dpdma-1.0"); + object_initialize(&s->dpdma, sizeof(s->dpdma), type_name); qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); } =20 --=20 2.15.1