From patchwork Tue Mar 14 12:47:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayachandran C X-Patchwork-Id: 9623141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1ED5660492 for ; Tue, 14 Mar 2017 12:49:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D5992853E for ; Tue, 14 Mar 2017 12:49:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 021BD28547; Tue, 14 Mar 2017 12:49:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1774028544 for ; Tue, 14 Mar 2017 12:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HpPMDWEtZD4sNHtm9DMaC3/nk14F1UIMCYg2vbuQcxU=; b=iUlfMYXED78AxK 33iNIfkYcw18QQESG7W0Dk6cRFnXkAik0JkqaoprJOqgjM1fm3+C4EAwBhAe6uSQTwjhl7GPD9wwd 49PqihM5yaAsfvkXZSJbXqnv/RL7kNQZThSBh9g85Irggu+NQHFdkpMf12s9woCm/f02ksjVdEwCn 9ZgIXnKVcfg/CuAMMzmUSVlMk+sueyeq402zR1sTUT29Kq1OR8Iy/wgcyDhf6FnUMrOvRGtfzGiCJ LQuEia8LwnWi2fesWVkIpB0R8t1pnhHpaj97I/oYqTc4L6Wg74HAr1hUvZRAHjMO0m4LYnvldfaAK ZwY73GnQCkhBRrgoeItA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cnltH-0005c7-9J; Tue, 14 Mar 2017 12:49:27 +0000 Received: from mail-sn1nam01on0072.outbound.protection.outlook.com ([104.47.32.72] helo=NAM01-SN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cnlrx-0004xe-St for linux-arm-kernel@lists.infradead.org; Tue, 14 Mar 2017 12:48:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=F9RJndAmV5BN8xCBYBYoevDDcph6tUgDJpvMiOYWMyI=; b=GvaS5ZJ92O8neklk7G1TGjofPCGE79au/kX1NSINnc9Jn+KxB6QsLWEgu3G04IApnPLd4/mC8ywGnRK3mYy2biED4wmVvYYkTolbHe7oY/WneZcuYA8ty02VGyx+4DjqSwWpxADPK5AlxUdDHCFb24nzQ2vTDNPPMU455A6K5Tg= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from vulcan.caveonetworks.com (50.233.148.156) by CY4PR07MB2998.namprd07.prod.outlook.com (10.172.116.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Tue, 14 Mar 2017 12:47:40 +0000 From: Jayachandran C To: arm@kernel.org Subject: [PATCH v6 2/2] arm64: dts: move from ARCH_VULCAN to ARCH_THUNDER2 Date: Tue, 14 Mar 2017 12:47:14 +0000 Message-Id: <1489495634-2920-3-git-send-email-jnair@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489495634-2920-1-git-send-email-jnair@caviumnetworks.com> References: <1489313015-4783-1-git-send-email-jnair@caviumnetworks.com> <1489495634-2920-1-git-send-email-jnair@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR10CA0058.namprd10.prod.outlook.com (10.169.238.20) To CY4PR07MB2998.namprd07.prod.outlook.com (10.172.116.12) X-MS-Office365-Filtering-Correlation-Id: 462f706f-c415-4cd6-c5aa-08d46ad84da8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR07MB2998; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 3:6bBpjWBnpeaIdE46fekHHa6E614XUALFkM/3+n+HEzigtxvvz3vyOPAGmzT4s/9wUje0VDSrsTM0LfX45XH6jaS4Jg0K7EpU5SO41yT0tk2xoXuCKIIR97qexgvXDVR0csBoEUJKtVyTk6U4CVnvUFn8+lcgPAjgFNQFGrSLSFq3rk2Oifqkv1gafM/EzFsN8alNaD64pwahZfCLX68FWZF5Ij9IMstHR3dUXHMk7VODpoSBo5OwVGr9k09KnyanG2EqeRQGsXAg0wlx4i7vpQ==; 25:StKpj/488OrcJYV0UWcrW6uBQXGRQT1Z8OwnFKIKTCKCGszItX4s9eqMCkxfuUQQCouByt9RibyCJmpUn38MjZs+veh0b+zUoCN/34xNqblbu86wLeDZCyODauDG+hXT3vitZTKSVqjngYvAfaVA5Sf1muG1VsGTz5Kw/iMVyMKsKCUeCRwTGunCpXPt7W/z5Gw1/uLcYlQxbXIW/Ol8LSyqMb+Gl1Nc22TaFRB7DUNchOTJcafRoyn+Z8wprnVzTZ304fePciXk+z7PthjWbsJRuMHx/4tprD+AbRCCeYrSsLYH/mxyoFxy3SiB/7HZsN2T2tEDKoC0dCq905iidclIWwueYOl6wGcFfniIk51t+ZmHJjoQ5NDcIVx62hNRHOjCqAHTBfvkKRAYfJcwgualU1OZ6jMYG+r9iWf1ED9EA1McR9tcqvGBO7FTHbJJwod3jtEnFQKtFSzaw141fQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 31:u9bhcdLIpSQiXpjMt/YpDcNJdTrMem0u7sIJg5lGWm5dt+eH3WfhR/2R9HJ/0WdMzLGxzfQYgnkr8fG4e2o9MqyWevFfLJ5mQ4lsWKsp56W4eCNE0OVrsnNT4cLJVVh/JoiFeGdxD1EioQmn1OSVoDMXJH0MGlHX9yzlTGDqhp9lAH5MZGIC8EnlrSMdbgbU9hDh45/52whmPLpIJVGuYXatPoMzL1cxLUSmifzKjio=; 20:GBIksqoYqnDFf5vDZ5pjwrl7LuWawHnJx3ldyxTH/I4CUCyTWxTAutWkVoSZy2fBfXSRzvjgEBareT5pAyUW5lM8LS0l/C8lZzhBlzD9tqyfcTisAakcy8BQKs0JmHHQ68mSpg+XpFx+qWdhi1dBqvZGGiTdd5zwCw6N8jNWUdFizfAja/8sTDCEkqzu3jC840mavomtnbPliyHIiijNQTVugYBZo3RbbL6Oh+KnKElLxitPTgu+ImYFVtiq5JdgIRuGC79B7305w3hRe5D6XFG+BYZurmGzH0GtTKIqx/q69asXR8MFf5NczJiPuByLLDZhvC5jFeW1Ea5A0qxqmEULpnFlmwrsQb/I9VsQc2vRgAWLfI2loI9nWNdMqtx2BB42PhodSQ/XDaxYODMyPjsE2jbe8W8Y94tArkmk3OnZ5/s3R4DaeieqCOFVQqDAD1KnvZHHkNVGC12u3pa6WND7Z3pMRipDmlytUpPgf8bo/z4nGTgWhbtWYTCtu9BtkAQ0A/EK+RkJXMZSlwoL17+LOjl6nXA82jvKd8JCtcbQmj2FANhX6SzJEqSRSrHJphgpURr9B9gQVBOKJSv8tYYEQct2kATkEhcFzXyEhA4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123558025)(20161123562025)(20161123560025)(20161123564025)(6072148); SRVR:CY4PR07MB2998; BCL:0; PCL:0; RULEID:; SRVR:CY4PR07MB2998; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 4:fD6hKi8pwBV5n7Qq4T7GCtE8PJbV2+BMlg2f7cPveN9fEMDu+FG16Bi+9RS7qn2Em7cE912B56IQ6fjf9ncYC9+6JNSIdP+gJxxV/usgfz50U0VJNHpv6VjTB3zGvrBH4RX7BSF9V9i6Va4RzM1gVRaLnc+ml5TIqbQn1UzmT+bCIbdw/wnckOc43jxRU2hFwhbevZeBGoG0X2HwpRP2alHuyhnCryyMGcu0ehdVE/fspZo7/0chbCvYiKf2KIrtWp2kkVMSleYtmC1xyl1Lm4k0IBVopbCgqAx11DEmOtTXvwtnBp4700d17Q6y5auoGTNgiV7KdiVHrvwiPw6Frggslz0bwnOrFKXlbs0SDeSGj4e9iqLmi8kingWwimssME5xJsq7bmTkJtOgXZurR5ohn1U4UxAmDMeoLZg3QMnU1ygfKcW/GD6ImSDsKd6mMMroueZlI6EYFVr6IGtPsTHbdYTE6Ym9p7M+x1EhEE/EYMftnn6IZtqkNSP0Nm14l7ZsJB/iP7+V0Lj/87PBbKqcnbGrGA7ppfOc46UQc3UE7fVDWdDfU8bIqFrIY6oD4VqeU8WgdmKsK6DSxDRuOu6wDZS0HQkGYOxHarhBe+8= X-Forefront-PRVS: 02462830BE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39450400003)(81166006)(76176999)(6512007)(6666003)(6486002)(5660300001)(6506006)(6916009)(189998001)(305945005)(8676002)(7736002)(42882006)(50226002)(2950100002)(50986999)(47776003)(2351001)(53416004)(53936002)(54906002)(2361001)(110136004)(25786008)(4326008)(38730400002)(48376002)(2906002)(42186005)(33646002)(66066001)(3846002)(36756003)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB2998; H:vulcan.caveonetworks.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 23:YlNoafq/YtFsHiTdeV4wP3TdsiSbu8RlMRgGyYmSmlbgSZoAb3qwlmWKLiKZyjpT6lIt0tBbj3qTz9uLd+4gY+FeeEfoqbHOceGLz3PX13H8jtsO2MlqmXjaa70cT+3RbHtMqOHlHumAm7JTJbfLS7LRYlBhXLAzqVvnQDPJ+RrTpoptMsu/mKuGpALbuxxz2PjgeHkWBGLctrMJQfBYqD1vFTXxJvUyre+mqFPgLgLcZ0l3lVXqiZM2OHvSelJ3bMmHduKhWBVajkeRdubMhKbcm3s4YaBJh2PVOyDuxYHnQrVddxSj7Ckv5Q72vyZXCsg3IM54LQLoAnYiRH2a1bH1I7iWVQwux3jjTJxf/p0Q65JHsSV7jXTokrTucwNPj7DwY38xb1Rbigv0WgcIQN0qGzcOZF9MqoKGJvk3jRdhjjnF/dmqY5O39gZ+5vqsc9RKiOsLtuOjY4go1I6pXyK1ynirYDHft6vDCRhiFtHU8TJAPqLh3VidfE2ciJYfagrStJ58CGPKvJQAS/CUOgJdZAGCDx4R5iNYHH21ZXdtMIpmfD5IBwEZWoEyNpZTCEMuvYFQwfPJjIgdmPsYP3ekYBAy972bQV7nWHFd3LBAZXJi5KQ56APLZzaJlYK38XHUTT1GnNswCar6ESHONcqr0QsIqesQD/e+7mjQTUMQ1+68S5Xy/w1FTriB1U5zEsEgmT48UcTHgqovNwUjlGWa34m2HPZ+pbe26njlM13ry/jFb4Y8dmGPFRd4wlpKZVwvoNybDSEaBrcU+F7kpLunq/7E9yJ29k7mhA8Il4NLmtlCboZIII6fEMyfcr2qjBEks3mkjysl5GOU1tEPpm4e6L4wrEeQNac4Q4Phs2rlIBCria9q6mjLaq5VCsGT9HuapkWzDGE6+s/SDgbBvE4sAwmfhT8n9QbUqJ8gRmk= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 6:wT8FMMxAbsknBcy+HN5oVIZPhQGLciB+YoGqUls+SP6VWviwAvGQc8kQqNunVkcuThzpNx1ePptuPILbCUcSYggQMqRKUqbn/iaDZlLO9HvxUA0rDXYJtbSvK9bioOk079rbBoIYBdt6eZbEvp3+bio2p8nflPEy+hzfhhKfQtWezxAMDmjk2CX8IS0RTfVy1qLnF4xFo03sUpd9XzDQwGFs51hrxjlC1FeoONHLkAbBbt705RuSaWevJ8nV6/SJmdwigv+gYniO0cL/IEQu5K0RdmzfsVFNhKamTT7XACjuOe4cs+iKxRw6sWQH2rbCjIybOl7PJdrGyejdLrQH5uecvlU51O6sDsCBgFCEtvmofNZ8//Yl8/ocNfR2bfLVQ6nK1vqWiHRI9BEbcMj8fA==; 5:6pljpEk/wbn92ve4FgDT1YgCzsr8HWRu/9jPtRKTQl4ELGPL11ydjFgQxKy1xIUNGsI0f2T+8ZuoaxEx8AWj8sbT2VC5jVjawcpYuLpE/ioWdNf84Krf9gnjRN00oeXwc9ZnWCuib9B9NZG2mxwCaQ==; 24:E8Xh5uqkwumfQAaAVPWxAhD9IrHXYipHlSywj1OjO28mTdOlBIEnapXILHtTBfkKa+PWlG6+9RbocKBJ0o0fBDOGvqp6SoPApka+s893QAE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB2998; 7:/nUiJSMGhXMuS4YFx0dcTYx68/OQr6wtJbTEb5MGeilEX5+HDy560Np/NmT6gcYk/sFmN5inbyaeZJhiOS3dzBM20f6J6655V0+8lS2pQMjt/MXLiyr+yhJ2a/olWdeTEYUwMJLVSVqX4hM/V/DaHxwrWVnz3TLnzN6ywTXNVYnrHL9aH1Yn00DTtK3teLZags4TGJ6YZt7hx6yYB98F6hcl3gXSrpRK6mQImjVtXeHh97ghx6uroQaNDrdFUHx4XR81cYiDrx+QV29bVGETSXSTVSeDH31/owp2IXwSMtBCQ5aXa+/LAbklS0MG81lnxvs1flYkukKguamRtkmVcQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2017 12:47:40.9781 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB2998 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170314_054806_027102_2A3344B2 X-CRM114-Status: GOOD ( 12.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Florian Fainelli , Arnd Bergmann , Rob Herring , Jayachandran C , Matthias Brugger , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move and update device tree files as part of transition from Broadcom Vulcan to Cavium ThunderX2. The changes are to: * rename dts/broadcom/vulcan.dtsi to cavium/thunder2-99xx.dtsi, update cpu cores to be "cavium,thunder2", and update SoC to be "cavium,thunderx2-cn9900" * move SoC dts/broadcom/vulcan-eval.dtsi to cavium/thunder2-99xx.dtsi and update board name string * Update dts/broadcom/Makefile not to build vulcan dtbs * Update dts/cavium/Makefile to build thunder2 dtbs No changes to the dts contents except the updated "compatible" and "model" properties. Signed-off-by: Jayachandran C Reviewed-by: Matthias Brugger Acked-by: Florian Fainelli --- arch/arm64/boot/dts/broadcom/Makefile | 1 - arch/arm64/boot/dts/broadcom/vulcan-eval.dts | 33 ------ arch/arm64/boot/dts/broadcom/vulcan.dtsi | 147 ------------------------- arch/arm64/boot/dts/cavium/Makefile | 1 + arch/arm64/boot/dts/cavium/thunder2-99xx.dts | 34 ++++++ arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 148 ++++++++++++++++++++++++++ 6 files changed, 183 insertions(+), 181 deletions(-) delete mode 100644 arch/arm64/boot/dts/broadcom/vulcan-eval.dts delete mode 100644 arch/arm64/boot/dts/broadcom/vulcan.dtsi create mode 100644 arch/arm64/boot/dts/cavium/thunder2-99xx.dts create mode 100644 arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile index f1caece..bfa8f8e 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -1,6 +1,5 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb ns2-xmc.dtb -dtb-$(CONFIG_ARCH_VULCAN) += vulcan-eval.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/broadcom/vulcan-eval.dts b/arch/arm64/boot/dts/broadcom/vulcan-eval.dts deleted file mode 100644 index 9ee8d3d..0000000 --- a/arch/arm64/boot/dts/broadcom/vulcan-eval.dts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * dts file for Broadcom (BRCM) Vulcan Evaluation Platform - * - * Copyright (c) 2013-2016 Broadcom - * - * This program 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. - */ - -/dts-v1/; - -#include "vulcan.dtsi" - -/ { - model = "Broadcom Vulcan Eval Platform"; - compatible = "brcm,vulcan-eval", "brcm,vulcan-soc"; - - memory { - device_type = "memory"; - reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ - <0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */ - }; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; -}; diff --git a/arch/arm64/boot/dts/broadcom/vulcan.dtsi b/arch/arm64/boot/dts/broadcom/vulcan.dtsi deleted file mode 100644 index 34e11a9..0000000 --- a/arch/arm64/boot/dts/broadcom/vulcan.dtsi +++ /dev/null @@ -1,147 +0,0 @@ -/* - * dtsi file for Broadcom (BRCM) Vulcan processor - * - * Copyright (c) 2013-2016 Broadcom - * Author: Zi Shen Lim - * - * This program 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. - */ - -#include - -/ { - model = "Broadcom Vulcan"; - compatible = "brcm,vulcan-soc"; - interrupt-parent = <&gic>; - #address-cells = <2>; - #size-cells = <2>; - - /* just 4 cpus now, 128 needed in full config */ - cpus { - #address-cells = <0x2>; - #size-cells = <0x0>; - - cpu@0 { - device_type = "cpu"; - compatible = "brcm,vulcan", "arm,armv8"; - reg = <0x0 0x0>; - enable-method = "psci"; - }; - - cpu@1 { - device_type = "cpu"; - compatible = "brcm,vulcan", "arm,armv8"; - reg = <0x0 0x1>; - enable-method = "psci"; - }; - - cpu@2 { - device_type = "cpu"; - compatible = "brcm,vulcan", "arm,armv8"; - reg = <0x0 0x2>; - enable-method = "psci"; - }; - - cpu@3 { - device_type = "cpu"; - compatible = "brcm,vulcan", "arm,armv8"; - reg = <0x0 0x3>; - enable-method = "psci"; - }; - }; - - psci { - compatible = "arm,psci-0.2"; - method = "smc"; - }; - - gic: interrupt-controller@400080000 { - compatible = "arm,gic-v3"; - #interrupt-cells = <3>; - #address-cells = <2>; - #size-cells = <2>; - ranges; - interrupt-controller; - #redistributor-regions = <1>; - reg = <0x04 0x00080000 0x0 0x20000>, /* GICD */ - <0x04 0x01000000 0x0 0x1000000>; /* GICR */ - interrupts = ; - - gicits: gic-its@40010000 { - compatible = "arm,gic-v3-its"; - msi-controller; - reg = <0x04 0x00100000 0x0 0x20000>; /* GIC ITS */ - }; - }; - - timer { - compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; - }; - - pmu { - compatible = "brcm,vulcan-pmu", "arm,armv8-pmuv3"; - interrupts = ; /* PMU overflow */ - }; - - clk125mhz: uart_clk125mhz { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <125000000>; - clock-output-names = "clk125mhz"; - }; - - pci { - compatible = "pci-host-ecam-generic"; - device_type = "pci"; - #interrupt-cells = <1>; - #address-cells = <3>; - #size-cells = <2>; - - /* ECAM at 0x3000_0000 - 0x4000_0000 */ - reg = <0x0 0x30000000 0x0 0x10000000>; - reg-names = "PCI ECAM"; - - /* - * PCI ranges: - * IO no supported - * MEM 0x4000_0000 - 0x6000_0000 - * MEM64 pref 0x40_0000_0000 - 0x60_0000_0000 - */ - ranges = - <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000 - 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = - /* addr pin ic icaddr icintr */ - <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH - 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH - 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH - 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; - msi-parent = <&gicits>; - dma-coherent; - }; - - soc { - compatible = "simple-bus"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - uart0: serial@402020000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x04 0x02020000 0x0 0x1000>; - interrupt-parent = <&gic>; - interrupts = ; - clocks = <&clk125mhz>; - clock-names = "apb_pclk"; - }; - }; - -}; diff --git a/arch/arm64/boot/dts/cavium/Makefile b/arch/arm64/boot/dts/cavium/Makefile index e34f89d..581b2c1 100644 --- a/arch/arm64/boot/dts/cavium/Makefile +++ b/arch/arm64/boot/dts/cavium/Makefile @@ -1,4 +1,5 @@ dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb +dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/cavium/thunder2-99xx.dts b/arch/arm64/boot/dts/cavium/thunder2-99xx.dts new file mode 100644 index 0000000..6c6fb86 --- /dev/null +++ b/arch/arm64/boot/dts/cavium/thunder2-99xx.dts @@ -0,0 +1,34 @@ +/* + * dts file for Cavium ThunderX2 CN99XX Evaluation Platform + * + * Copyright (c) 2017 Cavium Inc. + * Copyright (c) 2013-2016 Broadcom + * + * This program 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. + */ + +/dts-v1/; + +#include "thunder2-99xx.dtsi" + +/ { + model = "Cavium ThunderX2 CN99XX"; + compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ + <0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */ + }; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; diff --git a/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi b/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi new file mode 100644 index 0000000..4220fbd --- /dev/null +++ b/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi @@ -0,0 +1,148 @@ +/* + * dtsi file for Cavium ThunderX2 CN99XX processor + * + * Copyright (c) 2017 Cavium Inc. + * Copyright (c) 2013-2016 Broadcom + * Author: Zi Shen Lim + * + * This program 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. + */ + +#include + +/ { + model = "Cavium ThunderX2 CN99XX"; + compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc"; + interrupt-parent = <&gic>; + #address-cells = <2>; + #size-cells = <2>; + + /* just 4 cpus now, 128 needed in full config */ + cpus { + #address-cells = <0x2>; + #size-cells = <0x0>; + + cpu@0 { + device_type = "cpu"; + compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8"; + reg = <0x0 0x0>; + enable-method = "psci"; + }; + + cpu@1 { + device_type = "cpu"; + compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8"; + reg = <0x0 0x1>; + enable-method = "psci"; + }; + + cpu@2 { + device_type = "cpu"; + compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8"; + reg = <0x0 0x2>; + enable-method = "psci"; + }; + + cpu@3 { + device_type = "cpu"; + compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8"; + reg = <0x0 0x3>; + enable-method = "psci"; + }; + }; + + psci { + compatible = "arm,psci-0.2"; + method = "smc"; + }; + + gic: interrupt-controller@400080000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <3>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + interrupt-controller; + #redistributor-regions = <1>; + reg = <0x04 0x00080000 0x0 0x20000>, /* GICD */ + <0x04 0x01000000 0x0 0x1000000>; /* GICR */ + interrupts = ; + + gicits: gic-its@40010000 { + compatible = "arm,gic-v3-its"; + msi-controller; + reg = <0x04 0x00100000 0x0 0x20000>; /* GIC ITS */ + }; + }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + }; + + pmu { + compatible = "brcm,vulcan-pmu", "arm,armv8-pmuv3"; + interrupts = ; /* PMU overflow */ + }; + + clk125mhz: uart_clk125mhz { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <125000000>; + clock-output-names = "clk125mhz"; + }; + + pci { + compatible = "pci-host-ecam-generic"; + device_type = "pci"; + #interrupt-cells = <1>; + #address-cells = <3>; + #size-cells = <2>; + + /* ECAM at 0x3000_0000 - 0x4000_0000 */ + reg = <0x0 0x30000000 0x0 0x10000000>; + reg-names = "PCI ECAM"; + + /* + * PCI ranges: + * IO no supported + * MEM 0x4000_0000 - 0x6000_0000 + * MEM64 pref 0x40_0000_0000 - 0x60_0000_0000 + */ + ranges = + <0x02000000 0 0x40000000 0 0x40000000 0 0x20000000 + 0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = + /* addr pin ic icaddr icintr */ + <0 0 0 1 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH + 0 0 0 2 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH + 0 0 0 3 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH + 0 0 0 4 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; + msi-parent = <&gicits>; + dma-coherent; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + uart0: serial@402020000 { + compatible = "arm,pl011", "arm,primecell"; + reg = <0x04 0x02020000 0x0 0x1000>; + interrupt-parent = <&gic>; + interrupts = ; + clocks = <&clk125mhz>; + clock-names = "apb_pclk"; + }; + }; + +};