* [PATCH] Revert "dt-bindings: mfd: syscon: Add rk3528 QoS register compatible"
@ 2025-03-17 23:07 Heiko Stuebner
2025-03-18 23:24 ` Heiko Stuebner
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Stuebner @ 2025-03-17 23:07 UTC (permalink / raw)
To: heiko
Cc: lee, sfr, linux-next, linux-arm-kernel, linux-rockchip, linux-kernel
This reverts commit 19a634195c1abe498798b564cd6b81e6dd4533f7.
The dt-binding addition adds the compatible to a syscon (a mfd) and should
go through the mfd tree. And it did, and is part of the mfd tree for 6.15
as commit 7f3e3e7228bb ("dt-bindings: mfd: syscon: Add rk3528 QoS register
compatible"), with all the correct Signed-off-by lines.
But of course having a commit present in two trees creates new problems.
So to prevent issues during the merge-window, revert the variant I
accidentially applied.
Fixes: 19a634195c1a ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")
Closes: https://lore.kernel.org/lkml/20250317144507.0938757b@canb.auug.org.au/
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
This removes the change from the Rockchip tree, so that only the one in the
mfd tree remains.
Documentation/devicetree/bindings/mfd/syscon.yaml | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml
index 2836e4793afc9..4d67ff26d4450 100644
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@ -103,7 +103,6 @@ select:
- rockchip,rk3288-qos
- rockchip,rk3368-qos
- rockchip,rk3399-qos
- - rockchip,rk3528-qos
- rockchip,rk3562-qos
- rockchip,rk3568-qos
- rockchip,rk3576-qos
@@ -203,7 +202,6 @@ properties:
- rockchip,rk3288-qos
- rockchip,rk3368-qos
- rockchip,rk3399-qos
- - rockchip,rk3528-qos
- rockchip,rk3562-qos
- rockchip,rk3568-qos
- rockchip,rk3576-qos
--
2.47.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "dt-bindings: mfd: syscon: Add rk3528 QoS register compatible"
2025-03-17 23:07 [PATCH] Revert "dt-bindings: mfd: syscon: Add rk3528 QoS register compatible" Heiko Stuebner
@ 2025-03-18 23:24 ` Heiko Stuebner
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2025-03-18 23:24 UTC (permalink / raw)
To: Heiko Stuebner
Cc: lee, sfr, linux-next, linux-arm-kernel, linux-rockchip, linux-kernel
On Tue, 18 Mar 2025 00:07:05 +0100, Heiko Stuebner wrote:
> This reverts commit 19a634195c1abe498798b564cd6b81e6dd4533f7.
>
> The dt-binding addition adds the compatible to a syscon (a mfd) and should
> go through the mfd tree. And it did, and is part of the mfd tree for 6.15
> as commit 7f3e3e7228bb ("dt-bindings: mfd: syscon: Add rk3528 QoS register
> compatible"), with all the correct Signed-off-by lines.
>
> [...]
Applied, thanks!
[1/1] Revert "dt-bindings: mfd: syscon: Add rk3528 QoS register compatible"
commit: cee24bc73d4f3f47344a1a54100a69c72f1db061
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-18 23:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-17 23:07 [PATCH] Revert "dt-bindings: mfd: syscon: Add rk3528 QoS register compatible" Heiko Stuebner
2025-03-18 23:24 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®