On Wed, Nov 7, 2018 at 8:36 AM Schrempf Frieder <frieder.schre...@kontron.de> wrote: > > Hi Olof, > > On 07.11.18 17:20, Olof Johansson wrote: > > On Wed, Nov 7, 2018 at 6:44 AM Frieder Schrempf > > <frieder.schre...@kontron.de> wrote: > >> > >> From: Frieder Schrempf <frieder.schre...@exceet.de> > >> > >> The new driver at spi/spi-fsl-qspi.c replaces the old SPI NOR driver > >> at mtd/fsl-quadspi.c. Switch to the new driver in the defconfigs. > >> > >> Signed-off-by: Frieder Schrempf <frieder.schre...@exceet.de> > > > > Hi Frieder, > > > > This patch is part of a series that I didn't see the rest of, but in > > general we prefer to merge these through arm-soc even if the driver > > goes in through another tree. The way we'd prefer to handle it is that > > once the driver lands, we'll take the config option change to turn it > > on. To avoid our branches to break until both sides have landed, it > > might be a good idea to keep both drivers on for a short while (one > > release). > > > > So, I'm not going to ack this since we avoid taking defconfig changes > > through driver trees (these two defconfigs tend to churn a lot and we > > don't want to create merge conflicts where we don't have to), but > > we'll be happy to pick it up when the time comes. > > Ok, thank you for explaining the common practice. I will drop the config > changes for the next version and send it separately when the time is ready. > > Both the old driver and the new one use the same compatible strings for > probing. Wouldn't that cause problems if both drivers are enabled for a > while, or am I missing something?
Only one of them would be allowed to bind to a device, but it might not be predictable which one does (especially in the case of modules). So, it's far from ideal, but breaking the platform is possibly worse. It might just be a good idea to merge the driver and not turn it on until it's in for that case (i.e. we take the config change between -rc1 and -rc2). -Olof