From patchwork Mon Feb 7 16:26:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 12737632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AEEEC433EF for ; Mon, 7 Feb 2022 16:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IaQjK3y7hJGDF66hZIZaPdP+v5b/sfzf1pEDRWQ0p3M=; b=yD+PfozfAJ3Vvy 6sMdAPtwDndBvweXqrxEXZNsCaMMaDfhR53MZiuEAY8R3kQCsDtQmldjN9o+sH+HzAtIi5hApBlMo bZGTaZ9LB1Lvt2FrPA2O4HYfV8uefUqwDAjhhIXkFxxll4K6/8aq2r8M9GMj8X+ldTcfASA2wItWr 5bxBrKGHadJuKVJXq9rp7Ugw5mH0HY/5xwac++QEwKIzLAb2Q/p0q7C8JB5iNwcpfrAaUjyluOv5W JULOXt1nM3Lq4Z/Gm3fpkHVt256g8hFmiwJaG3BX5GYQJresJmCcaOnSjXTWuclPllMgj/SwDxgnC vvxj+sWYOj3cCKMkpsoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nH6yr-00B7l4-GY; Mon, 07 Feb 2022 16:35:09 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nH6ox-00B45T-CZ for linux-riscv@lists.infradead.org; Mon, 07 Feb 2022 16:24:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1644251096; x=1675787096; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yKN3bDJdSLql1NsGHOBK3P94QqFRIN+6Az1x7qpydu0=; b=e+LsfclYT9BrrkSMv5Mk9eCMWfZwhFIYaw84n0SYnhGGhZn1uGxYB6Q7 RZkw1oQnX0UFx07jJ8VEK7GXT4ibjmQOPhFhcI1bZMo06mClFhsQt3cqB JN7UBgeNHfyEnKloUmqlBQ7hpDN3/BtHzgHZ8jXBufRxPGs8Jj7de+/l6 enbb0GEt8qnpdmoCV5gul5rjQfqtmoqZR6KSkbclU6S9Uh5EVWFJBSKKD zmRIn4Wt4Dd78J3GUnN/LhUwdyOqboQLhI6gjcLMhbWjhij+256keKTZ9 6RxlGMfVy7DLdmx3xFx6T6TiwVi2NZ8VZ8R7JDUVUwiuWPCHQz1TuoJBp w==; IronPort-SDR: 1jAKaI32FdujLWlExQMeqgMdBetq7OqTei7eWrvwIoelAUQcoaGGAGaPIPiFY+Lq2EIKyaYsyz HnWITML8pCcxK4P4o1YOdOccuR74OStw6HRtzyK4xuv78qsmZT7ehckKkfbaKIaLDd6qoBzEKj CAd7lONsNpZvwm71YZ0kNeYgNl2pwTdm3as33RuKgVooeVJn5Vb7DdpFNjaJqhF79WOzjn3LTx UDqremQElQ3jyWCnBrOuKg+NfRRzmDKVoO4qGQUj+HbUSwxVlHRm7HPfffXh8a3IIzgcO8vZmX Mw825+eQ8ar0nKWFcVhmUGKe X-IronPort-AV: E=Sophos;i="5.88,350,1635231600"; d="scan'208";a="152200222" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Feb 2022 09:24:55 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Mon, 7 Feb 2022 09:24:43 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Mon, 7 Feb 2022 09:24:38 -0700 From: To: , , , , , , , , , , , , , , , , , , , , CC: , , , , , , , Palmer Dabbelt Subject: [PATCH v6 10/12] riscv: dts: microchip: update peripherals in icicle kit device tree Date: Mon, 7 Feb 2022 16:26:36 +0000 Message-ID: <20220207162637.1658677-11-conor.dooley@microchip.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220207162637.1658677-1-conor.dooley@microchip.com> References: <20220207162637.1658677-1-conor.dooley@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220207_082455_494691_207CAA94 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley Assorted minor changes to the MPFS/Icicle kit device tree: - enable mmuart4 instead of mmuart0 - remove sifive pdma - split memory node to match updated fpga design - move stdout path to serial1 to avoid collision with bootloader running on the e51 Signed-off-by: Conor Dooley Acked-by: Palmer Dabbelt --- .../microchip/microchip-mpfs-icicle-kit.dts | 23 +++++++++++++------ .../boot/dts/microchip/microchip-mpfs.dtsi | 23 +++++++++++-------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts index c51bd7cf500f..dc5f351b10c4 100644 --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts @@ -18,20 +18,29 @@ aliases { serial1 = &mmuart1; serial2 = &mmuart2; serial3 = &mmuart3; + serial4 = &mmuart4; }; chosen { - stdout-path = "serial0:115200n8"; + stdout-path = "serial1:115200n8"; }; cpus { timebase-frequency = ; }; - memory@80000000 { + ddrc_cache_lo: memory@80000000 { device_type = "memory"; - reg = <0x0 0x80000000 0x0 0x40000000>; + reg = <0x0 0x80000000 0x0 0x2e000000>; clocks = <&clkcfg CLK_DDRC>; + status = "okay"; + }; + + ddrc_cache_hi: memory@1000000000 { + device_type = "memory"; + reg = <0x10 0x0 0x0 0x40000000>; + clocks = <&clkcfg CLK_DDRC>; + status = "okay"; }; }; @@ -39,10 +48,6 @@ &refclk { clock-frequency = <600000000>; }; -&mmuart0 { - status = "okay"; -}; - &mmuart1 { status = "okay"; }; @@ -55,6 +60,10 @@ &mmuart3 { status = "okay"; }; +&mmuart4 { + status = "okay"; +}; + &mmc { status = "okay"; diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi index 62bd00092bcc..5e7aaaf42cde 100644 --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi @@ -174,15 +174,6 @@ clint: clint@2000000 { <&cpu4_intc 3>, <&cpu4_intc 7>; }; - dma@3000000 { - compatible = "sifive,fu540-c000-pdma"; - reg = <0x0 0x3000000 0x0 0x8000>; - interrupt-parent = <&plic>; - interrupts = <23>, <24>, <25>, <26>, <27>, <28>, <29>, - <30>; - #dma-cells = <1>; - }; - plic: interrupt-controller@c000000 { compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0"; reg = <0x0 0xc000000 0x0 0x4000000>; @@ -213,7 +204,7 @@ mmuart0: serial@20000000 { interrupts = <90>; current-speed = <115200>; clocks = <&clkcfg CLK_MMUART0>; - status = "disabled"; + status = "disabled"; /* Reserved for the HSS */ }; mmuart1: serial@20100000 { @@ -252,6 +243,18 @@ mmuart3: serial@20104000 { status = "disabled"; }; + mmuart4: serial@20106000 { + compatible = "ns16550a"; + reg = <0x0 0x20106000 0x0 0x400>; + reg-io-width = <4>; + reg-shift = <2>; + interrupt-parent = <&plic>; + interrupts = <94>; + clocks = <&clkcfg CLK_MMUART4>; + current-speed = <115200>; + status = "disabled"; + }; + /* Common node entry for emmc/sd */ mmc: mmc@20008000 { compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc";