On Fri, Oct 13, 2023 at 8:15 AM Rob Herring <robh@xxxxxxxxxx> wrote: > > On Fri, Oct 13, 2023 at 4:37 AM Xu Yilun <yilun.xu@xxxxxxxxxxxxxxx> wrote: > > > > On Thu, Oct 12, 2023 at 02:21:48PM -0500, Rob Herring wrote: > > > Commit 8c966aadcc02 ("fpga: Use device_get_match_data()") dropped the > > > > Hi rob: > > > > Unfortunately I re-applied Commit 8c966aadcc02 and the previous commit > > id is lost. > > > > Since the 2 patches are not upstreamed yet, could I just merge them into > > one? > > Yes, that's fine. Looks like altera-ps-spi.c also needs the same fix. Do you mind making the same change there? Rob