From patchwork Fri Jul 1 19:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 12903661 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 4755EC433EF for ; Fri, 1 Jul 2022 19:24:25 +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=BT5eX8+xGcCXWukzkbKmNK4pN8c2k181Ttx1u+AF3zM=; b=XvjD6UQmpGLsJo lFEBjzDxO3d3AohAta8UfxYYiDNVZTSVA90cmIVhVJmh3ZAVIIQSWbR7UlDqf/flBGXQb9Z7WOIs2 OEUvo9b5XxZiturC+nQ66Bhjt8T3wvlpiQzwyDx3flisZUvt2h2Oc8aeuMxe7WHc37q551tOy9BTi AVke9tIQDKY9uZGWUZaypk77rxL0JopHwhxDxITgZtTKoUqjK5p4PGgqr4Osr2S/+ieue8KUmG/gj QZhOkMpv/mA+pTLXY9UnUMnm41kLfsGiXX/e6r39D3jj4Bk1SQqCd89ynl2a/b8mlWa4m/M6iTQ9L ssN0NhHHjA9Ho9wIdS4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7MFT-006XTm-Sg; Fri, 01 Jul 2022 19:24:15 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7MFR-006XQh-32 for linux-riscv@lists.infradead.org; Fri, 01 Jul 2022 19:24:14 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 725C061F66; Fri, 1 Jul 2022 19:24:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5042FC341CA; Fri, 1 Jul 2022 19:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656703451; bh=eCsgbeuqchuCIFV9gDLlBeJCPGvuBnnluvULNww/3c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I7wFmBWzKnbV2a3O8P8xFCl7JuejL2YyhbvlJHIovAocV4oa+UJ3Ql9YbeXBurW81 iKT6KNGqonRpbL1rcaKLzrS6tpu4uEtfzymN2sAoVGhZNRg8w+s1wMv+Zz+zabbfLc O33G6aRN4GaUWXvXdws3ueL9L5GBHpo1iibUavODxwiiCfDNTQk2MPlvC00KGdbyKs DCovJAmGUoX4o5Kr4fat1IfjK5HUqWZCDH67Kizpp1b15XSbOMLTiGmK9+8oC7wwvb pLKIGTb/FP551AEoZb8CRlYg9aqcHhTuiRx7neZrc2B4i1IZZG3Qg+gmDtUD7qEwUA IZITfGnote9YQ== From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-riscv@lists.infradead.org Subject: [PATCH v4 06/14] riscv: dts: canaan: fix the k210's memory node Date: Fri, 1 Jul 2022 20:22:52 +0100 Message-Id: <20220701192300.2293643-7-conor@kernel.org> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220701192300.2293643-1-conor@kernel.org> References: <20220701192300.2293643-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_122413_263393_D230C4B2 X-CRM114-Status: GOOD ( 13.12 ) 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 The k210 U-Boot port has been using the clocks defined in the devicetree to bring up the board's SRAM, but this violates the dt-schema. As such, move the clocks to a dedicated node with the same compatible string. The regs property does not fit in either node, so is replaced by comments. Tested-by: Niklas Cassel Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi index 44d338514761..cd4eae82d8b2 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -69,11 +69,13 @@ cpu1_intc: interrupt-controller { sram: memory@80000000 { device_type = "memory"; + reg = <0x80000000 0x400000>, /* sram0 4 MiB */ + <0x80400000 0x200000>, /* sram1 2 MiB */ + <0x80600000 0x200000>; /* aisram 2 MiB */ + }; + + sram_controller: memory-controller { compatible = "canaan,k210-sram"; - reg = <0x80000000 0x400000>, - <0x80400000 0x200000>, - <0x80600000 0x200000>; - reg-names = "sram0", "sram1", "aisram"; clocks = <&sysclk K210_CLK_SRAM0>, <&sysclk K210_CLK_SRAM1>, <&sysclk K210_CLK_AI>;