On Fri, Nov 24, 2023 at 12:45 AM Kevin Hao <[email protected]> wrote: > > On Fri, Nov 24, 2023 at 12:06:45AM -0500, Bruce Ashfield wrote: > > In message: [linux-yocto] spi: cadence-xspi: Wrap the access to > > cdns_xspi_dev::cs_defined in #if > > on 21/11/2023 Kevin Hao wrote: > > > > > From: Kevin Hao <[email protected]> > > > > > > The cdns_xspi_dev::cs_defined is only defined when > > > CONFIG_SPI_CADENCE_MRVL_XSPI is enabled. So wrap the access to > > > cdns_xspi_dev::cs_defined in #if to fix the build failure. > > > > > > Signed-off-by: Kevin Hao <[email protected]> > > > --- > > > Hi Bruce, > > > > > > Could you help me merge this patch to the following two branches? > > > v5.15/standard/cn-sdkv5.15/octeon > > > v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > > > This applied to standard fine, but I'm seeing a conflict > > with preempt-rt. > > > > Are you seeing the same thing there ? (It doesn't look > > hard to resolve, but I wanted to see if our results are > > consistent). > > I mistakenly thought I had already validated this patch on the rt branch. > However there are indeed some difference in this driver between the std and rt > branch. Due to these differences, this fix is not applicable to the rt branch. > Please help me only merge this patch into the std branch. I apologize for the > inconvenience this has caused. >
No problem at all! It only took about a minute extra :) I've dropped it from the -rt branch Bruce > Thanks, > Kevin > > > > > Bruce > > > > > > > > drivers/spi/spi-cadence-xspi.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/drivers/spi/spi-cadence-xspi.c > > > b/drivers/spi/spi-cadence-xspi.c > > > index 81e71f19411f..e19170cf2448 100644 > > > --- a/drivers/spi/spi-cadence-xspi.c > > > +++ b/drivers/spi/spi-cadence-xspi.c > > > @@ -1138,7 +1138,9 @@ static int cdns_xspi_of_get_plat_data(struct > > > platform_device *pdev) > > > fwnode_handle_put(fwnode_child); > > > return -ENXIO; > > > } > > > +#if IS_ENABLED(CONFIG_SPI_CADENCE_MRVL_XSPI) > > > cdns_xspi->cs_defined |= BIT(cs); > > > +#endif > > > } > > > > > > return 0; > > > -- > > > 2.39.2 > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13310): https://lists.yoctoproject.org/g/linux-yocto/message/13310 Mute This Topic: https://lists.yoctoproject.org/mt/102729826/21656 Mute #if:https://lists.yoctoproject.org/g/linux-yocto/mutehashtag/if Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
