Skip to contentSkip to conversation

ARM: OMAP: Fix SPI merge issues and reintroduce omap_uwire.c

PATCH In review Dirk Behme 3 participants 5 messages Mar 4, 2007 – Mar 5, 2007 SPI

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 ARM: OMAP: Fix SPI merge issues and reintroduce omap_uwire.c

Is there any special reason why

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb

deleted drivers/spi/omap_uwire.c?

If not, reintroduce it and remove double entries in Kconfig and Makefile. Please check if I hit the most recent version of omap_uwire.c.

Signed-off-by Dirk Behme <[email protected]>
drivers/spi/Makefile +0 -1
Index: linux-osk/drivers/spi/Makefile
===================================================================
@@ -16,7 +16,6 @@ obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
-obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
 obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
drivers/spi/Kconfig +0 -7
Index: linux-osk/drivers/spi/Kconfig
===================================================================
@@ -132,13 +132,6 @@ config SPI_S3C24XX_GPIO
 	  the inbuilt hardware cannot provide the transfer mode, or
 	  where the board is using non hardware connected pins.
 
-config SPI_OMAP_UWIRE
-	tristate "OMAP MicroWire"
-	depends on SPI_MASTER && ARCH_OMAP
-	select SPI_BITBANG
-	help
-	  This hooks up to the MicroWire controller on OMAP chips.
-
 config SPI_OMAP24XX
 	bool "McSPI driver for OMAP24xx"
 	depends on SPI_MASTER && ARCH_OMAP24XX
drivers/spi/omap_uwire.c new file +567 -0

567 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Dirk Behme

Is there any special reason why

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb

deleted drivers/spi/omap_uwire.c?

looks like forgotten git-update-index or something like that. I didn't check closely but I bet that this conflicts explains also why the ads7846 touchscreen driver doesn't work. I had to take the versions from the old linux-omap-2.6 tree to get my touchscreen back :(

Quoted 6 lines

If not, reintroduce it and remove double entries in Kconfig and Makefile. Please check if I hit the most recent version of omap_uwire.c.

Signed-off-by Dirk Behme <[email protected]>

fwiw: Acked-by: Arnaud Patard <[email protected]> :)

author
#2 lore raw

Broken ads7846 touchscreen, was: [PATCH] ARM: OMAP: Fix SPI merge issues and reintroduce omap_uwire.c

Quoted 7 lines · Arnaud Patard (Rtp)
Quoted 4 lines · Dirk Behme

Is there any special reason why

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb

Quoted 7 lines
Quoted 1 line

deleted drivers/spi/omap_uwire.c?

looks like forgotten git-update-index or something like that. I didn't check closely but I bet that this conflicts explains also why the ads7846 touchscreen driver doesn't work. I had to take the versions from the old linux-omap-2.6 tree to get my touchscreen back :(

Do you can make a diff between the old and new version and send a patch?

Cheers

Dirk

#3 lore raw

Re: Broken ads7846 touchscreen, was: [PATCH] ARM: OMAP: Fix SPI merge issues and reintroduce omap_uwire.c

Quoted 11 lines · Dirk Behme
Quoted 10 lines · Arnaud Patard (Rtp)
Quoted 5 lines · Dirk Behme

Is there any special reason why

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb

deleted drivers/spi/omap_uwire.c?

Quoted 7 lines
Quoted 4 lines

looks like forgotten git-update-index or something like that. I didn't check closely but I bet that this conflicts explains also why the ads7846 touchscreen driver doesn't work. I had to take the versions from the old linux-omap-2.6 tree to get my touchscreen back :(

Do you can make a diff between the old and new version and send a patch?

Sure. I'll send it in a new mail and it will probably need review from the ads784x guys.

Arnaud

#4 lore raw

Re: Broken ads7846 touchscreen, was: [PATCH] ARM: OMAP: Fix SPI merge issues and reintroduce omap_uwire.c

Hi,

Quoted 10 lines · Arnaud Patard
Quoted 8 lines · Dirk Behme
Quoted 7 lines · Arnaud Patard (Rtp)
Quoted 4 lines · Dirk Behme

Is there any special reason why

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commit;h=ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 1 line

deleted drivers/spi/omap_uwire.c?

looks like forgotten git-update-index or something like that. I didn't check closely but I bet that this conflicts explains also why the ads7846 touchscreen driver doesn't work. I had to take the versions from the old linux-omap-2.6 tree to get my touchscreen back :(

Sorry, I must have hosed it while merging. I'll make sure drivers/spi is in sync with mainline today. If we still have some necessary fixes for spi, they should be sent to LKML for integration.

Quoted 5 lines
Quoted 2 lines

Do you can make a diff between the old and new version and send a patch?

Sure. I'll send it in a new mail and it will probably need review from the ads784x guys.

We should make use the ads784x code is also in sync with mainline.

Regards,

Tony