From: Jonathan Bakker <xc-racer2@live.ca>
To: krzk@kernel.org, alim.akhtar@samsung.com
Cc: robh+dt@kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Jonathan Bakker <xc-racer2@live.ca>
Subject: [PATCH 2/7] ARM: dts: s5pv210: Adjust I2S entries to match spec
Date: Wed, 23 Mar 2022 08:03:06 -0700 [thread overview]
Message-ID: <CY4PR04MB056784D54ADDBB4F57F82D4ACB189@CY4PR04MB0567.namprd04.prod.outlook.com> (raw)
In-Reply-To: <CY4PR04MB0567E33A07D8761C2D485327CB179@CY4PR04MB0567.namprd04.prod.outlook.com>
Based on the device tree spec, clocks should be ordered tx/rx.
Re-order from rx/tx to avoid warnings when running make dtbs_check
Additionally, the number of #sound-dai-cells should be 1, not 0
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
---
arch/arm/boot/dts/s5pv210-aries.dtsi | 2 +-
arch/arm/boot/dts/s5pv210.dtsi | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 70ff56daf4cb..503b5a50ef1a 100644
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -644,7 +644,7 @@
};
&i2s0 {
- dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
+ dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 353ba7b09a0c..56c1d9a19570 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -239,8 +239,8 @@
reg = <0xeee30000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <16>;
- dma-names = "rx", "tx", "tx-sec";
- dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+ dma-names = "tx", "rx", "tx-sec";
+ dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
clock-names = "iis",
"i2s_opclk0",
"i2s_opclk1";
@@ -250,7 +250,7 @@
samsung,idma-addr = <0xc0010000>;
pinctrl-names = "default";
pinctrl-0 = <&i2s0_bus>;
- #sound-dai-cells = <0>;
+ #sound-dai-cells = <1>;
status = "disabled";
};
@@ -259,13 +259,13 @@
reg = <0xe2100000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <17>;
- dma-names = "rx", "tx";
- dmas = <&pdma1 12>, <&pdma1 13>;
+ dma-names = "tx", "rx";
+ dmas = <&pdma1 13>, <&pdma1 12>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
pinctrl-names = "default";
pinctrl-0 = <&i2s1_bus>;
- #sound-dai-cells = <0>;
+ #sound-dai-cells = <1>;
status = "disabled";
};
@@ -274,13 +274,13 @@
reg = <0xe2a00000 0x1000>;
interrupt-parent = <&vic2>;
interrupts = <18>;
- dma-names = "rx", "tx";
- dmas = <&pdma1 14>, <&pdma1 15>;
+ dma-names = "tx", "rx";
+ dmas = <&pdma1 15>, <&pdma1 14>;
clock-names = "iis", "i2s_opclk0";
clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
pinctrl-names = "default";
pinctrl-0 = <&i2s2_bus>;
- #sound-dai-cells = <0>;
+ #sound-dai-cells = <1>;
status = "disabled";
};
--
2.20.1
next prev parent reply other threads:[~2022-03-23 15:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220322201144.20320-1-xc-racer2@live.ca>
2022-03-22 20:11 ` [PATCH 1/7] ARM: dts: s5pv210: Split memory nodes to match spec Jonathan Bakker
2022-03-23 10:54 ` Krzysztof Kozlowski
2022-03-23 14:59 ` Jonathan Bakker
2022-03-23 15:06 ` Krzysztof Kozlowski
2022-03-23 17:05 ` Jonathan Bakker
2022-03-24 11:23 ` Krzysztof Kozlowski
2022-03-23 15:03 ` Jonathan Bakker [this message]
2022-03-23 15:14 ` [PATCH 2/7] ARM: dts: s5pv210: Adjust I2S entries " Krzysztof Kozlowski
2022-03-23 15:15 ` Krzysztof Kozlowski
2022-03-23 17:24 ` Jonathan Bakker
2022-03-24 11:49 ` Krzysztof Kozlowski
2023-04-21 9:44 ` Krzysztof Kozlowski
2023-05-03 2:33 ` Jonathan Bakker
[not found] ` <20220323150311.26699-1-xc-racer2@live.ca>
2022-03-23 15:03 ` [PATCH 3/7] ARM: dts: s5pv210: Adjust DMA node names " Jonathan Bakker
2022-03-23 15:03 ` [PATCH 4/7] ARM: dts: s5pv210: Remove spi-cs-high on panel in Aries Jonathan Bakker
2022-03-23 15:22 ` Krzysztof Kozlowski
2022-03-23 15:03 ` [PATCH 5/7] ARM: dts: s5pv210: Correct interrupt name for bluetooth " Jonathan Bakker
2022-03-23 15:23 ` krzk
2022-03-23 15:03 ` [PATCH 6/7] ARM: dts: s5pv210: Add charger regulator to max8998 " Jonathan Bakker
2022-03-23 15:03 ` [PATCH 7/7] ARM: dts: s5pv210: Add charger support " Jonathan Bakker
2022-03-23 15:31 ` krzk
2022-03-23 17:20 ` Jonathan Bakker
2022-03-24 11:47 ` Krzysztof Kozlowski
2022-03-25 2:23 ` Jonathan Bakker
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=CY4PR04MB056784D54ADDBB4F57F82D4ACB189@CY4PR04MB0567.namprd04.prod.outlook.com \
--to=xc-racer2@live.ca \
--cc=alim.akhtar@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=robh+dt@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;
as well as URLs for NNTP newsgroup(s).