* Kyungmin Park <kmpark@xxxxxxxxxxxxx> [080129 03:01]:
> Hi,
>
> How about to define new CONFIG_SPI_OMAP2 instead of
> CONFIG_SPI_OMAP24XX or CONFIG_SPI_OMAP34XX?
>
> > Index: linux-omap-git-20071224/arch/arm/mach-omap2/devices.c
> > ===================================================================
> > --- linux-omap-git-20071224.orig/arch/arm/mach-omap2/devices.c
> > +++ linux-omap-git-20071224/arch/arm/mach-omap2/devices.c
> > @@ -128,12 +128,16 @@ static inline void omap_init_sti(void)
> > static inline void omap_init_sti(void) {}
> > #endif
> >
> > -#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
> > +#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP34XX) \
> > + || defined(CONFIG_SPI_OMAP24XX_MODULE) \
> > + || defined(CONFIG_SPI_OMAP34XX_MODULE)
> >
>
> then It checks the defined(CONFIG_SPI_OMAP2) ||
> defined(CONFIG_SPI_OMAP2_MODULE).
>
> >
> > Index: linux-omap-git-20071224/drivers/spi/Kconfig
> > ===================================================================
> > --- linux-omap-git-20071224.orig/drivers/spi/Kconfig
> > +++ linux-omap-git-20071224/drivers/spi/Kconfig
> > @@ -150,6 +150,13 @@ config SPI_OMAP24XX
> > SPI master controller for OMAP24xx Multichannel SPI
> > (McSPI) modules.
> >
> > +config SPI_OMAP34XX
> > + tristate "McSPI driver for OMAP34xx"
> > + depends on SPI_MASTER && ARCH_OMAP34XX
> > + help
> > + SPI master controller for OMAP34xx Multichannel SPI
> > + (McSPI) modules.
> > +
>
> config SPI_OMAP2
> tristate "McSPI driver for OMAP2"
> depends on SPI_MASTER && (ARCH_OMAP24XX || ARCH_OMAP34XX)
> help
> SPI master controller for OMAP24XX/OMAP34xx Multichannel SPI
> (McSPI) modules.
>
> > ===================================================================
> > --- linux-omap-git-20071224.orig/drivers/spi/Makefile
> > +++ linux-omap-git-20071224/drivers/spi/Makefile
> > @@ -21,6 +21,7 @@ obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70l
> > obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
> > obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o
> - obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o
> + obj-$(CONFIG_SPI_OMAP2) += omap2_mcspi.o
> > obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o
> > obj-$(CONFIG_SPI_MPC83xx) += spi_mpc83xx.o
> > obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
> -
I'll push the current version, sounds like Dave prefers that for
upstream merges for now.
Regards,
Tony
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
