From patchwork Thu May 25 19:35:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 767095 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wYfgN0QC5z9s86 for ; Fri, 26 May 2017 05:37:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OAdwELkJ"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id BD66AC21CC8; Thu, 25 May 2017 19:36:52 +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_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 EE57BC21CDD; Thu, 25 May 2017 19:36:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 558BFC21D02; Thu, 25 May 2017 19:36:00 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id C247CC21CA5 for ; Thu, 25 May 2017 19:35:56 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id f27so41109221pfe.0 for ; Thu, 25 May 2017 12:35:56 -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; bh=aSuLPnQNkRzFR5/So3PAplD3ZNtVOH9syNYKDrWENJc=; b=OAdwELkJd3eTWWx5fpyhyk1fpVeu4uKwLFwvEOYg1WH2aiPAUfdjXoRGVJ2tmrThdT 4AXKrSdfrE0JN9Fj8+POgbhV2alMMiHEw6iA2AouFagAW6u07+qP0sqK1f98pRe3tgjp BYUPEygNEQVphOTXQ7xJBUjGAxF9HIbOavr7UmjYKzAozzwtsCGr0d8EUl6F2+l9kzAZ 2c99U2eNN7kSWrIeeKP3w0VssPHk/XeG8RPidUlPPYdcXCoSq9VPg4YjkYZeeZ/a74Jf orUMQZdG6wC3h0bZmjJkZa/lXwM3+C0rvs5MHPkwohx4j5cD45BAI9inTHQXvAv5Dv1R Rj1g== 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=aSuLPnQNkRzFR5/So3PAplD3ZNtVOH9syNYKDrWENJc=; b=VBIt3G43wWMQYwFH2CVm8qUDF8RF7ePWj1om7ZP/pVk0ShvpsUhErlzsu952dMjy4D MCi8fQ72wPu0dlKqvDqhxl082PywzJ8ZDRXc33AyYw0ZZXpBDTmDltqB8EHPTiPVH90/ /PS5qcZA5CYjg51wyTLj76JjgCv6k5UIZblFzFgQyDjvpLh9GjcAFHdyFy0SoZTOGmW1 65+PDSraWS7zOr1d8L27Xd1m64+LRVq7mMeGaV6IgIuiUP1CN3GhhK+Hu0z8OJkJLdpy E4ZxBLZczNE8J1XuVPR62Io0bG4I6ZxAfWF1RzPUUghSaEsoZtMEY2dcNYyDo0Cts2tY Y/gw== X-Gm-Message-State: AODbwcA9TU+H3W2+yT8h2/7Rvpnb9L4v7SCkJCs5HVTMUzrdHJBDlWwF UY70Bs1T846CDA== X-Received: by 10.98.40.198 with SMTP id o189mr47615195pfo.238.1495740955400; Thu, 25 May 2017 12:35:55 -0700 (PDT) Received: from localhost.localdomain ([117.254.77.186]) by smtp.gmail.com with ESMTPSA id a28sm10559296pgd.37.2017.05.25.12.35.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 12:35:53 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Maxime Ripard Date: Fri, 26 May 2017 01:05:08 +0530 Message-Id: <1495740911-9455-3-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495740911-9455-1-git-send-email-jteki@openedev.com> References: <1495740911-9455-1-git-send-email-jteki@openedev.com> Cc: Andre Przywara , u-boot@lists.denx.de, zhaoyifan Subject: [U-Boot] [PATCH 2/5] arm64: dts: sun50i: Add sun50i-h5.dtsi 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jagan Teki The Allwinner H5 SoC is pin-compatible to the H3 SoC, but uses Cortex-A53 cores instead. So move the shared cpu based and peripherals nodes into sun50i-h5.dtsi so, that it can shared among the sun50i-h5 board dts files. Signed-off-by: Jagan Teki --- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 34 +------------- arch/arm/dts/sun50i-h5.dtsi | 79 +++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 33 deletions(-) create mode 100644 arch/arm/dts/sun50i-h5.dtsi diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts index de60f78..81594e6 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts @@ -42,40 +42,12 @@ /dts-v1/; -#include "sun8i-h3.dtsi" +#include "sun50i-h5.dtsi" / { model = "OrangePi PC 2"; compatible = "xunlong,orangepi-pc-2", "allwinner,sun50i-h5"; - cpus { - cpu@0 { - compatible = "arm,cortex-a53", "arm,armv8"; - enable-method = "psci"; - }; - cpu@1 { - compatible = "arm,cortex-a53", "arm,armv8"; - enable-method = "psci"; - }; - cpu@2 { - compatible = "arm,cortex-a53", "arm,armv8"; - enable-method = "psci"; - }; - cpu@3 { - compatible = "arm,cortex-a53", "arm,armv8"; - enable-method = "psci"; - }; - }; - - psci { - compatible = "arm,psci-0.2"; - method = "smc"; - }; - - timer { - compatible = "arm,armv8-timer"; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -99,10 +71,6 @@ }; }; -&gic { - compatible = "arm,gic-400"; -}; - &mmc0 { compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc", diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi new file mode 100644 index 0000000..df76a07 --- /dev/null +++ b/arch/arm/dts/sun50i-h5.dtsi @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2016 ARM Ltd. + * + * 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 library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + */ + +/dts-v1/; + +#include "sun8i-h3.dtsi" + +/ { + cpus { + cpu@0 { + compatible = "arm,cortex-a53", "arm,armv8"; + enable-method = "psci"; + }; + cpu@1 { + compatible = "arm,cortex-a53", "arm,armv8"; + enable-method = "psci"; + }; + cpu@2 { + compatible = "arm,cortex-a53", "arm,armv8"; + enable-method = "psci"; + }; + cpu@3 { + compatible = "arm,cortex-a53", "arm,armv8"; + enable-method = "psci"; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + timer { + compatible = "arm,armv8-timer"; + }; +}; + +&gic { + compatible = "arm,gic-400"; +};