From patchwork Tue May 19 07:03:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pragnesh Patel X-Patchwork-Id: 1293028 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=selector1 header.b=JenrfX4f; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49R6QC51kqz9sPF for ; Tue, 19 May 2020 17:07:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A77DC81D5B; Tue, 19 May 2020 09:05:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="JenrfX4f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C58D81D69; Tue, 19 May 2020 09:05:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::603]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E438C81D5B for ; Tue, 19 May 2020 09:05:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pragnesh.patel@sifive.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B32YQCx6L2oyzW4BCq8xOcUhHS6/uMddgo6+UTxEKrDdN60BT7hze1xdpEEa9wpV2r4WJlG65BcZSDNwRfQ/yA6t+tu9WA+0YkdkIgepTno0rSsL0u4DX9BZvsNxtr5Kvn3f+rMKxlkdy7eObTVFwLphXKUJyT2hbEMvKuBhVtl/tUBJxr8/PZRP2aJMHgN807bwX1fTrh8Z01uwTd7J1UWqKBvcDDMCHOxq03V8zy6p6YKc2KFhEdcg+VrFPphcxpkI7vXvSFreirm0IvEGSDDh7tC+N8hsHE1kmwzHU2NfkEy6xPqhUnumXKQCaeoDtLvKVJ2qb3BUKjCZe8GQCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fOFE6K0bTJ/lTE7nuGIXI495XTass5hlwHXj/ZFT0X4=; b=BS3riTxfaBdpc7/c/sL21kx56Q2dIU6RP1ihG5FttwC+DpFK0ZZu5ri5HJdvxEJTB1VWRXX1xnjJIiHaI3hKixzegmEXcmfvZTh1wka1wEmA4AzZPY8TBYNCuHctLdprzt3JHQfIGT+4NGNAY6UQn+IhMr1LxGu0sU1SZEZQwkEhHfGtMcwMxVjSN68p2yrkCs0pvGwav3aXaUHO1Swtqumf+txuOKLF6nuYQjg8cCar8bIBRMlT2dHqx81TDOKmFdTvbubuXEOpVbGjuxPHmX3CD3SvwqPhlmsy6yzknlynTxgXln7a3DIptTCjO/5GYESE8RzuM05LmwbpNl0cgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sifive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fOFE6K0bTJ/lTE7nuGIXI495XTass5hlwHXj/ZFT0X4=; b=JenrfX4f+NmKeJ9TwHgkO+wVCHkiZG0MwtMLAqlJlMe8vJKmS89ygnr5QSg85WYcOWLuCrrUecjkakjeYR5QKyfLbtuhrMOQ5xryN86OyfU6vVowfK5cLxMnxyJ8bhKdkYoO4IuMkAClPTIkI5t3Y0vnMFnwHcR26ur0ggRXmck= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=sifive.com; Received: from MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) by MN2PR13MB3343.namprd13.prod.outlook.com (2603:10b6:208:161::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.12; Tue, 19 May 2020 07:05:05 +0000 Received: from MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::e50d:b981:362f:58ed]) by MN2PR13MB2797.namprd13.prod.outlook.com ([fe80::e50d:b981:362f:58ed%5]) with mapi id 15.20.2937.040; Tue, 19 May 2020 07:05:05 +0000 From: Pragnesh Patel To: u-boot@lists.denx.de Cc: atish.patra@wdc.com, palmerdabbelt@google.com, bmeng.cn@gmail.com, paul.walmsley@sifive.com, jagan@amarulasolutions.com, anup.patel@wdc.com, sagar.kadam@sifive.com, rick@andestech.com, Pragnesh Patel Subject: [PATCH v11 12/18] riscv: dts: sifive: Sync hifive-unleashed-a00 dts from linux Date: Tue, 19 May 2020 12:33:37 +0530 Message-Id: <20200519070346.24479-13-pragnesh.patel@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200519070346.24479-1-pragnesh.patel@sifive.com> References: <20200519070346.24479-1-pragnesh.patel@sifive.com> X-ClientProxiedBy: LNXP265CA0025.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5c::13) To MN2PR13MB2797.namprd13.prod.outlook.com (2603:10b6:208:f2::30) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sachinj2-OptiPlex-7010.open-silicon.com (114.143.65.226) by LNXP265CA0025.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20 via Frontend Transport; Tue, 19 May 2020 07:05:02 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [114.143.65.226] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78fa11a6-2ec2-430c-a13a-08d7fbc2f53c X-MS-TrafficTypeDiagnostic: MN2PR13MB3343: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:68; X-Forefront-PRVS: 040866B734 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eBR/pwIzjUuSOuwv22kRBOGXNGzTCQ+seKh1wtEAjUQgsevhR+Nu6EPl1ZGp7DX6vs+IksyBVWPO0I4KAzONhe5sJHbiRJrVan2d8xElDkUqROouY/H2MAQg683Pcx8LGvi6ZbRARgjgfKxSdmVqAXIf7hISL7hFzqCxVvolNpW/wvyCtMjBd0B8kR9imVsfS+zJmtUuQ3EOJvveOMoiddOlMZ2e6pultd+bqZMBAcdc73cgUyGRFyMQII1GB8F9vf0Hx7WNYu00Bux8UFg6FGHHozpXt9v3+vdO5EUISceMtNiTx5xzWuyYzd7N4ICO5GD8a2t4cJQGsTiefHEjIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR13MB2797.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(39850400004)(376002)(346002)(396003)(366004)(136003)(8936002)(16526019)(186003)(5660300002)(8676002)(2906002)(44832011)(86362001)(66946007)(6916009)(2616005)(956004)(6486002)(6512007)(66556008)(66476007)(107886003)(6506007)(6666004)(478600001)(316002)(1006002)(52116002)(36756003)(26005)(4326008)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 4wDuE+TdzFNdnhf8rwxqVPiRQtNooFUj0h7OAK92/HRzJMgQ5t66MOHd87LciQIi6Vaz2q2iq7mL7MU4oy74WIJr6uJUlkT9Y+h0d0biAFoQAWKsNCktTZVUHiLgLo7B/DpgmwVD5d1mvQeMWSNUA/klGHMtHCPQiDTSBmcnGHdp2RYIEPwB/fNysfNlLa3iUu2GRT0aJj8VjI7mVwhmso41y01f83pNg6jnxcosEtUf+ZwNEy3/SDWkfN+NVSviK5KAxfCnPa2UiLWKmtpBoBbcSxZpyaAKr3LqgxCQtyTk7NdiCNL2tZJbvCLUciy7c+Px9v9xfP5n1TfVkTB0zH4QVzWKd6j6CjdwlXuMYAot2S2VHNrSToykaT2mLVZAoCsvyll613PieCHL/4dWAL/D/S7zreO8R6NAbdTUDna2ntekk8kU5LOSYl2XgbG+eGH/qjgIBjoX/tGd5x8+dKzxinbnJtvCw8uojpgJeq4= X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78fa11a6-2ec2-430c-a13a-08d7fbc2f53c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2020 07:05:05.5961 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fQV6o1Y4JWyl/lsZqWKCr+Lhk/LrGas9g1aL06WvUbproGZ6MlTzvQvzGrwEU8GtEr51oBidPaokpFbZbv8Hr9S70LemLHQvKuqzujv5CnE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB3343 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean This sync has changes required to use GPIO in U-Boot and U-Boot SPL. Sync dts from linux v5.7-rc2 commit: "riscv: dts: Add GPIO reboot method to HiFive Unleashed DTS file" (sha1: 0a91330b2af9f71ceeeed483f92774182b58f6d9) Signed-off-by: Pragnesh Patel Reviewed-by: Bin Meng Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- arch/riscv/dts/fu540-c000.dtsi | 37 ++++++++++++++++++++++++- arch/riscv/dts/hifive-unleashed-a00.dts | 9 ++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/arch/riscv/dts/fu540-c000.dtsi b/arch/riscv/dts/fu540-c000.dtsi index afa43c7ea3..7db8610534 100644 --- a/arch/riscv/dts/fu540-c000.dtsi +++ b/arch/riscv/dts/fu540-c000.dtsi @@ -54,6 +54,7 @@ reg = <1>; riscv,isa = "rv64imafdc"; tlb-split; + next-level-cache = <&l2cache>; cpu1_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc"; @@ -77,6 +78,7 @@ reg = <2>; riscv,isa = "rv64imafdc"; tlb-split; + next-level-cache = <&l2cache>; cpu2_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc"; @@ -100,6 +102,7 @@ reg = <3>; riscv,isa = "rv64imafdc"; tlb-split; + next-level-cache = <&l2cache>; cpu3_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc"; @@ -123,6 +126,7 @@ reg = <4>; riscv,isa = "rv64imafdc"; tlb-split; + next-level-cache = <&l2cache>; cpu4_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc"; @@ -162,6 +166,13 @@ clocks = <&prci PRCI_CLK_TLCLK>; status = "disabled"; }; + dma: dma@3000000 { + compatible = "sifive,fu540-c000-pdma"; + reg = <0x0 0x3000000 0x0 0x8000>; + interrupt-parent = <&plic0>; + interrupts = <23 24 25 26 27 28 29 30>; + #dma-cells = <1>; + }; uart1: serial@10011000 { compatible = "sifive,fu540-c000-uart", "sifive,uart0"; reg = <0x0 0x10011000 0x0 0x1000>; @@ -246,6 +257,30 @@ #pwm-cells = <3>; status = "disabled"; }; - + l2cache: cache-controller@2010000 { + compatible = "sifive,fu540-c000-ccache", "cache"; + cache-block-size = <64>; + cache-level = <2>; + cache-sets = <1024>; + cache-size = <2097152>; + cache-unified; + interrupt-parent = <&plic0>; + interrupts = <1 2 3>; + reg = <0x0 0x2010000 0x0 0x1000>; + }; + gpio: gpio@10060000 { + compatible = "sifive,fu540-c000-gpio", "sifive,gpio0"; + interrupt-parent = <&plic0>; + interrupts = <7>, <8>, <9>, <10>, <11>, <12>, <13>, + <14>, <15>, <16>, <17>, <18>, <19>, <20>, + <21>, <22>; + reg = <0x0 0x10060000 0x0 0x1000>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + clocks = <&prci PRCI_CLK_TLCLK>; + status = "disabled"; + }; }; }; diff --git a/arch/riscv/dts/hifive-unleashed-a00.dts b/arch/riscv/dts/hifive-unleashed-a00.dts index 88cfcb96bf..4a2729f5ca 100644 --- a/arch/riscv/dts/hifive-unleashed-a00.dts +++ b/arch/riscv/dts/hifive-unleashed-a00.dts @@ -2,6 +2,7 @@ /* Copyright (c) 2018-2019 SiFive, Inc */ #include "fu540-c000.dtsi" +#include /* Clock frequency (in Hz) of the PCB crystal for rtcclk */ #define RTCCLK_FREQ 1000000 @@ -41,6 +42,10 @@ clock-frequency = ; clock-output-names = "rtcclk"; }; + gpio-restart { + compatible = "gpio-restart"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + }; }; &uart0 { @@ -94,3 +99,7 @@ &pwm1 { status = "okay"; }; + +&gpio { + status = "okay"; +};