On Fri, 29 Nov 2024 at 19:18, Kumar, Udit <u-kum...@ti.com> wrote: > > > On 11/29/2024 7:06 PM, Tom Rini wrote: > > On Fri, Nov 29, 2024 at 12:33:04PM +0530, Sumit Garg wrote: > >> Hi Tom, > >> > >> On Sat, 23 Nov 2024 at 08:12, Tom Rini <tr...@konsulko.com> wrote: > >>> On Tue, Nov 19, 2024 at 03:37:20PM +0530, Udit Kumar wrote: > >>> > >>>> OSPI boot is broken due to missing bootph property > >>>> in pin mux of OSPI. > >>>> So add bootph to fix OSPI boot. > >>>> > >>>> Signed-off-by: Udit Kumar <u-kum...@ti.com> > >>> Applied to u-boot/master, thanks! > >>> > >> Please don't merge direct contributions to dts/upstream subtree. It > >> should rather have been a change via *-u-boot.dtsi or a cherry pick > >> from dts/upstream subtree. Otherwise, it is very likely it's going to > >> cause conflicts. > > I thought this was a cherry-pick, sorry. > > > Sorry for confusion , it was not cherry-pick, > > Let me know, if i need to send patch to revert above commit.
I hope subtree automerge will take care of it for v6.12-dts uprev otherwise Tom may need to revert it and do the sync afterwards. -Sumit > > Thanks > > Udit > >
