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::141; helo=mail-lf1-x141.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) (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 70C80210D978F for ; Sun, 5 Aug 2018 16:28:52 -0700 (PDT) Received: by mail-lf1-x141.google.com with SMTP id u14-v6so7753811lfu.0 for ; Sun, 05 Aug 2018 16:28:52 -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=Y5Rw+LUikHfPQIACvNCE1C1hcbtWcIwLNVTuJiG5iAX4iWpI+fg4rApQ+wy6Bbxeln vbg0gavKKsEaE4kl11mqkOZZqQ/GqZ+/m3hUaZwTng007z4eOUKKzbEvGdxHjRcCR2NV 6ipkmL25RBGRXWDbu8MoLhsD98vlTFs1iNC1dZP+YPrGLXcrwFdYkgSRvDFt4rt1beaq cvuFQTXvSn7bBh30fAF739nFdZJVu/r9LhIJr38awUqNlDZPgtfSg9l1XUwsChn4BkeQ ZYJmRUuKKEqXn+igeKpCVPp+YviurHbLPlyiTzrTBLIpQxD8iRS2twRchPaDDOtSzmOX Qung== 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=NBEk+t1hVBQ5+zCgqBmNNahn1/kTSBnvaZheehGhzhXsihfaBuvuzwLpsVH6R/PI5C /ZMkmyIP0RhV5nMCtN+kICa8O0J6ffeXZHLt65bMxPZqPN3Nz0c+sUBs3AdpcbZBnOQn tS0Jl/X+i62aLyvBcsNbfqjdxbITXZ2Zp2fVhIXMWErfuL4WRLr2k4RFAsZk5LPnttk0 Q0568ECZGxAfGUuQB2IYkQFMye1nIJTs5mqge+LewUx6lxEidG5VWRLdI/kc+gVW1hGO QzoOjaFKlHT56omaWDVqOiGgish8lzuZxXiavODd0Hs2BiizWV26cdprKVUNipQuQyQP nvzg== X-Gm-Message-State: AOUpUlEmE1KH4Tb62yvqsqf8pK3xho9qVcTO52TY1FsU1Uw1eVCTynMi Gdj3PzSL0KuykP/lcJ52LuR13ZwsrwS4VA== X-Google-Smtp-Source: AAOMgpduZ8/gzYjVmU0xR4OZoU+ic7Ekxk3NeYj7VPYXYcimPwT3H1tZ9cA6fIFNEIbQ14oiR5Wbyg== X-Received: by 2002:a19:e9d7:: with SMTP id j84-v6mr9992088lfk.115.1533511730539; Sun, 05 Aug 2018 16:28:50 -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 v136-v6sm1861994lfa.10.2018.08.05.16.28.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Aug 2018 16:28:49 -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: Mon, 6 Aug 2018 01:28:22 +0200 Message-Id: <1533511706-9344-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533511706-9344-1-git-send-email-mw@semihalf.com> References: <1533511706-9344-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH 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: Sun, 05 Aug 2018 23:28:52 -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