It looks like patch 2/2 was part of the updates I did last night, so I've only merged patch 1/2 to the branches.
Bruce In message: [linux-ycoto][linux-ycoto v6.1/standard/nxp-sdk-6.1/nxp-soc & v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 1/2] dt-bindings: clocks: imx8mp: "IMX8MP_CLK_USB_SUSP" redefined on 16/05/2023 Xiaolei Wang wrote: > Both commit 8ff0df6777bd and upstream commit 7579645760a4 submitted > IMX8MP_CLK_USB_SUSP, resulting in a compilation error. This patch > retains the SDK code to solve the compilation error. > > Signed-off-by: Xiaolei Wang <xiaolei.w...@windriver.com> > --- > include/dt-bindings/clock/imx8mp-clock.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/dt-bindings/clock/imx8mp-clock.h > b/include/dt-bindings/clock/imx8mp-clock.h > index 2d68d620b5d0..95d239287971 100644 > --- a/include/dt-bindings/clock/imx8mp-clock.h > +++ b/include/dt-bindings/clock/imx8mp-clock.h > @@ -324,7 +324,6 @@ > #define IMX8MP_CLK_CLKOUT2_SEL 317 > #define IMX8MP_CLK_CLKOUT2_DIV 318 > #define IMX8MP_CLK_CLKOUT2 319 > -#define IMX8MP_CLK_USB_SUSP 320 > #define IMX8MP_CLK_MEDIA_LDB_ROOT 320 > #define IMX8MP_CLK_AUDIO_AHB_ROOT 321 > #define IMX8MP_CLK_AUDIO_AXI_ROOT 322 > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12610): https://lists.yoctoproject.org/g/linux-yocto/message/12610 Mute This Topic: https://lists.yoctoproject.org/mt/98922957/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
