On 15-04-03 10:52 AM, Florian Fainelli wrote: > On 03/04/15 06:38, Andy Shevchenko wrote: >> On Thu, Apr 2, 2015 at 10:23 PM, Jonathan Richardson >> <jonathar@xxxxxxxxxxxx> wrote: >>> The Broadcom MSPI controller is used on various chips. The driver only >>> supported BCM53xx chips with BCMA (an AMBA bus variant). The driver is >>> refactored to make BCMA optional and provides a new config for non BCMA >>> systems. >> >>> struct bcm_mspi { >>> + #ifdef CONFIG_SPI_BCMA_MSPI >>> struct bcma_device *core; >>> - struct spi_master *master; >>> + #endif >>> >>> + void __iomem *base; >>> + struct spi_master *master; >>> size_t read_offset; >> >>> + void (*mspi_write)(struct bcm_mspi *mspi, u16 offset, u32 value); >>> + u32 (*mspi_read)(struct bcm_mspi *mspi, u16 offset); >>> +}; >> >> To avoid ugly ifdefs I think better to split driver to core part and >> the actual driver part, at the end you will have something like >> mspi-core.c mspi-53xx.c mspi-whatever.c. Check for example spi-dw*.c >> > > Actually, I am really curious whether we need the special BCMA I/O > accessors in the first place, cannot we just access the MSPI core on > BCM53xx chips using regular MMIO? That would probably solve the > "problem" entirely. Rafal, did you try this before? > > As for splitting the driver into a "library" driver which is mostly > independent from the bus and a bus-specific wrapper, I think BCMA is > really the only special case here, which is why I suggested earlier to > Jonathan that we might just prefer ifdefing things out instead of > creating a separate layer just for BCMA. > I cringed adding the ifdefs to the driver but didn't think the small amount of code that wouldn't be used again warranted 3 files. I could also handle the two different probe routines by doing some DT parsing in init, but then BCMA would have to be compiled for the non-BCMA MSPI driver and I didn't want to do that either. -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html