public inbox for dmaengine@vger.kernel.org
 help / color / mirror / Atom feed
From: Conor Dooley <mail@conchuod.ie>
To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
	Vinod Koul <vkoul@kernel.org>,
	Serge Semin <fancer.lancer@gmail.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Palmer Dabbelt <palmer@rivosinc.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
	Albert Ou <aou@eecs.berkeley.edu>,
	Conor Dooley <conor.dooley@microchip.com>,
	Masahiro Yamada <masahiroy@kernel.org>,
	Damien Le Moal <damien.lemoal@opensource.wdc.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Niklas Cassel <niklas.cassel@wdc.com>,
	Dillon Min <dillon.minfei@gmail.com>,
	dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
	linux-riscv@lists.infradead.org
Subject: [PATCH v5 05/13] riscv: dts: canaan: fix the k210's memory node
Date: Tue,  5 Jul 2022 22:52:06 +0100	[thread overview]
Message-ID: <20220705215213.1802496-6-mail@conchuod.ie> (raw)
In-Reply-To: <20220705215213.1802496-1-mail@conchuod.ie>

From: Conor Dooley <conor.dooley@microchip.com>

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 <niklas.cassel@wdc.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 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>;
-- 
2.37.0


  parent reply	other threads:[~2022-07-05 21:52 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-05 21:52 [PATCH v5 00/13] Canaan devicetree fixes Conor Dooley
2022-07-05 21:52 ` [PATCH v5 01/13] dt-bindings: display: convert ilitek,ili9341.txt to dt-schema Conor Dooley
2022-07-05 21:52 ` [PATCH v5 02/13] dt-bindings: display: ili9341: document canaan kd233's lcd Conor Dooley
2022-07-12  7:56   ` Conor.Dooley
2022-07-05 21:52 ` [PATCH v5 03/13] dt-bindings: dma: dw-axi-dmac: extend the number of interrupts Conor Dooley
2022-07-06  5:45   ` Vinod Koul
2022-07-18 15:12   ` Ben Dooks
2022-07-18 15:23     ` Conor.Dooley
2022-07-05 21:52 ` [PATCH v5 04/13] dt-bindings: memory-controllers: add canaan k210 sram controller Conor Dooley
2022-07-06 14:48   ` Rob Herring
2022-07-10 19:39   ` Conor.Dooley
2022-07-10 23:21     ` Damien Le Moal
2022-07-12 15:54       ` Conor.Dooley
2022-07-12 15:59         ` Krzysztof Kozlowski
2022-07-12 16:04           ` Conor.Dooley
2022-08-16  9:27   ` Krzysztof Kozlowski
2022-08-16  9:31     ` Conor.Dooley
2022-07-05 21:52 ` Conor Dooley [this message]
2022-07-05 21:52 ` [PATCH v5 06/13] riscv: dts: canaan: fix the k210's timer nodes Conor Dooley
2022-07-05 21:52 ` [PATCH v5 07/13] riscv: dts: canaan: fix mmc node names Conor Dooley
2022-07-05 21:52 ` [PATCH v5 08/13] riscv: dts: canaan: fix kd233 display spi frequency Conor Dooley
2022-07-05 21:52 ` [PATCH v5 09/13] riscv: dts: canaan: use custom compatible for k210 i2s Conor Dooley
2022-07-05 21:52 ` [PATCH v5 10/13] riscv: dts: canaan: remove spi-max-frequency from controllers Conor Dooley
2022-07-05 21:52 ` [PATCH v5 11/13] riscv: dts: canaan: fix bus {ranges,reg} warnings Conor Dooley
2022-07-05 21:52 ` [PATCH v5 12/13] riscv: dts: canaan: add specific compatible for kd233's LCD Conor Dooley
2022-07-05 21:52 ` [PATCH v5 13/13] riscv: dts: canaan: build all devicetress if SOC_CANAAN Conor Dooley
2022-07-06  8:03 ` [PATCH v5 00/13] Canaan devicetree fixes Geert Uytterhoeven
2022-07-06  8:21   ` Conor.Dooley
2022-07-06 11:55   ` Damien Le Moal
2022-07-06 12:01     ` Conor.Dooley
2022-07-06  8:09 ` Geert Uytterhoeven
2022-07-14 22:04 ` Palmer Dabbelt
2022-07-14 22:11   ` Conor.Dooley
2022-08-05 17:51     ` Conor.Dooley
2022-08-10 22:01       ` Palmer Dabbelt
2022-08-11  6:26         ` Conor.Dooley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220705215213.1802496-6-mail@conchuod.ie \
    --to=mail@conchuod.ie \
    --cc=Eugeniy.Paltsev@synopsys.com \
    --cc=airlied@linux.ie \
    --cc=aou@eecs.berkeley.edu \
    --cc=conor.dooley@microchip.com \
    --cc=damien.lemoal@opensource.wdc.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=daniel@ffwll.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=dillon.minfei@gmail.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=fancer.lancer@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=masahiroy@kernel.org \
    --cc=niklas.cassel@wdc.com \
    --cc=palmer@dabbelt.com \
    --cc=palmer@rivosinc.com \
    --cc=paul.walmsley@sifive.com \
    --cc=robh+dt@kernel.org \
    --cc=sam@ravnborg.org \
    --cc=thierry.reding@gmail.com \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox