From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by mx.groups.io with SMTP id smtpd.web12.2515.1570686113303739297 for ; Wed, 09 Oct 2019 22:41:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=h20eyypy; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.67, mailfrom: mw@semihalf.com) Received: by mail-lf1-f67.google.com with SMTP id w6so3384738lfl.2 for ; Wed, 09 Oct 2019 22:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IbOEnZwz20CXp4T4baB+Ewcx2EJjGp6C4wMxCkSBQr0=; b=h20eyypy/UCNyGEf3fIkgJ7b+kTIhoc3cNbA6kRgNwCclu1OmdKeTBqHZ95WkAOabX gmeJg2pLZo3ydTyJXQUYHjUioLzwOPJJ6romhG7gwr6y6xeObideG7PJMRyHDuZhcotp kfcsrDy1+xNMORshxGW9+KaHmZ9NLzBYO8FYa2VFhcsYIIYsfrhDeE+vkHHqZbaybPbf CGHf/jfA2HEmMP04BeG5Ct2HTN0q6AghtYDrZXrGRpwY+Bdir2ovuLzqwYwumZ/Qo3VY sbZL8NB9ZEp7CmfBnM/OFnk4YjHCdkzMuRz7bPmhMH2ABAPdz4auJugUWCxSS3xYfY4L TuCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IbOEnZwz20CXp4T4baB+Ewcx2EJjGp6C4wMxCkSBQr0=; b=nHVSh77k185lmgjgjp3lAs+JLmjTOv4Hs6dMjw4Mncz78vKuWfCBEUi3EJh++ksNU8 /f/AlV0UOCXvkE4Aw4XI41lupn4KSUtpK8jSaElWYphhyuGQ+hqKvSPRcm+QEwSJdS23 v9ldhstVwklBxjz54Zu3sHdxbPc64xrsSZuUAZoJB6bLoei7BhDXBIfnT1jwWZNcqvpk Xf5XyxaNWAcOSy5lrMBKfREQkHMBd4pnoNUbI/dNzYcJkiWZgsS+kGcVDYCoWjpIVe5J RDaF7Po08ul1dnQuF/p0bFSVvErbAcFCDn5LMT3k9s8Nv2HU3OsqpyTfp9PaSUTS/bIZ T9MA== X-Gm-Message-State: APjAAAU2NmSbh8dtg2TdBOhZh6xgH+rqPobYH9P4Kt1d6ISr18IP/+Ci IUTEaqy3HwEj/MEyMD0sD/buCeFD4w98Lw== X-Google-Smtp-Source: APXvYqyxT6Dgq2Mw/K5d+bqwgXDKjubtVZW3RRz66/0WtE4kEAQJEbvEdDAB9laAZckV5NV4aZduxg== X-Received: by 2002:a05:6512:74:: with SMTP id i20mr4520065lfo.97.1570686111267; Wed, 09 Oct 2019 22:41:51 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id w27sm950028ljd.55.2019.10.09.22.41.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Oct 2019 22:41:50 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Subject: [edk2-non-osi: PATCH 2/3] Marvell/Cn9131Db: Add DeviceTree Date: Thu, 10 Oct 2019 07:41:17 +0200 Message-Id: <1570686078-25140-3-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570686078-25140-1-git-send-email-mw@semihalf.com> References: <1570686078-25140-1-git-send-email-mw@semihalf.com> This patch adjusts the top device tree for the CN9131 development board (variant A), based on the sources which are common for the Cn913x SoCs. Also an .inf file is added to allow its compilation. Signed-off-by: Marcin Wojtas --- Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf | 22 +++++++++++++++++ Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db.dtsi | 26 +++++++++++--------- 2 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf diff --git a/Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf b/Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf new file mode 100644 index 0000000..8108197 --- /dev/null +++ b/Silicon/Marvell/OcteonTx/DeviceTree/T91/Cn9131DbA.inf @@ -0,0 +1,22 @@ +## @file +# +# Device tree description of the Marvell CN9130-DB-A platform +# +# Copyright (c) 2019, Marvell International Ltd. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION = 0x0001001B + BASE_NAME = Cn9131DbADeviceTree + FILE_GUID = 25462CDA-221F-47DF-AC1D-259CFAA4E326 # gDtPlatformDefaultDtbFileGuid + MODULE_TYPE = USER_DEFINED + VERSION_STRING = 1.0 + +[Sources] + cn9131-db-A.dts + +[Packages] + MdePkg/MdePkg.dec diff --git a/Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db.dtsi b/Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db.dtsi index c8e425a..9c9dfb6 100644 --- a/Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db.dtsi +++ b/Silicon/Marvell/OcteonTx/DeviceTree/T91/cn9131-db.dtsi @@ -6,15 +6,23 @@ */ #undef CP110_NUM -#undef CP110_PCIE_MEM_SIZE +#undef CP110_NAME +#undef CP110_BASE +#undef CP110_PCIE0_BASE +#undef CP110_PCIE1_BASE +#undef CP110_PCIE2_BASE #undef CP110_PCIEx_CPU_MEM_BASE -#undef CP110_PCIEx_BUS_MEM_BASE +#undef CP110_PCIEx_MEM_BASE /* CP110-1 Settings */ +#define CP110_NAME cp1 #define CP110_NUM 1 -#define CP110_PCIE_MEM_SIZE(iface) (0xf00000) -#define CP110_PCIEx_CPU_MEM_BASE(iface) (0xe2000000 + (iface) * 0x1000000) -#define CP110_PCIEx_BUS_MEM_BASE(iface) (CP110_PCIEx_CPU_MEM_BASE(iface)) +#define CP110_BASE f4000000 +#define CP110_PCIE0_BASE f4600000 +#define CP110_PCIE1_BASE f4620000 +#define CP110_PCIE2_BASE f4640000 +#define CP110_PCIEx_CPU_MEM_BASE(iface) (0xe2000000 + (iface) * 0x1000000) +#define CP110_PCIEx_MEM_BASE(iface) (CP110_PCIEx_CPU_MEM_BASE(iface)) #include "armada-cp110.dtsi" @@ -93,12 +101,6 @@ &cp1_sata0 { status = "okay"; - /* CON32 */ - sata-port@1 { - status = "okay"; - /* Generic PHY, providing serdes lanes */ - phys = <&cp1_comphy5 1>; - }; }; /* U24 */ @@ -138,7 +140,7 @@ &cp1_syscon0 { cp1_pinctrl: pinctrl { - compatible = "marvell,cp115-standalone-pinctrl"; + compatible = "marvell,armada-7k-pinctrl"; cp1_i2c0_pins: cp1-i2c-pins-0 { marvell,pins = "mpp37", "mpp38"; -- 2.7.4