Help needed with remaining plat headers

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

[...]

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.

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.

OK great thanks,

Tony

Hi Tony,

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

I'll work on these ones.

Tomi

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

OK great that's good to hear.

Tony

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.

Paul posted patches for the clock headers.

I'll make common.h local.

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!

Lokesh will post patches for the dma*.h files.

Jon, can you do a patch for dmtimer.h?

I'll make fpga.h local to mach-omap1.

Afzal, can you do a patch for gpmc.h?

Will move to platform_data after defining register functions locally.

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.

Will move to platform_data.

Omar, can you please do a patch that makes mailbox.h suitable for include/linux/platform_data/mailbox-omap.h?

Will convert to be suitable for include/linux/platform_data.

Will convert to be suitable for include/linux/platform_data.

Will make multi.h local.

Will make omap_device.h and omap_hwmod.h local to mach-omap2.

Will fix up for platform_data/serial-omap.h.

Will make prcm.h and sdrc.h local to mach-omap2.

Will fix up for platform_data/serial-omap.h.

Will make sram.h local.

Will make tc.h local to mach-omap1.

Igor is looking into timex.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?

Felipe can you do a patch for this one?

Tomi will post patches for vr*.h files.

Regards,

Tony

Missed omap-pm.h and omap-secure.h, see below..

I think Kevin already has some patches to make this local?

Will make omap-secure.h local.

[..]

Will work with Lokesh to get this one sorted out along with dma. It can be made local to mach-omap2.

Regards
Santosh

OK thanks.

Tony

Hi Tony,

Yes, I will do it.

Regards
Afzal

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

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

---

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

index dde8a11..9a85460 100644
@@ -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>
 

index c4a5768..809e2d7 100644
@@ -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>
 

index 805bea6..bc6c225 100644
@@ -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>
 

index 41088ec..2faeee4 100644
@@ -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"

index 7a95ab8..9fdb8d0 100644
@@ -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"
 

index 494772f..18b2eb6 100644
@@ -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"
 
 /**

index 40b3c02..5b78417 100644
@@ -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

1.7.12

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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hi Peter,

Yes I am aware of this.
I am making patches on linux-next only

Thanks
Lokesh

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

The new standard seems to be subsystem-soc.h, so usb-omap.h :)

Can the remaining parts be in #include "usb.h" in mach-omap2?

Regards,

Tony

Hi Tony,

[snip]

Yes, I will look into this.

Cheers
Jon

Hi,

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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html