add ssi/Kconfig to arch/arm/Kconfig

PATCH In review Arnaud Patard (Rtp) 5 participants 7 messages Mar 4, 2007 – Mar 8, 2007

Subsystems (2)

Arm (32-bit) Sound

lore

Share & tools

lore

Arnaud Patard (Rtp)

author

2007-03-04 12:30 UTC #0 lore raw

PATCH 1/1 add ssi/Kconfig to arch/arm/Kconfig

If one wants to use ssi/Kconfig on arm, it should be added to arch/arm/Kconfig.

Signed-off-by Arnaud Patard <[email protected]>

---
arch/arm/Kconfig | 2 2 + 0 - 0 !

 1 file changed, 2 insertions(+)

arch/arm/Kconfig +2 -0

Index: linux-omap-2.6/arch/arm/Kconfig
===================================================================
@@ -991,6 +991,8 @@ if ARCH_OMAP
 source "drivers/cbus/Kconfig"
 endif
 
+source "drivers/ssi/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"

Dirk Behme

2007-03-04 17:11 UTC #1 lore raw

Quoted 2 lines · Arnaud Patard (Rtp)

If one wants to use ssi/Kconfig on arm, it should be added to arch/arm/Kconfig.

Yes, I found this as well by getting

sound/arm/Kconfig:55:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_TSC2101' sound/arm/Kconfig:56:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_UWIRE'

Kconfig warnings.

While touching this, what do you think about doing some more clean up:

- omap_uwire.c is now in drivers/spi [], remove (old?) one from drivers/ssi

- Replace OMAP_UWIRE in Kconfig by SPI_OMAP_UWIRE pointing to drivers/spi

Update of your patch below.

Dirk

[1] http://linux.omap.com/pipermail/linux-omap-open-source/2007-March/009217.html

arch/arm/Kconfig +2 -0

Index: linux-osk/arch/arm/Kconfig
===================================================================
@@ -991,6 +991,8 @@ if ARCH_OMAP
 source "drivers/cbus/Kconfig"
 endif
 
+source "drivers/ssi/Kconfig"
+
 endmenu
 
 source "fs/Kconfig"

drivers/ssi/Kconfig +1 -8

Index: linux-osk/drivers/ssi/Kconfig
===================================================================
@@ -1,16 +1,9 @@
 menu "Synchronous Serial Interfaces (SSI)"
 
-config OMAP_UWIRE
-	depends on ARCH_OMAP1
-	tristate "MicroWire support on OMAP"
-	---help---
-	  Say Y here if you want support for the MicroWire interface
-	  on an OMAP processor.
-
 config OMAP_TSC2101
 	depends on ARCH_OMAP1 || ARCH_OMAP24XX
 	tristate "TSC2101 codec support for Touchscreen and audio"
-	select OMAP_UWIRE if MACH_OMAP_H3 || MACH_OMAP_H2
+	select SPI_OMAP_UWIRE if MACH_OMAP_H3 || MACH_OMAP_H2
 	select GPIOEXPANDER_OMAP if MACH_OMAP_H3
 	---help---
 	  Say Y here if you want support for the TSC2101 codec.  It is

drivers/ssi/Makefile +0 -1

Index: linux-osk/drivers/ssi/Makefile
===================================================================
@@ -2,5 +2,4 @@
 # Makefile for the SSI drivers
 #
 
-obj-$(CONFIG_OMAP_UWIRE)        += omap-uwire.o
 obj-$(CONFIG_OMAP_TSC2101)      += omap-tsc2101.o

drivers/ssi/omap-uwire.c deleted +0 ~~-233~~

233 lines not on this page · raw message

drivers/ssi/omap-uwire.h deleted +0 ~~-26~~

