On Sun, Aug 18, 2024 at 10:07:12PM -0400, Bruce Ashfield wrote:
> I haven't had much luck pinning down the root cause of this. As near
> as I can tell, there was a partially staged BSP pull request that was
> pulled into the merge commit.
>
> To prove my theory, I'm trying to track down which BSP would have
> introduced the:
>
> + conn_bch_clk: clock-conn-bch {
>
> block of dtsi that you are removing in the fixup.
>
> Searching my gmail isn't showing me a pull request where that shows
> as part of the change, but my simple search would only show it if
> it was in the shortlog of the pull request email.
>
> So you can help me out if you can find which 5.15 BSP pull request
> would have contained that change (obviously a fsl BSP, since this
> is an imx8 dtsi).
>
> If I can track down the original pull request branch, I can try and
> reproduce the bad merge.
These reverted changes were not introduced by a simple commit. It seems
that the arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi on
v5.15/standard/preempt-rt/base
branch was reset to the same content as the one on the
v5.15/standard/nxp-sdk-5.15/nxp-soc branch.
All the commits which introduced these changes are:
$ git log --oneline
v5.15.164..linux-yocto/v5.15/standard/nxp-sdk-5.15/nxp-soc
arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi
b23791bea55e arm64: dts: imx8: Move usb3_lpcg to IMX_SC_R_USB_2 domain
ce5c164f44db arm64: dts: imx: back to use bit-offset for LPCG
246e87867cfc arm64: dts: freescale: Switch from clock-indices to bit-offsets
e5aa3a49e2c5 LF-2594-1 ARM64: dts: remove all mlb support for imx8qm/qxp
f4a3eabac821 MLK-24374-2 arm64: dts: imx8qm: Move USBH1 to imx8qm-ss-conn
6cb3cc87bf65 MLK-24368-1 arm64: dts: imx8qm: Add support for USBH1
1130ec430575 arm64: dts: imx8-ss-conn: apply changes for upstream Cadence
USB3 driver
be6907c18600 MLK-23000-3 ARM64: dts: imx8qxp: add mlb dts
d488da874ff9 arm64: dts: add imx8qxp gpmi-nand dts
db84d7b899f7 MLK-22445-2 ARM64: dts: imx8-ss-conn: add Cadence USB3 support
06c6d9e26c5d arm64: dts: imx8: conn: fully switched to new clk binding
c25cd2012786 ARM64: dts: imx8-ss-conn: add NXP USB2 node
54167ef439aa ARM64: dts: imx8qxp/imx8qm: add SD3.0 support
Apart from commit b23791bea55e ("arm64: dts: imx8: Move usb3_lpcg to
IMX_SC_R_USB_2 domain"),
all other commits were introduced when the new
v5.15/standard/nxp-sdk-5.15/nxp-soc branch
was created.
https://lists.yoctoproject.org/g/linux-yocto/message/11204?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2CAdd+nxp-imx8+bsp+for+kernel+v5.15+on+standard%2C20%2C2%2C0%2C90458661
The commit commit b23791bea55e ("arm64: dts: imx8: Move usb3_lpcg to
IMX_SC_R_USB_2 domain") was merged
from a separate mail patch.
https://lists.yoctoproject.org/g/linux-yocto/message/11287?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Acreated%2C%2Carm64%3A+dts%3A+imx8%3A+Move+usb3_lpcg+to+IMX_SC_R_USB_2+domain%2C20%2C2%2C0%2C91008125
Thanks,
Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14284): https://lists.yoctoproject.org/g/linux-yocto/message/14284 Mute This Topic: https://lists.yoctoproject.org/mt/107912289/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
