* Help needed with remaining plat headers
@ 2012-09-20 23:29 Tony Lindgren
2012-09-21 9:06 ` Igor Grinberg
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Tony Lindgren @ 2012-09-20 23:29 UTC (permalink / raw)
To: linux-omap
Hi all,
With the recent pull request I sent for v3.7, we now have pretty
much all the mach includes fixed up for omap2+ for single zImage
support.
We still have quite a few plat headers that we need to sort
out manually.
Please take a look at the following list, and reply to this
thread if you are working on patches moving one of the headers
in the list so we can coordinate things. The rules are simple
for most of them:
1. For driver related data, the header should now be in
include/linux/platform_data/*.h
2. For mach-omap2 specific things, the headers should be
in arch/arm/mach-omap2.
3. Drivers should not include anything from plat or mach.
I'll be looking into getting rid of cpu.h etc for v3.8 merge
window, but won't be looking much at the driver related
headers. So some help would be appreciated here :)
Regards,
Tony
$ ls arch/arm/plat-omap/include/plat/
clkdev_omap.h
clock.h
common.h
cpu.h
dma-44xx.h
dma.h
dmtimer.h
fpga.h
gpmc.h
i2c.h
iommu2.h
iommu.h
iopgtable.h
iovmm.h
led.h
mailbox.h
menelaus.h
mmc.h
multi.h
omap_device.h
omap_hwmod.h
omap-pm.h
omap-secure.h
omap-serial.h
prcm.h
sdrc.h
serial.h
sram.h
tc.h
timex.h
uncompress.h
usb.h
vram.h
vrfb.h
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: Help needed with remaining plat headers 2012-09-20 23:29 Help needed with remaining plat headers Tony Lindgren @ 2012-09-21 9:06 ` Igor Grinberg 2012-09-21 18:46 ` Tony Lindgren 2012-09-27 9:57 ` Vutla, Lokesh ` (2 subsequent siblings) 3 siblings, 1 reply; 19+ messages in thread From: Igor Grinberg @ 2012-09-21 9:06 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-omap On 09/21/12 02:29, Tony Lindgren wrote: > Hi all, > > With the recent pull request I sent for v3.7, we now have pretty > much all the mach includes fixed up for omap2+ for single zImage > support. > > We still have quite a few plat headers that we need to sort > out manually. > > Please take a look at the following list, and reply to this > thread if you are working on patches moving one of the headers > in the list so we can coordinate things. The rules are simple > for most of them: > > 1. For driver related data, the header should now be in > include/linux/platform_data/*.h > > 2. For mach-omap2 specific things, the headers should be > in arch/arm/mach-omap2. > > 3. Drivers should not include anything from plat or mach. > > I'll be looking into getting rid of cpu.h etc for v3.8 merge > window, but won't be looking much at the driver related > headers. So some help would be appreciated here :) > > Regards, > > Tony > > > $ ls arch/arm/plat-omap/include/plat/ [...] > timex.h I'll try to deal with this one, as it is related to the work I currently do for CONFIG_OMAP_32K_TIMER removal. Probably for v3.8 merge window. -- Regards, Igor. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-21 9:06 ` Igor Grinberg @ 2012-09-21 18:46 ` Tony Lindgren 0 siblings, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-21 18:46 UTC (permalink / raw) To: Igor Grinberg; +Cc: linux-omap * Igor Grinberg <grinberg@compulab.co.il> [120921 02:07]: > On 09/21/12 02:29, Tony Lindgren wrote: > > Hi all, > > > > With the recent pull request I sent for v3.7, we now have pretty > > much all the mach includes fixed up for omap2+ for single zImage > > support. > > > > We still have quite a few plat headers that we need to sort > > out manually. > > > > Please take a look at the following list, and reply to this > > thread if you are working on patches moving one of the headers > > in the list so we can coordinate things. The rules are simple > > for most of them: > > > > 1. For driver related data, the header should now be in > > include/linux/platform_data/*.h Just to clarify this, these headers should only contain the platform data shared between the SoC specific code and driver. Things that are driver internal should be in the driver specific header or moved to the driver. Things that are SoC internal should be in the local *.[chS] files in the arch/arm/mach-omap2 directory. > > 2. For mach-omap2 specific things, the headers should be > > in arch/arm/mach-omap2. > > > > 3. Drivers should not include anything from plat or mach. > > > > I'll be looking into getting rid of cpu.h etc for v3.8 merge > > window, but won't be looking much at the driver related > > headers. So some help would be appreciated here :) > > > > Regards, > > > > Tony > > > > > > $ ls arch/arm/plat-omap/include/plat/ > > [...] > > > timex.h > > I'll try to deal with this one, > as it is related to the work I currently do for CONFIG_OMAP_32K_TIMER removal. > Probably for v3.8 merge window. OK great thanks, Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-20 23:29 Help needed with remaining plat headers Tony Lindgren 2012-09-21 9:06 ` Igor Grinberg @ 2012-09-27 9:57 ` Vutla, Lokesh 2012-09-27 19:58 ` Tony Lindgren 2012-09-28 8:54 ` Peter Ujfalusi 2012-09-27 10:07 ` Tomi Valkeinen 2012-09-27 20:26 ` Tony Lindgren 3 siblings, 2 replies; 19+ messages in thread From: Vutla, Lokesh @ 2012-09-27 9:57 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-omap Hi Tony, On Fri, Sep 21, 2012 at 4:59 AM, Tony Lindgren <tony@atomide.com> wrote: > Hi all, > > With the recent pull request I sent for v3.7, we now have pretty > much all the mach includes fixed up for omap2+ for single zImage > support. > > We still have quite a few plat headers that we need to sort > out manually. > > Please take a look at the following list, and reply to this > thread if you are working on patches moving one of the headers > in the list so we can coordinate things. The rules are simple > for most of them: > > 1. For driver related data, the header should now be in > include/linux/platform_data/*.h > > 2. For mach-omap2 specific things, the headers should be > in arch/arm/mach-omap2. > > 3. Drivers should not include anything from plat or mach. > > I'll be looking into getting rid of cpu.h etc for v3.8 merge > window, but won't be looking much at the driver related > headers. So some help would be appreciated here :) > > Regards, > > Tony > > > $ ls arch/arm/plat-omap/include/plat/ > clkdev_omap.h > clock.h > common.h > cpu.h > dma-44xx.h > dma.h As a part of clean up I am looking at dma.h and dma-44xx.h files ll send you patches once cleanup and testing is done. Thanks Lokesh > dmtimer.h > fpga.h > gpmc.h > i2c.h > iommu2.h > iommu.h > iopgtable.h > iovmm.h > led.h > mailbox.h > menelaus.h > mmc.h > multi.h > omap_device.h > omap_hwmod.h > omap-pm.h > omap-secure.h > omap-serial.h > prcm.h > sdrc.h > serial.h > sram.h > tc.h > timex.h > uncompress.h > usb.h > vram.h > vrfb.h > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 9:57 ` Vutla, Lokesh @ 2012-09-27 19:58 ` Tony Lindgren 2012-09-28 8:54 ` Peter Ujfalusi 1 sibling, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-27 19:58 UTC (permalink / raw) To: Vutla, Lokesh; +Cc: linux-omap * Vutla, Lokesh <lokeshvutla@ti.com> [120927 02:59]: > > dma-44xx.h > > dma.h > As a part of clean up I am looking at dma.h and dma-44xx.h files > ll send you patches once cleanup and testing is done. OK great that's good to hear. Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 9:57 ` Vutla, Lokesh 2012-09-27 19:58 ` Tony Lindgren @ 2012-09-28 8:54 ` Peter Ujfalusi 2012-09-28 10:05 ` Vutla, Lokesh 1 sibling, 1 reply; 19+ messages in thread From: Peter Ujfalusi @ 2012-09-28 8:54 UTC (permalink / raw) To: Vutla, Lokesh; +Cc: Tony Lindgren, linux-omap On 09/27/2012 12:57 PM, Vutla, Lokesh wrote: >> clkdev_omap.h >> clock.h >> common.h >> cpu.h >> dma-44xx.h >> dma.h > As a part of clean up I am looking at dma.h and dma-44xx.h files > ll send you patches once cleanup and testing is done. One note for the dma.h, dma-44xx.h: The audio drivers used to include at least dma.h, but after the dmaengine conversion the are no longer doing it. The dmaengine for OMAP audio is going for 3.7. You can see them for some time in linux-next laready. -- Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-28 8:54 ` Peter Ujfalusi @ 2012-09-28 10:05 ` Vutla, Lokesh 0 siblings, 0 replies; 19+ messages in thread From: Vutla, Lokesh @ 2012-09-28 10:05 UTC (permalink / raw) To: Peter Ujfalusi; +Cc: Tony Lindgren, linux-omap Hi Peter, On Fri, Sep 28, 2012 at 2:24 PM, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote: > On 09/27/2012 12:57 PM, Vutla, Lokesh wrote: >>> clkdev_omap.h >>> clock.h >>> common.h >>> cpu.h >>> dma-44xx.h >>> dma.h >> As a part of clean up I am looking at dma.h and dma-44xx.h files >> ll send you patches once cleanup and testing is done. > > One note for the dma.h, dma-44xx.h: > The audio drivers used to include at least dma.h, but after the dmaengine > conversion the are no longer doing it. The dmaengine for OMAP audio is going > for 3.7. You can see them for some time in linux-next laready. Yes I am aware of this. I am making patches on linux-next only Thanks Lokesh > > -- > Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-20 23:29 Help needed with remaining plat headers Tony Lindgren 2012-09-21 9:06 ` Igor Grinberg 2012-09-27 9:57 ` Vutla, Lokesh @ 2012-09-27 10:07 ` Tomi Valkeinen 2012-09-27 19:57 ` Tony Lindgren 2012-09-27 20:26 ` Tony Lindgren 3 siblings, 1 reply; 19+ messages in thread From: Tomi Valkeinen @ 2012-09-27 10:07 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-omap [-- Attachment #1: Type: text/plain, Size: 563 bytes --] On Thu, 2012-09-20 at 16:29 -0700, Tony Lindgren wrote: > Hi all, > > With the recent pull request I sent for v3.7, we now have pretty > much all the mach includes fixed up for omap2+ for single zImage > support. > > We still have quite a few plat headers that we need to sort > out manually. > > Please take a look at the following list, and reply to this > thread if you are working on patches moving one of the headers > in the list so we can coordinate things. The rules are simple > vram.h > vrfb.h I'll work on these ones. Tomi [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 10:07 ` Tomi Valkeinen @ 2012-09-27 19:57 ` Tony Lindgren 0 siblings, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-27 19:57 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: linux-omap * Tomi Valkeinen <tomi.valkeinen@ti.com> [120927 03:13]: > On Thu, 2012-09-20 at 16:29 -0700, Tony Lindgren wrote: > > Hi all, > > > > With the recent pull request I sent for v3.7, we now have pretty > > much all the mach includes fixed up for omap2+ for single zImage > > support. > > > > We still have quite a few plat headers that we need to sort > > out manually. > > > > Please take a look at the following list, and reply to this > > thread if you are working on patches moving one of the headers > > in the list so we can coordinate things. The rules are simple > > > vram.h > > vrfb.h > > I'll work on these ones. Thanks. Can you please also remove the remaining cpu_is_omap and soc_is_omap usage from drivers/video for omap2+ early with some patches that I can apply to my cleanup branch early? Regards, Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-20 23:29 Help needed with remaining plat headers Tony Lindgren ` (2 preceding siblings ...) 2012-09-27 10:07 ` Tomi Valkeinen @ 2012-09-27 20:26 ` Tony Lindgren 2012-09-27 20:31 ` Tony Lindgren ` (4 more replies) 3 siblings, 5 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-27 20:26 UTC (permalink / raw) To: linux-omap; +Cc: Afzal Mohammed, Felipe Balbi, Jon Hunter, Omar Ramirez Luna Please see below a status update on the remaining problem plat headers. Note that all patches should be against current linux next in this case. * Tony Lindgren <tony@atomide.com> [120920 16:30]: > > $ ls arch/arm/plat-omap/include/plat/ > clkdev_omap.h > clock.h Paul posted patches for the clock headers. > common.h I'll make common.h local. > cpu.h Making cpu.h local requires getting rid of cpu_is_omap/soc_is_omap usage in drivers for mach-omap2+, so please fix your drivers! > dma-44xx.h > dma.h Lokesh will post patches for the dma*.h files. > dmtimer.h Jon, can you do a patch for dmtimer.h? > fpga.h I'll make fpga.h local to mach-omap1. > gpmc.h Afzal, can you do a patch for gpmc.h? > i2c.h Will move to platform_data after defining register functions locally. > iommu2.h > iommu.h > iopgtable.h > iovmm.h There are io*.h patches posted for these by Ido that need a bit more work to clear out the non-platform-data parts that should be local to the driver. > led.h Will move to platform_data. > mailbox.h Omar, can you please do a patch that makes mailbox.h suitable for include/linux/platform_data/mailbox-omap.h? > menelaus.h Will convert to be suitable for include/linux/platform_data. > mmc.h Will convert to be suitable for include/linux/platform_data. > multi.h Will make multi.h local. > omap_device.h > omap_hwmod.h Will make omap_device.h and omap_hwmod.h local to mach-omap2. > omap-pm.h > omap-secure.h > omap-serial.h Will fix up for platform_data/serial-omap.h. > prcm.h > sdrc.h Will make prcm.h and sdrc.h local to mach-omap2. > serial.h Will fix up for platform_data/serial-omap.h. > sram.h Will make sram.h local. > tc.h Will make tc.h local to mach-omap1. > timex.h Igor is looking into timex.h. > uncompress.h We can just move and disable the DEBUG_LL unless UART address + shift are specified in Kconfig in a generic way. I think this is already possible or patches have been posted to LAKML? > usb.h Felipe can you do a patch for this one? > vram.h > vrfb.h Tomi will post patches for vr*.h files. Regards, Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 20:26 ` Tony Lindgren @ 2012-09-27 20:31 ` Tony Lindgren 2012-09-27 20:33 ` Shilimkar, Santosh ` (3 subsequent siblings) 4 siblings, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-27 20:31 UTC (permalink / raw) To: linux-omap Cc: Afzal Mohammed, Felipe Balbi, Jon Hunter, Omar Ramirez Luna, Kevin Hilman Missed omap-pm.h and omap-secure.h, see below.. * Tony Lindgren <tony@atomide.com> [120927 13:27]: > Please see below a status update on the remaining problem > plat headers. > > Note that all patches should be against current linux next > in this case. > > * Tony Lindgren <tony@atomide.com> [120920 16:30]: > > > > $ ls arch/arm/plat-omap/include/plat/ > > clkdev_omap.h > > clock.h > > Paul posted patches for the clock headers. > > > common.h > > I'll make common.h local. > > > cpu.h > > Making cpu.h local requires getting rid of cpu_is_omap/soc_is_omap > usage in drivers for mach-omap2+, so please fix your drivers! > > > dma-44xx.h > > dma.h > > Lokesh will post patches for the dma*.h files. > > > dmtimer.h > > Jon, can you do a patch for dmtimer.h? > > > fpga.h > > I'll make fpga.h local to mach-omap1. > > > gpmc.h > > Afzal, can you do a patch for gpmc.h? > > > i2c.h > > Will move to platform_data after defining register functions > locally. > > > iommu2.h > > iommu.h > > iopgtable.h > > iovmm.h > > There are io*.h patches posted for these by Ido that need > a bit more work to clear out the non-platform-data parts > that should be local to the driver. > > > led.h > > Will move to platform_data. > > > mailbox.h > > Omar, can you please do a patch that makes mailbox.h > suitable for include/linux/platform_data/mailbox-omap.h? > > > menelaus.h > > Will convert to be suitable for include/linux/platform_data. > > > mmc.h > > Will convert to be suitable for include/linux/platform_data. > > > multi.h > > Will make multi.h local. > > > omap_device.h > > omap_hwmod.h > > Will make omap_device.h and omap_hwmod.h local to mach-omap2. > > > omap-pm.h I think Kevin already has some patches to make this local? > > omap-secure.h Will make omap-secure.h local. > > omap-serial.h > > Will fix up for platform_data/serial-omap.h. > > > prcm.h > > sdrc.h > > Will make prcm.h and sdrc.h local to mach-omap2. > > > serial.h > > Will fix up for platform_data/serial-omap.h. > > > sram.h > > Will make sram.h local. > > > tc.h > > Will make tc.h local to mach-omap1. > > > timex.h > > Igor is looking into timex.h. > > > uncompress.h > > We can just move and disable the DEBUG_LL unless UART > address + shift are specified in Kconfig in a generic > way. I think this is already possible or patches have > been posted to LAKML? > > > usb.h > > Felipe can you do a patch for this one? > > > vram.h > > vrfb.h > > Tomi will post patches for vr*.h files. > > Regards, > > Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 20:26 ` Tony Lindgren 2012-09-27 20:31 ` Tony Lindgren @ 2012-09-27 20:33 ` Shilimkar, Santosh 2012-09-28 0:01 ` Tony Lindgren 2012-09-28 4:46 ` Mohammed, Afzal ` (2 subsequent siblings) 4 siblings, 1 reply; 19+ messages in thread From: Shilimkar, Santosh @ 2012-09-27 20:33 UTC (permalink / raw) To: Tony Lindgren Cc: linux-omap, Afzal Mohammed, Felipe Balbi, Jon Hunter, Omar Ramirez Luna, Lokesh Vutla On Fri, Sep 28, 2012 at 1:56 AM, Tony Lindgren <tony@atomide.com> wrote: > > Please see below a status update on the remaining problem > plat headers. > > Note that all patches should be against current linux next > in this case. > > * Tony Lindgren <tony@atomide.com> [120920 16:30]: > > > > $ ls arch/arm/plat-omap/include/plat/ [..] > omap-secure.h Will work with Lokesh to get this one sorted out along with dma. It can be made local to mach-omap2. Regards Santosh ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 20:33 ` Shilimkar, Santosh @ 2012-09-28 0:01 ` Tony Lindgren 0 siblings, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-28 0:01 UTC (permalink / raw) To: Shilimkar, Santosh Cc: linux-omap, Afzal Mohammed, Felipe Balbi, Jon Hunter, Omar Ramirez Luna, Lokesh Vutla * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120927 13:34]: > On Fri, Sep 28, 2012 at 1:56 AM, Tony Lindgren <tony@atomide.com> wrote: > > > > Please see below a status update on the remaining problem > > plat headers. > > > > Note that all patches should be against current linux next > > in this case. > > > > * Tony Lindgren <tony@atomide.com> [120920 16:30]: > > > > > > $ ls arch/arm/plat-omap/include/plat/ > > [..] > > > omap-secure.h > > Will work with Lokesh to get this one sorted out along with > dma. It can be made local to mach-omap2. OK thanks. Tony ^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: Help needed with remaining plat headers 2012-09-27 20:26 ` Tony Lindgren 2012-09-27 20:31 ` Tony Lindgren 2012-09-27 20:33 ` Shilimkar, Santosh @ 2012-09-28 4:46 ` Mohammed, Afzal 2012-09-28 6:58 ` Vutla, Lokesh 2012-09-28 7:02 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi 2012-09-28 15:19 ` Help needed with remaining plat headers Jon Hunter 4 siblings, 1 reply; 19+ messages in thread From: Mohammed, Afzal @ 2012-09-28 4:46 UTC (permalink / raw) To: Tony Lindgren, linux-omap@vger.kernel.org Cc: Balbi, Felipe, Hunter, Jon, Omar Ramirez Luna Hi Tony, On Fri, Sep 28, 2012 at 01:56:16, Tony Lindgren wrote: > Please see below a status update on the remaining problem > plat headers. > > gpmc.h > > Afzal, can you do a patch for gpmc.h? Yes, I will do it. Regards Afzal ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-28 4:46 ` Mohammed, Afzal @ 2012-09-28 6:58 ` Vutla, Lokesh 2012-10-01 9:34 ` Peter Ujfalusi 0 siblings, 1 reply; 19+ messages in thread From: Vutla, Lokesh @ 2012-09-28 6:58 UTC (permalink / raw) To: Mohammed, Afzal Cc: Tony Lindgren, linux-omap@vger.kernel.org, Balbi, Felipe, Hunter, Jon, Omar Ramirez Luna Hi, I see a module build failure in linux-next tree. Any one else facing this issue or I am missing something. Using master branch on git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Below is the log . $ make modules -j 10 CHK include/linux/version.h CHK include/generated/utsrelease.h make[1]: `include/generated/mach-types.h' is up to date. CALL scripts/checksyscalls.sh CC [M] sound/sound_core.o CC [M] crypto/ecb.o CC [M] crypto/arc4.o CC [M] sound/core/compress_offload.o CC [M] drivers/base/regmap/regmap-spi.o CC [M] sound/core/hwdep.o CC [M] net/bluetooth/af_bluetooth.o CC [M] drivers/bluetooth/hci_ldisc.o CC [M] drivers/bluetooth/hci_h4.o CC [M] net/bluetooth/hci_core.o CC [M] drivers/bluetooth/hci_bcsp.o CC [M] drivers/bluetooth/hci_ll.o CC [M] drivers/bluetooth/bcm203x.o CC [M] sound/core/memalloc.o CC [M] drivers/bluetooth/bpa10x.o CC [M] sound/core/pcm.o LD [M] drivers/bluetooth/hci_uart.o CC [M] net/bluetooth/hci_conn.o CC [M] sound/core/pcm_native.o CC [M] sound/core/pcm_lib.o CC [M] net/bluetooth/hci_event.o CC [M] sound/core/pcm_timer.o CC [M] net/bluetooth/mgmt.o CC [M] sound/core/pcm_misc.o CC [M] sound/core/pcm_memory.o CC [M] net/mac80211/main.o CC [M] drivers/net/wireless/libertas/cfg.o CC [M] net/mac80211/status.o CC [M] sound/core/rawmidi.o CC [M] sound/core/timer.o CC [M] sound/core/sound.o CC [M] sound/core/init.o CC [M] sound/soc/soc-core.o CC [M] sound/core/memory.o CC [M] net/mac80211/sta_info.o CC [M] net/mac80211/wep.o CC [M] net/mac80211/wpa.o CC [M] net/mac80211/scan.o CC [M] net/mac80211/offchannel.o CC [M] net/bluetooth/hci_sock.o CC [M] drivers/net/wireless/libertas/cmd.o CC [M] net/bluetooth/hci_sysfs.o CC [M] sound/core/info.o CC [M] net/mac80211/ht.o CC [M] net/mac80211/agg-tx.o CC [M] sound/core/control.o CC [M] sound/core/misc.o CC [M] sound/core/device.o CC [M] sound/soc/soc-dapm.o CC [M] net/bluetooth/l2cap_core.o CC [M] drivers/net/wireless/libertas/cmdresp.o CC [M] net/bluetooth/l2cap_sock.o CC [M] net/bluetooth/smp.o CC [M] net/bluetooth/sco.o CC [M] sound/soc/soc-jack.o CC [M] net/mac80211/agg-rx.o CC [M] drivers/net/wireless/libertas/debugfs.o CC [M] drivers/net/wireless/libertas/ethtool.o CC [M] drivers/net/wireless/libertas/main.o CC [M] sound/core/sound_oss.o CC [M] sound/core/info_oss.o CC [M] net/bluetooth/lib.o CC [M] net/bluetooth/a2mp.o CC [M] net/mac80211/ibss.o CC [M] drivers/net/wireless/libertas/rx.o CC [M] drivers/net/wireless/libertas/tx.o CC [M] sound/core/jack.o CC [M] drivers/net/wireless/libertas/firmware.o CC [M] sound/soc/soc-cache.o CC [M] sound/core/oss/mixer_oss.o CC [M] drivers/net/wireless/libertas/if_sdio.o CC [M] drivers/net/wireless/libertas/if_usb.o CC [M] sound/soc/soc-utils.o CC [M] net/mac80211/iface.o CC [M] net/wireless/core.o CC [M] net/wireless/sysfs.o CC [M] sound/core/oss/pcm_oss.o CC [M] sound/soc/soc-pcm.o CC [M] sound/usb/card.o LD [M] net/bluetooth/bluetooth.o CC [M] net/wireless/radiotap.o CC [M] sound/core/oss/pcm_plugin.o CC [M] sound/core/oss/io.o CC [M] net/wireless/util.o LD [M] drivers/net/wireless/libertas/libertas.o LD [M] drivers/net/wireless/libertas/usb8xxx.o LD [M] drivers/net/wireless/libertas/libertas_sdio.o CC [M] net/wireless/reg.o CC [M] sound/soc/soc-compress.o CC [M] sound/usb/clock.o CC [M] sound/soc/soc-io.o CC [M] net/mac80211/rate.o CC [M] sound/usb/endpoint.o CC [M] net/wireless/scan.o CC [M] net/wireless/nl80211.o CC [M] sound/core/oss/copy.o CC [M] drivers/usb/gadget/zero.o CC [M] sound/soc/codecs/twl4030.o CC [M] drivers/usb/gadget/usbstring.o CC [M] sound/core/oss/linear.o CC [M] drivers/usb/gadget/config.o CC [M] sound/usb/format.o CC [M] net/mac80211/michael.o CC [M] net/mac80211/tkip.o CC [M] drivers/video/cfbfillrect.o CC [M] sound/core/oss/mulaw.o CC [M] sound/core/oss/route.o CC [M] drivers/usb/gadget/epautoconf.o CC [M] drivers/usb/gadget/composite.o CC [M] drivers/video/cfbcopyarea.o CC [M] sound/usb/helper.o LD [M] sound/soc/codecs/snd-soc-twl4030.o CC [M] sound/usb/mixer.o CC [M] sound/usb/mixer_quirks.o CC [M] sound/core/oss/rate.o CC [M] sound/usb/pcm.o CC [M] sound/soc/omap/omap-mcbsp.o CC [M] sound/soc/omap/mcbsp.o LD [M] sound/core/oss/snd-mixer-oss.o LD [M] sound/core/oss/snd-pcm-oss.o LD [M] sound/core/snd.o LD [M] sound/core/snd-hwdep.o LD [M] sound/core/snd-timer.o LD [M] sound/core/snd-pcm.o LD [M] sound/core/snd-page-alloc.o LD [M] sound/core/snd-rawmidi.o LD [M] sound/core/snd-compress.o CC [M] drivers/video/cfbimgblt.o CC [M] sound/soc/omap/omap-pcm.o CC [M] net/wireless/mlme.o CC [M] net/mac80211/aes_ccm.o CC [M] net/wireless/ibss.o CC [M] sound/usb/proc.o CC [M] sound/usb/quirks.o LD [M] drivers/usb/gadget/libcomposite.o CC [M] sound/soc/omap/omap3pandora.o LD [M] drivers/usb/gadget/g_zero.o CC [M] sound/usb/stream.o CC [M] drivers/video/backlight/backlight.o CC [M] drivers/video/backlight/generic_bl.o CC [M] sound/usb/midi.o CC [M] net/mac80211/aes_cmac.o CC [M] net/mac80211/cfg.o LD [M] sound/soc/omap/snd-soc-omap.o LD [M] sound/soc/omap/snd-soc-omap-mcbsp.o LD [M] sound/soc/omap/snd-soc-omap3pandora.o LD [M] sound/soundcore.o CC [M] net/wireless/sme.o CC [M] net/mac80211/rx.o LD [M] sound/soc/snd-soc-core.o CC [M] net/mac80211/spectmgmt.o CC [M] drivers/video/omap2/displays/panel-generic-dpi.o CC [M] net/wireless/chan.o CC [M] drivers/video/omap2/displays/panel-sharp-ls037v7dw01.o CC [M] net/mac80211/tx.o CC [M] drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.o CC [M] net/wireless/ethtool.o CC [M] net/mac80211/key.o CC [M] net/mac80211/util.o CC [M] drivers/video/omap2/displays/panel-taal.o CC [M] net/mac80211/wme.o CC [M] net/mac80211/event.o LD [M] sound/usb/snd-usb-audio.o LD [M] sound/usb/snd-usbmidi-lib.o CC [M] net/wireless/mesh.o CC [M] net/wireless/ap.o CC [M] drivers/video/omap2/displays/panel-tpo-td043mtea1.o CC [M] net/mac80211/chan.o CC [M] net/mac80211/trace.o CC [M] net/mac80211/mlme.o CC [M] net/wireless/lib80211.o CC [M] drivers/video/omap2/displays/panel-acx565akm.o CC [M] drivers/video/omap2/dss/core.o CC [M] net/mac80211/pm.o CC [M] drivers/video/omap2/dss/dss.o CC [M] net/mac80211/rc80211_pid_algo.o CC [M] net/mac80211/rc80211_minstrel.o LD [M] net/wireless/cfg80211.o CC [M] net/mac80211/rc80211_minstrel_ht.o CC [M] drivers/video/omap2/omapfb/omapfb-main.o CC [M] drivers/video/omap2/dss/dss_features.o CC [M] drivers/video/omap2/dss/dispc.o CC [M] drivers/video/omap2/omapfb/omapfb-sysfs.o CC [M] drivers/video/omap2/omapfb/omapfb-ioctl.o CC [M] drivers/video/omap2/dss/dispc_coefs.o CC [M] drivers/video/omap2/dss/display.o CC [M] drivers/video/omap2/dss/manager.o CC [M] drivers/video/omap2/dss/manager-sysfs.o CC [M] drivers/video/omap2/dss/overlay.o CC [M] drivers/video/omap2/dss/overlay-sysfs.o CC [M] drivers/video/omap2/dss/output.o CC [M] drivers/video/omap2/dss/apply.o CC [M] drivers/video/omap2/dss/dpi.o CC [M] drivers/video/omap2/dss/rfbi.o CC [M] drivers/video/omap2/dss/venc.o CC [M] drivers/video/omap2/dss/venc_panel.o CC [M] drivers/video/omap2/dss/sdi.o CC [M] drivers/video/omap2/dss/dsi.o CC [M] drivers/video/omap2/dss/hdmi.o LD [M] drivers/video/omap2/omapfb/omapfb.o CC [M] drivers/video/omap2/dss/hdmi_panel.o CC [M] drivers/video/omap2/dss/ti_hdmi_4xxx_ip.o LD [M] net/mac80211/mac80211.o LD [M] drivers/video/omap2/dss/omapdss.o Building modules, stage 2. MODPOST 45 modules ERROR: "snd_hwparams_to_dma_slave_config" [sound/soc/omap/snd-soc-omap.ko] undefined! ERROR: "snd_dmaengine_pcm_pointer" [sound/soc/omap/snd-soc-omap.ko] undefined! ERROR: "snd_dmaengine_pcm_open" [sound/soc/omap/snd-soc-omap.ko] undefined! ERROR: "snd_dmaengine_pcm_close" [sound/soc/omap/snd-soc-omap.ko] undefined! ERROR: "snd_dmaengine_pcm_get_chan" [sound/soc/omap/snd-soc-omap.ko] undefined! ERROR: "snd_dmaengine_pcm_trigger" [sound/soc/omap/snd-soc-omap.ko] undefined! make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 Thanks Lokesh On Fri, Sep 28, 2012 at 10:16 AM, Mohammed, Afzal <afzal@ti.com> wrote: > Hi Tony, > > On Fri, Sep 28, 2012 at 01:56:16, Tony Lindgren wrote: > >> Please see below a status update on the remaining problem >> plat headers. > >> > gpmc.h >> >> Afzal, can you do a patch for gpmc.h? > > Yes, I will do it. > > Regards > Afzal ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-28 6:58 ` Vutla, Lokesh @ 2012-10-01 9:34 ` Peter Ujfalusi 0 siblings, 0 replies; 19+ messages in thread From: Peter Ujfalusi @ 2012-10-01 9:34 UTC (permalink / raw) To: Vutla, Lokesh Cc: Mohammed, Afzal, Tony Lindgren, linux-omap@vger.kernel.org, Balbi, Felipe, Hunter, Jon, Omar Ramirez Luna Hi, On 09/28/2012 09:58 AM, Vutla, Lokesh wrote: > Hi, > I see a module build failure in linux-next tree. > Any one else facing this issue or I am missing something. > Using master branch on > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > Below is the log . > > $ make modules -j 10 > ERROR: "snd_hwparams_to_dma_slave_config" > [sound/soc/omap/snd-soc-omap.ko] undefined! > ERROR: "snd_dmaengine_pcm_pointer" [sound/soc/omap/snd-soc-omap.ko] undefined! > ERROR: "snd_dmaengine_pcm_open" [sound/soc/omap/snd-soc-omap.ko] undefined! > ERROR: "snd_dmaengine_pcm_close" [sound/soc/omap/snd-soc-omap.ko] undefined! > ERROR: "snd_dmaengine_pcm_get_chan" [sound/soc/omap/snd-soc-omap.ko] undefined! > ERROR: "snd_dmaengine_pcm_trigger" [sound/soc/omap/snd-soc-omap.ko] undefined! > make[1]: *** [__modpost] Error 1 > make: *** [modules] Error 2 I have sent a patch fixing this (which also affect other platforms as well): http://mailman.alsa-project.org/pipermail/alsa-devel/2012-October/055902.html -- Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> 2012-09-27 20:26 ` Tony Lindgren ` (2 preceding siblings ...) 2012-09-28 4:46 ` Mohammed, Afzal @ 2012-09-28 7:02 ` Felipe Balbi [not found] ` <1348815748-30072-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org> 2012-09-28 15:19 ` Help needed with remaining plat headers Jon Hunter 4 siblings, 1 reply; 19+ messages in thread From: Felipe Balbi @ 2012-09-28 7:02 UTC (permalink / raw) To: Tony Lindgren Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List, Linux USB Mailing List, Afzal Mohammed, jon-hunter, Omar Ramirez Luna, Felipe Balbi In order to make single zImage work for ARM architecture, we need to make sure we don't depend on private headers. Move USB platform_data to <linux/platform_data/omap-usb.h> and keep only internal functions in <plat/usb.h>. Signed-off-by: Felipe Balbi <balbi@ti.com> --- Compile tested only. arch/arm/mach-omap2/usb-host.c | 1 + arch/arm/mach-omap2/usb-musb.c | 1 + arch/arm/mach-omap2/usb-tusb6010.c | 1 + arch/arm/plat-omap/include/plat/usb.h | 126 +-------------------- drivers/mfd/omap-usb-host.c | 2 +- drivers/usb/musb/am35x.c | 3 +- drivers/usb/musb/musb_dsps.c | 3 +- drivers/usb/musb/omap2430.h | 2 +- .../linux/platform_data/omap-usb.h | 76 +++++-------- 9 files changed, 37 insertions(+), 178 deletions(-) copy arch/arm/plat-omap/include/plat/usb.h => include/linux/platform_data/omap-usb.h (72%) diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index dde8a11..9a85460 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c @@ -22,6 +22,7 @@ #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/dma-mapping.h> +#include <linux/platform_data/omap-usb.h> #include <asm/io.h> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index c4a5768..809e2d7 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -23,6 +23,7 @@ #include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/io.h> +#include <linux/platform_data/omap-usb.h> #include <linux/usb/musb.h> diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 805bea6..bc6c225 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -15,6 +15,7 @@ #include <linux/platform_device.h> #include <linux/gpio.h> #include <linux/export.h> +#include <linux/platform_data/omap-usb.h> #include <linux/usb/musb.h> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 548a4c8..6173467 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h @@ -3,82 +3,11 @@ #ifndef __ASM_ARCH_OMAP_USB_H #define __ASM_ARCH_OMAP_USB_H -#include <linux/io.h> -#include <linux/usb/musb.h> #include <plat/board.h> - -#define OMAP3_HS_USB_PORTS 3 - -enum usbhs_omap_port_mode { - OMAP_USBHS_PORT_MODE_UNUSED, - OMAP_EHCI_PORT_MODE_PHY, - OMAP_EHCI_PORT_MODE_TLL, - OMAP_EHCI_PORT_MODE_HSIC, - OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0, - OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM, - OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0, - OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM, - OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0, - OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM, - OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0, - OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM, - OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0, - OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM -}; - -struct usbhs_omap_board_data { - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; - - /* have to be valid if phy_reset is true and portx is in phy mode */ - int reset_gpio_port[OMAP3_HS_USB_PORTS]; - - /* Set this to true for ES2.x silicon */ - unsigned es2_compatibility:1; - - unsigned phy_reset:1; - - /* - * Regulators for USB PHYs. - * Each PHY can have a separate regulator. - */ - struct regulator *regulator[OMAP3_HS_USB_PORTS]; -}; +#include <linux/platform_data/omap-usb.h> #ifdef CONFIG_ARCH_OMAP2PLUS -struct ehci_hcd_omap_platform_data { - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; - int reset_gpio_port[OMAP3_HS_USB_PORTS]; - struct regulator *regulator[OMAP3_HS_USB_PORTS]; - unsigned phy_reset:1; -}; - -struct ohci_hcd_omap_platform_data { - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; - unsigned es2_compatibility:1; -}; - -struct usbhs_omap_platform_data { - enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; - - struct ehci_hcd_omap_platform_data *ehci_data; - struct ohci_hcd_omap_platform_data *ohci_data; -}; -/*-------------------------------------------------------------------------*/ - -struct omap_musb_board_data { - u8 interface_type; - u8 mode; - u16 power; - unsigned extvbus:1; - void (*set_phy_power)(u8 on); - void (*clear_irq)(void); - void (*set_mode)(u8 mode); - void (*reset)(void); -}; - -enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; - extern void usb_musb_init(struct omap_musb_board_data *board_data); extern void usbhs_init(const struct usbhs_omap_board_data *pdata); @@ -97,59 +26,6 @@ extern void am35x_musb_clear_irq(void); extern void am35x_set_mode(u8 musb_mode); extern void ti81xx_musb_phy_power(u8 on); -/* AM35x */ -/* USB 2.0 PHY Control */ -#define CONF2_PHY_GPIOMODE (1 << 23) -#define CONF2_OTGMODE (3 << 14) -#define CONF2_NO_OVERRIDE (0 << 14) -#define CONF2_FORCE_HOST (1 << 14) -#define CONF2_FORCE_DEVICE (2 << 14) -#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14) -#define CONF2_SESENDEN (1 << 13) -#define CONF2_VBDTCTEN (1 << 12) -#define CONF2_REFFREQ_24MHZ (2 << 8) -#define CONF2_REFFREQ_26MHZ (7 << 8) -#define CONF2_REFFREQ_13MHZ (6 << 8) -#define CONF2_REFFREQ (0xf << 8) -#define CONF2_PHYCLKGD (1 << 7) -#define CONF2_VBUSSENSE (1 << 6) -#define CONF2_PHY_PLLON (1 << 5) -#define CONF2_RESET (1 << 4) -#define CONF2_PHYPWRDN (1 << 3) -#define CONF2_OTGPWRDN (1 << 2) -#define CONF2_DATPOL (1 << 1) - -/* TI81XX specific definitions */ -#define USBCTRL0 0x620 -#define USBSTAT0 0x624 - -/* TI816X PHY controls bits */ -#define TI816X_USBPHY0_NORMAL_MODE (1 << 0) -#define TI816X_USBPHY_REFCLK_OSC (1 << 8) - -/* TI814X PHY controls bits */ -#define USBPHY_CM_PWRDN (1 << 0) -#define USBPHY_OTG_PWRDN (1 << 1) -#define USBPHY_CHGDET_DIS (1 << 2) -#define USBPHY_CHGDET_RSTRT (1 << 3) -#define USBPHY_SRCONDM (1 << 4) -#define USBPHY_SINKONDP (1 << 5) -#define USBPHY_CHGISINK_EN (1 << 6) -#define USBPHY_CHGVSRC_EN (1 << 7) -#define USBPHY_DMPULLUP (1 << 8) -#define USBPHY_DPPULLUP (1 << 9) -#define USBPHY_CDET_EXTCTL (1 << 10) -#define USBPHY_GPIO_MODE (1 << 12) -#define USBPHY_DPOPBUFCTL (1 << 13) -#define USBPHY_DMOPBUFCTL (1 << 14) -#define USBPHY_DPINPUT (1 << 15) -#define USBPHY_DMINPUT (1 << 16) -#define USBPHY_DPGPIO_PD (1 << 17) -#define USBPHY_DMGPIO_PD (1 << 18) -#define USBPHY_OTGVDET_EN (1 << 19) -#define USBPHY_OTGSESSEND_EN (1 << 20) -#define USBPHY_DATA_POLARITY (1 << 23) - #if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB) u32 omap1_usb0_init(unsigned nwires, unsigned is_device); u32 omap1_usb1_init(unsigned nwires); diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 41088ec..2faeee4 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -27,7 +27,7 @@ #include <linux/spinlock.h> #include <linux/gpio.h> #include <plat/cpu.h> -#include <plat/usb.h> +#include <linux/platform_data/usb.h> #include <linux/pm_runtime.h> #define USBHS_DRIVER_NAME "usbhs_omap" diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index 7a95ab8..9fdb8d0 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c @@ -33,8 +33,7 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> - -#include <plat/usb.h> +#include <linux/platform_data/omap-usb.h> #include "musb_core.h" diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 494772f..18b2eb6 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -36,13 +36,12 @@ #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <linux/module.h> +#include <linux/platform_data/omap-usb.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_address.h> -#include <plat/usb.h> - #include "musb_core.h" /** diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h index 40b3c02..5b78417 100644 --- a/drivers/usb/musb/omap2430.h +++ b/drivers/usb/musb/omap2430.h @@ -10,7 +10,7 @@ #ifndef __MUSB_OMAP243X_H__ #define __MUSB_OMAP243X_H__ -#include <plat/usb.h> +#include <linux/platform_data/omap-usb.h> /* * OMAP2430-specific definitions diff --git a/arch/arm/plat-omap/include/plat/usb.h b/include/linux/platform_data/omap-usb.h similarity index 72% copy from arch/arm/plat-omap/include/plat/usb.h copy to include/linux/platform_data/omap-usb.h index 548a4c8..d16d835 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/include/linux/platform_data/omap-usb.h @@ -1,11 +1,29 @@ -// include/asm-arm/mach-omap/usb.h - -#ifndef __ASM_ARCH_OMAP_USB_H -#define __ASM_ARCH_OMAP_USB_H +/* + * omap-usb.h - Platform data for the various OMAP USB IPs + * + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com + * + * This software is distributed under the terms of the GNU General Public + * License ("GPL") version 2, as published by the Free Software Foundation. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __LINUX_PLATFORM_DATA_OMAP_USB_H +#define __LINUX_PLATFORM_DATA_OMAP_USB_H #include <linux/io.h> #include <linux/usb/musb.h> -#include <plat/board.h> #define OMAP3_HS_USB_PORTS 3 @@ -44,8 +62,6 @@ struct usbhs_omap_board_data { struct regulator *regulator[OMAP3_HS_USB_PORTS]; }; -#ifdef CONFIG_ARCH_OMAP2PLUS - struct ehci_hcd_omap_platform_data { enum usbhs_omap_port_mode port_mode[OMAP3_HS_USB_PORTS]; int reset_gpio_port[OMAP3_HS_USB_PORTS]; @@ -64,6 +80,7 @@ struct usbhs_omap_platform_data { struct ehci_hcd_omap_platform_data *ehci_data; struct ohci_hcd_omap_platform_data *ohci_data; }; + /*-------------------------------------------------------------------------*/ struct omap_musb_board_data { @@ -77,25 +94,10 @@ struct omap_musb_board_data { void (*reset)(void); }; -enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; - -extern void usb_musb_init(struct omap_musb_board_data *board_data); - -extern void usbhs_init(const struct usbhs_omap_board_data *pdata); - -extern int omap4430_phy_power(struct device *dev, int ID, int on); -extern int omap4430_phy_set_clk(struct device *dev, int on); -extern int omap4430_phy_init(struct device *dev); -extern int omap4430_phy_exit(struct device *dev); -extern int omap4430_phy_suspend(struct device *dev, int suspend); - -#endif - -extern void am35x_musb_reset(void); -extern void am35x_musb_phy_power(u8 on); -extern void am35x_musb_clear_irq(void); -extern void am35x_set_mode(u8 musb_mode); -extern void ti81xx_musb_phy_power(u8 on); +enum musb_interface { + MUSB_INTERFACE_ULPI, + MUSB_INTERFACE_UTMI +}; /* AM35x */ /* USB 2.0 PHY Control */ @@ -150,24 +152,4 @@ extern void ti81xx_musb_phy_power(u8 on); #define USBPHY_OTGSESSEND_EN (1 << 20) #define USBPHY_DATA_POLARITY (1 << 23) -#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB) -u32 omap1_usb0_init(unsigned nwires, unsigned is_device); -u32 omap1_usb1_init(unsigned nwires); -u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup); -#else -static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device) -{ - return 0; -} -static inline u32 omap1_usb1_init(unsigned nwires) -{ - return 0; - -} -static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup) -{ - return 0; -} -#endif - -#endif /* __ASM_ARCH_OMAP_USB_H */ +#endif /* __LINUX_PLATFORM_DATA_OMAP_USB_H */ -- 1.7.12 ^ permalink raw reply related [flat|nested] 19+ messages in thread
[parent not found: <1348815748-30072-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>]
* Re: [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> [not found] ` <1348815748-30072-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org> @ 2012-09-28 15:13 ` Tony Lindgren 0 siblings, 0 replies; 19+ messages in thread From: Tony Lindgren @ 2012-09-28 15:13 UTC (permalink / raw) To: Felipe Balbi Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List, Linux USB Mailing List, Afzal Mohammed, jon-hunter-l0cyMroinI0, Omar Ramirez Luna * Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> [120928 00:08]: > In order to make single zImage work for ARM architecture, > we need to make sure we don't depend on private headers. > > Move USB platform_data to <linux/platform_data/omap-usb.h> The new standard seems to be subsystem-soc.h, so usb-omap.h :) > and keep only internal functions in <plat/usb.h>. Can the remaining parts be in #include "usb.h" in mach-omap2? Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Help needed with remaining plat headers 2012-09-27 20:26 ` Tony Lindgren ` (3 preceding siblings ...) 2012-09-28 7:02 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi @ 2012-09-28 15:19 ` Jon Hunter 4 siblings, 0 replies; 19+ messages in thread From: Jon Hunter @ 2012-09-28 15:19 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-omap, Afzal Mohammed, Felipe Balbi, Omar Ramirez Luna Hi Tony, On 09/27/2012 03:26 PM, Tony Lindgren wrote: > Please see below a status update on the remaining problem > plat headers. > > Note that all patches should be against current linux next > in this case. > [snip] >> dmtimer.h > > Jon, can you do a patch for dmtimer.h? Yes, I will look into this. Cheers Jon ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-10-01 9:32 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-20 23:29 Help needed with remaining plat headers Tony Lindgren
2012-09-21 9:06 ` Igor Grinberg
2012-09-21 18:46 ` Tony Lindgren
2012-09-27 9:57 ` Vutla, Lokesh
2012-09-27 19:58 ` Tony Lindgren
2012-09-28 8:54 ` Peter Ujfalusi
2012-09-28 10:05 ` Vutla, Lokesh
2012-09-27 10:07 ` Tomi Valkeinen
2012-09-27 19:57 ` Tony Lindgren
2012-09-27 20:26 ` Tony Lindgren
2012-09-27 20:31 ` Tony Lindgren
2012-09-27 20:33 ` Shilimkar, Santosh
2012-09-28 0:01 ` Tony Lindgren
2012-09-28 4:46 ` Mohammed, Afzal
2012-09-28 6:58 ` Vutla, Lokesh
2012-10-01 9:34 ` Peter Ujfalusi
2012-09-28 7:02 ` [PATCH] arm: omap: move OMAP USB platform data to <linux/platform_data/omap-usb.h> Felipe Balbi
[not found] ` <1348815748-30072-1-git-send-email-balbi-l0cyMroinI0@public.gmane.org>
2012-09-28 15:13 ` Tony Lindgren
2012-09-28 15:19 ` Help needed with remaining plat headers Jon Hunter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).