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

Tony Lindgren
2007-03-05T09:59:46Z

Hi,

* Arnaud Patard <arnaud.patard@rtp-net.org> [070304 12:07]:
> Dirk Behme <dirk.behme@googlemail.com> writes:
>
> > Arnaud Patard (Rtp) wrote:
> >> Dirk Behme <dirk.behme@googlemail.com> writes:
> >>
> >>
> >>>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 :(

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.

> > 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