* linux-next: manual merge of the spi tree with the tegra tree
@ 2010-10-15 2:25 Stephen Rothwell
2010-10-15 3:15 ` Grant Likely
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-10-15 2:25 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Erik Gilling, Colin Cross,
Olof Johansson, Masayuki Ohtake
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/Kconfig drivers/spi/Makefile between commit
f4fe02ee997ac4dca9d0888d1d1b8ceb29aae7d6 ("spi: add spi_tegra driver")
from the tegra tree and commit e8b17b5b3f30252b5470dbbf54bc251ddc7fac17
("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus
driver") from the spi tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/spi/Kconfig
index b806078,9949c25..0000000
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -314,13 -313,13 +329,20 @@@ config SPI_STMP3XX
help
SPI driver for Freescale STMP37xx/378x SoC SSP interface
+config SPI_TEGRA
+ tristate "Nvidia Tegra SPI controller"
+ depends on ARCH_TEGRA
+ select TEGRA_SYSTEM_DMA
+ help
+ SPI driver for NVidia Tegra SoCs
+
+ config SPI_TOPCLIFF_PCH
+ tristate "Topcliff PCH SPI Controller"
+ depends on PCI
+ help
+ SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
+ used in some x86 embedded processors.
+
config SPI_TXX9
tristate "Toshiba TXx9 SPI controller"
depends on GENERIC_GPIO && CPU_TX49XX
diff --cc drivers/spi/Makefile
index b6573d8,557aaad..0000000
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -39,7 -39,7 +39,8 @@@ obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
+obj-$(CONFIG_SPI_TEGRA) += spi_tegra.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the spi tree with the tegra tree
2010-10-15 2:25 linux-next: manual merge of the spi tree with the tegra tree Stephen Rothwell
@ 2010-10-15 3:15 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2010-10-15 3:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Erik Gilling, Colin Cross,
Olof Johansson, Masayuki Ohtake
On Thu, Oct 14, 2010 at 8:25 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the spi tree got a conflict in
> drivers/spi/Kconfig drivers/spi/Makefile between commit
> f4fe02ee997ac4dca9d0888d1d1b8ceb29aae7d6 ("spi: add spi_tegra driver")
> from the tegra tree and commit e8b17b5b3f30252b5470dbbf54bc251ddc7fac17
> ("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus
> driver") from the spi tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks Stephen. Yes, please carry the fix for the time being.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/spi/Kconfig
> index b806078,9949c25..0000000
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@@ -314,13 -313,13 +329,20 @@@ config SPI_STMP3XX
> help
> SPI driver for Freescale STMP37xx/378x SoC SSP interface
>
> +config SPI_TEGRA
> + tristate "Nvidia Tegra SPI controller"
> + depends on ARCH_TEGRA
> + select TEGRA_SYSTEM_DMA
> + help
> + SPI driver for NVidia Tegra SoCs
> +
> + config SPI_TOPCLIFF_PCH
> + tristate "Topcliff PCH SPI Controller"
> + depends on PCI
> + help
> + SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
> + used in some x86 embedded processors.
> +
> config SPI_TXX9
> tristate "Toshiba TXx9 SPI controller"
> depends on GENERIC_GPIO && CPU_TX49XX
> diff --cc drivers/spi/Makefile
> index b6573d8,557aaad..0000000
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@@ -39,7 -39,7 +39,8 @@@ obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx
> obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
> obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
> obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
> +obj-$(CONFIG_SPI_TEGRA) += spi_tegra.o
> + obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
> obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
> obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
> obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-15 3:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-15 2:25 linux-next: manual merge of the spi tree with the tegra tree Stephen Rothwell
2010-10-15 3:15 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®