Index: linux-osk/drivers/ssi/omap-uwire.h
===================================================================
@@ -1,26 +0,0 @@
-#ifndef __ARCH_OMAP_UWIRE_H
-#define __ARCH_OMAP_UWIRE_H
-
-#define UWIRE_READ_FALLING_EDGE		0x0000
-#define UWIRE_READ_RISING_EDGE		0x0001
-#define UWIRE_WRITE_FALLING_EDGE	0x0000
-#define UWIRE_WRITE_RISING_EDGE		0x0002
-#define UWIRE_CS_ACTIVE_LOW		0x0000
-#define UWIRE_CS_ACTIVE_HIGH		0x0004
-#define UWIRE_FREQ_DIV_2		0x0000
-#define UWIRE_FREQ_DIV_4		0x0008
-#define UWIRE_FREQ_DIV_8		0x0010
-#define UWIRE_CHK_READY			0x0020
-#define UWIRE_CLK_INVERTED		0x0040
-
-/*
- * uWire for OMAP declarations
- */
-extern void omap_uwire_configure_mode(int cs, unsigned long flags);
-
-/* NOTE: Make sure you don't call this from an interrupt handler! */
-extern int omap_uwire_data_transfer(int cs, u16 tx_data, int tx_size,
-				    int rx_size, u16 *rx_buf,
-				    int leave_cs_active);
-
-#endif

sound/arm/Kconfig +1 -1

Index: linux-osk/sound/arm/Kconfig
===================================================================
@@ -53,7 +53,7 @@ config SND_OMAP_TSC2101
  	depends on ARCH_OMAP && SND
  	select SND_PCM
          select OMAP_TSC2101
-         select OMAP_UWIRE if ARCH_OMAP
+         select SPI_OMAP_UWIRE if ARCH_OMAP
 	 select OMAP_MCBSP
  	help
  	  Say Y here if you have a OMAP platform board

Arnaud Patard (Rtp)

author

2007-03-04 20:20 UTC #2 lore raw

Quoted 4 lines · Dirk Behme

Quoted 2 lines · Arnaud Patard (Rtp)
If one wants to use ssi/Kconfig on arm, it should be added to arch/arm/Kconfig.

Quoted 8 lines

Yes, I found this as well by getting
sound/arm/Kconfig:55:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_TSC2101' sound/arm/Kconfig:56:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_UWIRE'
Kconfig warnings.

same here :)

Quoted 6 lines

While touching this, what do you think about doing some more clean up:
- omap_uwire.c is now in drivers/spi [], remove (old?) one from drivers/ssi

I had the same patch but you send it before me :)

Quoted 6 lines

- Replace OMAP_UWIRE in Kconfig by SPI_OMAP_UWIRE pointing to drivers/spi
?

Even if I'm not a omap dev, I'll be happy to see the ssi stuff go to /dev/null. Unfortunately, grep is telling us that there are still users of the old omap_uwire. Moreover, it seems that it's possible to build a kernel without the OMAP_UWIRE and with the drivers using it. The drivers using the old ssi stuff should either depends on it or select it... (see drivers/video/omap/lcd_{p,h}2.c).
Until this is solved, we won't be able to remove it :(

Arnaud

Tony Lindgren

2007-03-05 10:01 UTC #3 lore raw

Quoted 33 lines · Arnaud Patard

Quoted 4 lines · Dirk Behme
Quoted 2 lines · Arnaud Patard (Rtp)
If one wants to use ssi/Kconfig on arm, it should be added to arch/arm/Kconfig.
Quoted 8 lines
Yes, I found this as well by getting
sound/arm/Kconfig:55:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_TSC2101' sound/arm/Kconfig:56:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_UWIRE'
Kconfig warnings.
same here :)
Quoted 6 lines
While touching this, what do you think about doing some more clean up:
- omap_uwire.c is now in drivers/spi [], remove (old?) one from drivers/ssi
I had the same patch but you send it before me :)
Quoted 6 lines
- Replace OMAP_UWIRE in Kconfig by SPI_OMAP_UWIRE pointing to drivers/spi
?

Quoted 7 lines

Even if I'm not a omap dev, I'll be happy to see the ssi stuff go to /dev/null. Unfortunately, grep is telling us that there are still users of the old omap_uwire. Moreover, it seems that it's possible to build a kernel without the OMAP_UWIRE and with the drivers using it. The drivers using the old ssi stuff should either depends on it or select it... (see drivers/video/omap/lcd_{p,h}2.c).
Until this is solved, we won't be able to remove it :(

