From: Michael Walle <michael@walle.cc>
To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Shawn Guo <shawnguo@kernel.org>, Li Yang <leoyang.li@nxp.com>,
Rob Herring <robh+dt@kernel.org>, Biwen Li <biwen.li@nxp.com>,
Michael Walle <michael@walle.cc>
Subject: [PATCH 2/2] Revert "arm64: dts: ls1028a: add flextimer based pwm nodes"
Date: Sat, 15 Jan 2022 22:09:07 +0100 [thread overview]
Message-ID: <20220115210907.451189-2-michael@walle.cc> (raw)
In-Reply-To: <20220115210907.451189-1-michael@walle.cc>
The changes to the device tree look very wrong. There are now two
devices with the same base address: pwm0 and ftm_alarm0. Both are using
the Flex Timer Module. It seems like this should either be one driver or
and MFD driver. Either way, there should only be one node in the device
tree. Revert the offending changes to avoid getting a broken device tree
in circulation.
This reverts commit 71799672ea24d2935322d655d2407c1ccd7db9ff.
Fixes: 71799672ea24 ("arm64: dts: ls1028a: add flextimer based pwm nodes")
Signed-off-by: Michael Walle <michael@walle.cc>
---
Btw, the nodes are also not sorted by the address. Otherwise it should have
been spotted easily.
.../arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 95 -------------------
1 file changed, 95 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 1ef26cbc79cb..d3cc8cbaf768 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -66,13 +66,6 @@ CPU_PW20: cpu-pw20 {
};
};
- rtc_clk: rtc-clk {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <32768>;
- clock-output-names = "rtc_clk";
- };
-
sysclk: sysclk {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -1245,94 +1238,6 @@ ierb@1f0800000 {
reg = <0x01 0xf0800000 0x0 0x10000>;
};
- pwm0: pwm@2800000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2800000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm1: pwm@2810000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2810000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm2: pwm@2820000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2820000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm3: pwm@2830000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2830000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm4: pwm@2840000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2840000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm5: pwm@2850000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2850000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm6: pwm@2860000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2860000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
- pwm7: pwm@2870000 {
- compatible = "fsl,vf610-ftm-pwm";
- #pwm-cells = <3>;
- reg = <0x0 0x2870000 0x0 0x10000>;
- clock-names = "ftm_sys", "ftm_ext",
- "ftm_fix", "ftm_cnt_clk_en";
- clocks = <&clockgen 4 1>, <&clockgen 4 1>,
- <&rtc_clk>, <&clockgen 4 1>;
- status = "disabled";
- };
-
rcpm: power-controller@1e34040 {
compatible = "fsl,ls1028a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1e34040 0x0 0x1c>;
--
2.30.2
next prev parent reply other threads:[~2022-01-15 21:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-15 21:09 [PATCH 1/2] Revert "arm64: dts: ls1028a-rdb: enable pwm0" Michael Walle
2022-01-15 21:09 ` Michael Walle [this message]
2022-01-29 5:42 ` [PATCH 2/2] Revert "arm64: dts: ls1028a: add flextimer based pwm nodes" Shawn Guo
2022-01-29 10:12 ` Michael Walle
2022-02-07 14:02 ` Michael Walle
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=20220115210907.451189-2-michael@walle.cc \
--to=michael@walle.cc \
--cc=biwen.li@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=shawnguo@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
Powered by JetHome