From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4864:20::242; helo=mail-lj1-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 17352210DC1C4 for ; Tue, 7 Aug 2018 02:00:23 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id f8-v6so12819450ljk.1 for ; Tue, 07 Aug 2018 02:00:23 -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=GiYxA0lZ05JqSmIXcPmjKXMKfgR33aj2/GNiDHQSgNY=; b=jlO5QreTwBJBaAINJdGfkF6JKImLKlXZ0t7H4IWvrMzTxGqeRt89rs4T9rV1WtBKQW RMgphogscoaPVqL9uZP0OCqXmX53tTKdiw762jHJax2G96ryypXI3/Azxm9f7DCk7U1s luRo1UZTizMk6viOg1BGsPzruDT6DBaNlxw3/347deBv0W8bHWmCPsJltDS5YTT4BSxT xeZn6TpJxjhCxa3u4NQLXP9FSY0UH1RzPJlLVq5Y5HLfr0MwRKNrgBNAXPBXkKS6OUmd 3sUlug1y0Nn/9BN8n9NnUAgact7duZnI2i2H6YM24WOvBqYD+wV7cxBM/A3ZGicQnkKr 9RDg== 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=GiYxA0lZ05JqSmIXcPmjKXMKfgR33aj2/GNiDHQSgNY=; b=XlISXU7Cc8TCiFEUf43SBEwwka2d9slr8zxU7DQa4l1/t0UcJdG7R3X2YLVAjPy8Fr RXG69wV+0sIqM5u26l0xn3rlhdXY3A2VsOJwmhiaUtHDhjTB6ugr/2DP9RDlE7IQBmwn BFuB8upre09GVmjZa/nsvF0GCZGNmyk8PzfQv7Vrvvbu8JX+dNCFkVVcimtS9kN5oPJX 7q4jNBIQqhr6Sr1KIEJbLxtYQ7efejYNEEyDATF4rtTl5/ekGUsi3rBLn5r8NYHzlp8p iN8st3/G8FHv/BbU0hWXI9EfJGGo1E8/IJySafmeVP0aGlAsFvPrYLK91bIqHBanu5A9 dJNw== X-Gm-Message-State: AOUpUlGkQs93LFO1qvloCQU+dDP/zgvKDCS5KA/sE5N6khmMUX8XM7AP iBVn+evDpWypqJzRGii/6Oaxunp7R6B+jg== X-Google-Smtp-Source: AAOMgpdpZb9LKLarIj6pTUGIcVJvsm4/t1c1mooA8ODGyY4VZROyQcNQYlbDtkE/2XpnSVO4ncgEqg== X-Received: by 2002:a2e:557:: with SMTP id 84-v6mr15890336ljf.152.1533632421139; Tue, 07 Aug 2018 02:00:21 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id w27-v6sm181697lfk.5.2018.08.07.02.00.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Aug 2018 02:00:20 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com Date: Tue, 7 Aug 2018 10:58:14 +0200 Message-Id: <1533632298-4981-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533632298-4981-1-git-send-email-mw@semihalf.com> References: <1533632298-4981-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 5/9] Marvell/Armada80x0McBin: Enable device tree support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2018 09:00:23 -0000 This patch enables compilation of the Armada 8040 MacchiatoBin device tree. Dsable OS acccess to the SPI flash and extend PCI ranges to use 256MB mmio32 and 4GB mmio64. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc | 3 +++ Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf | 28 ++++++++++++++++++++ Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 3 +++ Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts | 5 +++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc index e1f5827..e6cb0d6 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -49,6 +49,9 @@ !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +[Components.common] + Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf new file mode 100644 index 0000000..810a52b --- /dev/null +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf @@ -0,0 +1,28 @@ +## @file +# +# Device tree description of the Marvell Armada 8040 MacchiatoBin platform +# +# Copyright (c) 2018, Marvell International Ltd. All rights reserved. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + +[Defines] + INF_VERSION = 0x0001001A + BASE_NAME = Armada80x0McBinDeviceTree + FILE_GUID = 25462CDA-221F-47DF-AC1D-259CFAA4E326 # gDtPlatformDefaultDtbFileGuid + MODULE_TYPE = USER_DEFINED + VERSION_STRING = 1.0 + +[Sources] + armada-8040-mcbin.dts + +[Packages] + MdePkg/MdePkg.dec diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc index 984cf7e..4eb1496 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc @@ -11,3 +11,6 @@ # # Per-board additional content of the DXE phase firmware volume + + # DTB + INF RuleOverride = DTB Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts b/Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts index 0e20e70..b86e27e 100644 --- a/Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts +++ b/Silicon/Marvell/Armada7k8k/DeviceTree/armada-8040-mcbin.dts @@ -185,6 +185,9 @@ num-lanes = <4>; num-viewport = <8>; reset-gpio = <&cp0_gpio1 20 GPIO_ACTIVE_LOW>; + ranges = <0x1000000 0x0 0x00000000 0x0 0xeff00000 0x0 0x00010000>, + <0x2000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x20000000>, + <0x3000000 0x8 0x00000000 0x8 0x00000000 0x1 0x00000000>; status = "okay"; }; @@ -355,7 +358,7 @@ &cp1_spi1 { pinctrl-names = "default"; pinctrl-0 = <&cp1_spi1_pins>; - status = "okay"; + status = "disabled"; spi-flash@0 { compatible = "st,w25q32"; -- 2.7.4