I agree, let's get rid of the old drivers/ssi, anything using it should be updated to use drivers/spi.

Regards,

Tony

Dirk Behme

2007-03-05 19:56 UTC #4 lore raw

Quoted 46 lines · Tony Lindgren

Quoted 35 lines · Arnaud Patard
Quoted 5 lines · Dirk Behme
Quoted 2 lines · Arnaud Patard (Rtp)
If one wants to use ssi/Kconfig on arm, it should be added to arch/arm/Kconfig.
Quoted 8 lines
Yes, I found this as well by getting
sound/arm/Kconfig:55:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_TSC2101' sound/arm/Kconfig:56:warning: 'select' used by config symbol 'SND_OMAP_TSC2101' refer to undefined symbol 'OMAP_UWIRE'
Kconfig warnings.
same here :)
Quoted 5 lines
While touching this, what do you think about doing some more clean up:
- omap_uwire.c is now in drivers/spi [], remove (old?) one from drivers/ssi
I had the same patch but you send it before me :)
Quoted 5 lines
- Replace OMAP_UWIRE in Kconfig by SPI_OMAP_UWIRE pointing to drivers/spi
?
Quoted 7 lines
Even if I'm not a omap dev, I'll be happy to see the ssi stuff go to /dev/null. Unfortunately, grep is telling us that there are still users of the old omap_uwire. Moreover, it seems that it's possible to build a kernel without the OMAP_UWIRE and with the drivers using it. The drivers using the old ssi stuff should either depends on it or select it... (see drivers/video/omap/lcd_{p,h}2.c).
Until this is solved, we won't be able to remove it :(

Quoted 2 lines

I agree, let's get rid of the old drivers/ssi, anything using it should be updated to use drivers/spi.

Yes.

All: Following files need update. Let's try the names in file headers:

* drivers/video/omap/lcd_h2.c

-> update to use drivers/spi/omap-uwire
-> Imre?

* drivers/video/omap/lcd_p2.c

-> update to use drivers/spi/omap-uwire
-> jekyll & B Jp & Brian Swetland?

* drivers/ssi/omap-tsc2101.{c,h}

-> update to use drivers/spi/omap-uwire and move it to drivers/spi -> Nishanth?

Anything else?

Until this is done, only thing we can do to make Kconfig happy is

http://linux.omap.com/pipermail/linux-omap-open-source/2007-March/009220.html

Dirk

Brian Swetland

2007-03-05 20:32 UTC #5 lore raw

[Dirk Behme <[email protected]>]

Quoted 5 lines

Quoted 3 lines
I agree, let's get rid of the old drivers/ssi, anything using it should be updated to use drivers/spi.
Yes.

...

Quoted 4 lines

* drivers/video/omap/lcd_p2.c
-> update to use drivers/spi/omap-uwire
-> jekyll & B Jp & Brian Swetland?

I'm not actively working with p2/fsample at the moment and the next couple weeks are looking pretty busy -- I'm happy to take a look at this when I get some cycles, but I'm not sure when that'll be.

If somebody wants to take a shot at just getting it to build under the new interface, I can try to verify that it works on fsample at some point.

Brian

Imre Deak

2007-03-08 10:36 UTC #6 lore raw

In reply to Dirk Behme

Hi,

On Mon, Mar 05, 2007 at 08:56:53PM +0100, Dirk Behme wrote:
[...]

Quoted 8 lines

All: Following files need update. Let's try the names in file headers:
* drivers/video/omap/lcd_h2.c
-> update to use drivers/spi/omap-uwire
-> Imre?

It's dependent on the tsc2101 driver, but I'll take a look at both.

--Imre

Quoted 20 lines

* drivers/video/omap/lcd_p2.c
-> update to use drivers/spi/omap-uwire
-> jekyll & B Jp & Brian Swetland?
* drivers/ssi/omap-tsc2101.{c,h}
-> update to use drivers/spi/omap-uwire and move it to drivers/spi
-> Nishanth?
Anything else?
Until this is done, only thing we can do to make Kconfig happy is
http://linux.omap.com/pipermail/linux-omap-open-source/2007-March/009220.html
Dirk