Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Nishanth Menon <nm@ti.com>
To:     Vignesh Raghavendra <vigneshr@ti.com>,
        Tero Kristo <kristo@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, Andrew Davis <afd@ti.com>
CC:     Nishanth Menon <nm@ti.com>, <devicetree@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/3] arm64: dts: ti: k3-am62a: Remove syscon compatible from epwm_tbclk
Date:   Sat, 5 Aug 2023 14:45:57 -0500
Message-ID: <169126415606.84898.18424472511177398578.b4-ty@ti.com>
In-Reply-To: <20230802174521.236255-1-afd@ti.com>
References: <20230802174521.236255-1-afd@ti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Precedence: bulk

Hi Andrew Davis,

On Wed, 02 Aug 2023 12:45:19 -0500, Andrew Davis wrote:
> The other instances have been fixed, but AM62a seems to have been missed,
> fix this here.
> 

The merging of two conf nodes:

I understand the linux-next dependency, it does create a dtbs_check
warnings on rc1, but I am picking this up since the yaml fixup is in
next already and not a new compatible addition. if the fixups does'nt
end up in linus-master for 6.6-rc1, we might need to look at what we
need to do. Please let me know if there is any concerns and I can drop
this series from my tree.

For the tbclk node name fix up:

I also noticed there were two other places we needed the fix as well,
since they were trivial, I rolled up [2] as part of the patch #3. if
you think the fixup should be done differently, let me know and I can
drop the series from my tree and we can pick a new series up.

I have applied the following to branch ti-k3-dts-next on [1].
Thank you!

[1/3] arm64: dts: ti: k3-am62a: Remove syscon compatible from epwm_tbclk
      commit: b9d801dbb2d5cb796dce32ffcee63fba83f72841
[2/3] arm64: dts: ti: k3-am64: Merge the two main_conf nodes
      commit: a57ba56bca42fa484bec916f7a88a3dc03d6cbdf
[3/3] arm64: dts: ti: k3: Fix epwm_tbclk node name to generic name
      commit: 085baaa7084e39a63d72db86821c6fb65bdbff72

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
[2]
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 33b6aadc9083..ef90b2bc81eb 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -55,7 +55,7 @@ phy_gmii_sel: phy@4044 {
 			#phy-cells = <1>;
 		};
 
-		epwm_tbclk: clock@4130 {
+		epwm_tbclk: clock-controller@4130 {
 			compatible = "ti,am62-epwm-tbclk";
 			reg = <0x4130 0x4>;
 			#clock-cells = <1>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 350beddc3d3c..d08f086d7d01 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -502,7 +502,7 @@ dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 {
 			reg = <0x000041e0 0x14>;
 		};
 
-		ehrpwm_tbclk: clock@4140 {
+		ehrpwm_tbclk: clock-controller@4140 {
 			compatible = "ti,am654-ehrpwm-tbclk";
 			reg = <0x4140 0x18>;
 			#clock-cells = <1>;
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D