From patchwork Thu Apr 11 20:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1084279 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TNZI41hr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gCl36XQWz9s0W for ; Fri, 12 Apr 2019 06:47:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 87C66C21DDC; Thu, 11 Apr 2019 20:47:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1D85CC21DDC; Thu, 11 Apr 2019 20:47:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0FE3FC21DB5; Thu, 11 Apr 2019 20:47:19 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by lists.denx.de (Postfix) with ESMTPS id D32A0C21CB6 for ; Thu, 11 Apr 2019 20:47:17 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id e24so3992747pfi.12 for ; Thu, 11 Apr 2019 13:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2pn39KkVksUL+iFLO9elxDTqG5Sub4NnKqvPOvHSVT8=; b=TNZI41hrg0XyRWf+Nknn+qWQPTnJ32AXxokH41yvIEalrdPA9vIZ87yvQGjmM/ZarZ BDD3QJRsmigCqkRNj+mpgQ3ZMQGZNEGvgxQ5iIv+kJnHJ/2QTfXnY7/tZYvBpuXGuwh8 V+kVbSqd+HY8wQHK08T1GVz29faKBc/BsdJ2pFx8h2m6sSlx/TvZxIf3IcuPxCxJ+VRk 4OSGMFaopgD/eH5b4zMJbKIyUvhcSymzZikkZbx0+9fBZm3/E1KlyrrVZSiR7F7PrKJL ffUi5doCl9zrdKGqGPCPig4+jIFBx3iQtZIS0OapaLXgc89upsGABhPDiHwwF39acDh6 od5w== 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:mime-version :content-transfer-encoding; bh=2pn39KkVksUL+iFLO9elxDTqG5Sub4NnKqvPOvHSVT8=; b=SwfFnCfACjCfl4UTlRVMgRdsBm5xsnotKSlm+az3jzlqfvbq2nfGDsRuUnwLffuy/t D+NP7xbxoXlCJFJAsNSbMFl5uZ9kKVlusIaGoFRwdj66g54NmMkVOlgIzrcOUzagyM+R hunB5WJPi2c67qNWSf6NeGmLOyt/KH3aVLFpnQKxuvEaG/VsMnRI3Kullf4eSxcHesAP u0SdYF1zJtqgwNaryIWW+NhX8YfngOjyM7fXIMYhQFdqMFvla8gY4XtJd1hHt6XI1/4c sVss3TWBXQKBigH+txA1zWe3Sw3TteLj/dsXU3KQKAaHWJyEFuV1Nk0G5IurzCvPCped vHVw== X-Gm-Message-State: APjAAAUsHwDtWX1R7Xwf8xRaM9tL4Acl9w6FyUWqm/veZEk7iN2TBCSa 2MgTGOD+03wBCbU36g+PY4I/tZms6hs= X-Google-Smtp-Source: APXvYqxyUzMs3so2QY44JZQSPbZqbSfQbkXMWzSi0dju1zIqYJoMU9ANCkrcVQyFbn9z8rXALJA8Vg== X-Received: by 2002:a62:1385:: with SMTP id 5mr52422563pft.221.1555015635988; Thu, 11 Apr 2019 13:47:15 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id d3sm59171142pfn.113.2019.04.11.13.47.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Apr 2019 13:47:15 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 12 Apr 2019 08:47:04 +1200 Message-Id: <20190411204705.5393-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Cc: Tom Rini , Maxime Ripard , Michal Simek , Chen-Yu Tsai , Chris Packham , Stefan Roese , Chris Packham , Marek Vasut Subject: [U-Boot] [PATCH v2 1/2] ARM: mvebu: rename armada-385-amc.dts to armada-385-db-88f6820-amc.dts X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This board was added to u-boot first but the Linux maintainers requested a more descriptive name. Rename the file to match the Linux usage and update the board defconfig. Signed-off-by: Chris Packham --- Changes in v2: - rebase against u-boot-marvell/master arch/arm/dts/Makefile | 2 +- .../dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} | 0 configs/db-88f6820-amc_defconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7704dfb81334..4f661552b0a6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -140,7 +140,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-clearfog.dtb \ armada-388-gp.dtb \ armada-388-helios4.dtb \ - armada-385-amc.dtb \ + armada-385-db-88f6820-amc.dtb \ armada-385-turris-omnia.dtb \ armada-7040-db.dtb \ armada-7040-db-nand.dtb \ diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-db-88f6820-amc.dts similarity index 100% rename from arch/arm/dts/armada-385-amc.dts rename to arch/arm/dts/armada-385-db-88f6820-amc.dts diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index dcf2a25395e2..e8ba5184c4d7 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -41,7 +41,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" +CONFIG_DEFAULT_DEVICE_TREE="armada-385-db-88f6820-amc" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_USE_ENV_SPI_MAX_HZ=y CONFIG_ENV_SPI_MAX_HZ=50000000 From patchwork Thu Apr 11 20:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1084280 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BgL4ximH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gCpg3RTwz9s4Y for ; Fri, 12 Apr 2019 06:50:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 197C1C21E16; Thu, 11 Apr 2019 20:50:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2D440C21CB6; Thu, 11 Apr 2019 20:47:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3522EC21DEC; Thu, 11 Apr 2019 20:47:22 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by lists.denx.de (Postfix) with ESMTPS id B1741C21CB6 for ; Thu, 11 Apr 2019 20:47:20 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id f6so4059718pgs.8 for ; Thu, 11 Apr 2019 13:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o0MrfMcxKS59ft5mo/qc4Sqg6nvuD7eVmo7asESvuPY=; b=BgL4ximHY60m2GLksPAfQSzW/vZRMCs0LnoOYr4WYFNI2ENMaEzsVDC9vtPBsOCR3e NHH7DK7AELi5uHKmZZoOoABGnlDuOLIvSlmIow0Aiqa+gx8XaK9QBv87u7E+dmLMvlgJ 9NrVvEUJgoRbZG+SyEAeBuUQ98TYqCIStmW9d3YkOGuBSpRm1Pjd581PDpb4GWiTZtTn FVGmK44rQrLLMOx/dlpU655Bz1hlnXCgex8I1VXgY0Xyl84BZTMuNdZQGcK7D0d+9oLj WI9sMjHDBq9KkjztOR2PPfFGnr3B3ojPKJ2SaI5Dt4DZ1NA71HZlNIe0+GFeRbWv1wL0 o9FA== 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:mime-version:content-transfer-encoding; bh=o0MrfMcxKS59ft5mo/qc4Sqg6nvuD7eVmo7asESvuPY=; b=Dbie1QsrvSDGDFGNkmzQXlOB9FTuPVGm7uvNdHwS1XcGeyWjcaStmSgueM7pgvyv1u xeTDjYBnMSQ57HF3qgm2ATpvqeTZIBEO7WYE5XB35hZTUhMpNTfR989QX2LejZwO2KIM MehLzPfmweStoL28Z6x5gpR7Afhq7d/GP2EWVPakl6CRgi3SfWBe7efWPYh1F/AwnYVY NiiIXi9/VWnLou9rcA8OcXlW9DZtXldkcGGzO399I74i57y4h+OOvvv5AuL21N11FAwR lOB1jaLbCJDk4eQj5mPCxnC9/qmVuiG7izvYBki/+wpze+4SzCO8AYcSCW8V5oKLaYJC d+lQ== X-Gm-Message-State: APjAAAU7CO0v16clfYC/h0J5ZrBHBu5T+0GmQx4ICxu9nwRxbd3BNBw+ GFrSvLi+vYTelMSgbp5sftx7xcyLmts= X-Google-Smtp-Source: APXvYqyY4Hkqi3q3K3/Dn6Ri0sc7SV5b+5tQrPKs47kq++1/cT2Jc/OoEYLkHCf4BekDZGTI7H5kbw== X-Received: by 2002:a63:fb4d:: with SMTP id w13mr23028583pgj.397.1555015638927; Thu, 11 Apr 2019 13:47:18 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id d3sm59171142pfn.113.2019.04.11.13.47.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Apr 2019 13:47:18 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 12 Apr 2019 08:47:05 +1200 Message-Id: <20190411204705.5393-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190411204705.5393-1-judge.packham@gmail.com> References: <20190411204705.5393-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v2 2/2] ARM: mvebu: sync db-88f6820-amc.dts with Linux v5.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Sync armada-385-db-88f6820-amc.dts with Linux. Retain the u-boot,dm-pre-reloc and nand differences. Signed-off-by: Chris Packham --- Changes in v2: - rebase against u-boot-marvell/master arch/arm/dts/armada-385-db-88f6820-amc.dts | 184 +++++++++------------ 1 file changed, 82 insertions(+), 102 deletions(-) diff --git a/arch/arm/dts/armada-385-db-88f6820-amc.dts b/arch/arm/dts/armada-385-db-88f6820-amc.dts index c9ccbb57fff5..59a425f6b155 100644 --- a/arch/arm/dts/armada-385-db-88f6820-amc.dts +++ b/arch/arm/dts/armada-385-db-88f6820-amc.dts @@ -1,51 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) /* - * Device Tree file for Marvell Armada 385 development board + * Device Tree file for Marvell Armada 385 AMC board * (DB-88F6820-AMC) * - * Copyright (C) 2014 Marvell - * - * Gregory CLEMENT - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without - * any warranty of any kind, whether express or implied. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright (C) 2017 Allied Telesis Labs */ /dts-v1/; #include "armada-385.dtsi" + #include / { model = "Marvell Armada 385 AMC"; - compatible = "marvell,a385-amc", "marvell,armada385", "marvell,armada380"; + compatible = "marvell,a385-db-amc", "marvell,armada385", "marvell,armada380"; chosen { stdout-path = "serial0:115200n8"; @@ -60,90 +28,88 @@ memory { device_type = "memory"; - reg = <0x00000000 0x80000000>; /* 2 GB */ + reg = <0x00000000 0x80000000>; /* 2GB */ }; soc { ranges = ; + }; +}; - internal-regs { - i2c@11000 { - clock-frequency = <100000>; - u-boot,i2c-slave-addr = <0x0>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; - status = "okay"; - }; - - serial@12000 { - /* - * Exported on the micro USB connector CON16 - * through an FTDI - */ +&i2c0 { + u-boot,i2c-slave-addr = <0x0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; +}; - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins>; - status = "okay"; - u-boot,dm-pre-reloc; - }; +&uart0 { + /* + * Exported on the micro USB connector CON3 + * through an FTDI + */ - ethernet@34000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "sgmii"; - }; + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + status = "okay"; + u-boot,dm-pre-reloc; +}; - usb@58000 { - status = "okay"; - }; - ethernet@70000 { - pinctrl-names = "default"; - /* - * The Reference Clock 0 is used to provide a - * clock to the PHY - */ - pinctrl-0 = <&ge0_rgmii_pins>, <&ref_clk0_pins>; - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; +ð0 { + pinctrl-names = "default"; + /* + * The Reference Clock 0 is used to provide a + * clock to the PHY + */ + pinctrl-0 = <&ge0_rgmii_pins>, <&ref_clk0_pins>; + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; +}; +ð2 { + status = "okay"; + phy = <&phy1>; + phy-mode = "sgmii"; +}; - mdio@72004 { - pinctrl-names = "default"; - pinctrl-0 = <&mdio_pins>; +&usb0 { + status = "okay"; +}; - phy0: ethernet-phy@1 { - reg = <1>; - }; - phy1: ethernet-phy@0 { - reg = <0>; - }; - }; - flash@d0000 { - status = "okay"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - }; - }; +&mdio { + pinctrl-names = "default"; + pinctrl-0 = <&mdio_pins>; - pcie { - status = "okay"; - pcie@1,0 { - /* Port 0, Lane 0 */ - status = "okay"; - }; + phy0: ethernet-phy@1 { + reg = <1>; + }; - }; + phy1: ethernet-phy@0 { + reg = <0>; }; }; +&nand_controller { + status = "okay"; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; +}; + +&pciec { + status = "okay"; +}; + +&pcie1 { + /* Port 0, Lane 0 */ + status = "okay"; +}; + &spi1 { pinctrl-names = "default"; pinctrl-0 = <&spi1_pins>; @@ -154,10 +120,24 @@ u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; - compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + compatible = "jedec,spi-nor"; reg = <0>; /* Chip select 0 */ spi-max-frequency = <50000000>; m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + partition@0 { + reg = <0x00000000 0x00100000>; + label = "u-boot"; + }; + partition@100000 { + reg = <0x00100000 0x00040000>; + label = "u-boot-env"; + }; + }; }; };