Tony Lindgren [Wed, 4 Aug 2010 15:33:20 +0000 (18:33 +0300)]
Merge for-next
Conflicts:
arch/arm/mach-omap2/board-n8x0.c
Tony Lindgren [Wed, 4 Aug 2010 15:33:05 +0000 (18:33 +0300)]
Merge omap-testing
Tony Lindgren [Wed, 4 Aug 2010 15:33:03 +0000 (18:33 +0300)]
Merge cbus
Tony Lindgren [Wed, 4 Aug 2010 15:32:20 +0000 (18:32 +0300)]
USB: Remove omap_cfg_reg for 2430
This is to fix compile with the new mux code.
Felipe has a similar patch queued up.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Ajay Kumar Gupta [Wed, 4 Aug 2010 15:32:20 +0000 (18:32 +0300)]
usb: host: ehci: fix missing kfree in remove path also
Added missing kfree() in ehci_hcd_omap_remove().
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 4 Aug 2010 13:10:38 +0000 (16:10 +0300)]
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus
Conflicts:
arch/arm/mach-omap1/devices.c
Felipe Contreras [Fri, 11 Jun 2010 15:51:49 +0000 (15:51 +0000)]
omap: mailbox: reorganize headers
Remove kernel.h and module.h since they are not used correctly anyway.
Also, remove device.h since it comes along with platform_device.h
(always will I guess).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:48 +0000 (15:51 +0000)]
omap: mailbox: standarize on 'omap-mailbox'
omap{1,2}-mailbox are modules that provide the 'omap-mailbox' driver.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:47 +0000 (15:51 +0000)]
omap: mailbox: only compile for configured archs
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:46 +0000 (15:51 +0000)]
omap: mailbox: simplify omap_mbox_register()
No need to dynamically register mailboxes one by one.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:45 +0000 (15:51 +0000)]
omap: mailbox: reorganize registering
It's more extensible this way.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:44 +0000 (15:51 +0000)]
omap: mailbox: add IRQ names
Will be useful to identify them later.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:43 +0000 (15:51 +0000)]
omap: mailbox: remove unecessary fields
Nobody is using them.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:42 +0000 (15:51 +0000)]
omap: mailbox: don't export unecessary symbols
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:41 +0000 (15:51 +0000)]
omap: mailbox: update omap1 probing
Based on omap2 code.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:40 +0000 (15:51 +0000)]
omap: mailbox: use correct config for omap1
CONFIG_OMAP_DSP is not in mainline, CONFIG_OMAP_MBOX_FWK is.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:39 +0000 (15:51 +0000)]
omap: mailbox: 2420 should be detected at run-time
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:38 +0000 (15:51 +0000)]
omap: mailbox: reorganize structures
OMAP4 ones messed up the organization.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Felipe Contreras [Fri, 11 Jun 2010 15:51:37 +0000 (15:51 +0000)]
omap: mailbox: trivial cleanups
And fix a few compilation warnings.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Hiroshi DOYU [Tue, 18 May 2010 13:15:32 +0000 (16:15 +0300)]
omap mailbox: Set a device in logical mbox instance for traceability
With this patch, you'll get the following sysfs directories. This
structure implies that a single platform device, "omap2-mailbox" holds
multiple logical mbox instances. This could be the base to add sysfs
files for each logical mboxes. Then userland application can access a
mbox through sysfs entries if necessary(ex: setting kfifo size
dynamically)
~# tree -d -L 2 /sys/devices/platform/omap2-mailbox/
/sys/devices/platform/omap2-mailbox/
|-- driver -> ../../../bus/platform/drivers/omap2-mailbox
|-- mbox
| |-- dsp <- they are each instances of logical mailbox.
| |-- ducati
| |-- iva2
| |-- mbox01
| |-- mbox02
| |-- mbox03
| |-- .....
| `-- tesla
|-- power
`-- subsystem -> ../../../bus/platform
This was wrongly dropped by:
commit
c7c158e57bce6220644f2bcd65d82e1468aa40ec
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Ohad Ben-Cohen [Wed, 5 May 2010 15:33:09 +0000 (15:33 +0000)]
omap: mailbox: convert block api to kfifo
The underlying buffering implementation of mailbox
is converted from block API to kfifo due to the simplicity
and speed of kfifo.
The default size of the kfifo buffer is set to 256 bytes.
This value is configurable at compile time (via
CONFIG_OMAP_MBOX_KFIFO_SIZE), and can be changed at
runtime (via the mbox_kfifo_size module parameter).
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Ohad Ben-Cohen [Wed, 5 May 2010 15:33:08 +0000 (15:33 +0000)]
omap: mailbox: remove (un)likely macros from cold paths
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Ohad Ben-Cohen [Wed, 5 May 2010 15:33:07 +0000 (15:33 +0000)]
omap: mailbox cleanup: split MODULE_AUTHOR line
use multiple MODULE_AUTHOR lines for multiple authors
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Ohad Ben-Cohen [Wed, 5 May 2010 15:33:06 +0000 (15:33 +0000)]
omap: mailbox: convert rwlocks to spinlock
rwlocks are slower and have potential starvation issues
therefore spinlocks are generally preferred.
see also: http://lwn.net/Articles/364583/
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Kanigeri Hari <h-kanigeri2@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Fernando Guzman Lugo [Mon, 8 Feb 2010 19:35:40 +0000 (13:35 -0600)]
Mailbox: disable mailbox interrupt when request queue
when blk_get_request fails to get the request it is returning
without read the message from the mailbox fifo, then when it
leaves the isr and interruption is trigger again and again and
the workqueue which get elements from the request queue is never
executed and the kernel is stuck and shows a softlockup message.
Now the mailbox interrupt is disabled when request queue is full
and enabled when it pop a elememt form the request queue.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Hiroshi DOYU [Thu, 18 Feb 2010 06:48:55 +0000 (00:48 -0600)]
Mailbox: new mutext lock for h/w mailbox configuration
mailbox startup and shutdown are being executed against
a single H/W module, and a mailbox H/W module is totally
__independent__ of the registration of logical mailboxes.
So, an independent mutext should be used for startup and
shutdown.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Fernando Guzman Lugo [Thu, 28 Jan 2010 02:04:02 +0000 (20:04 -0600)]
Mailbox: Check valid registered callback before calling
This patch checks if the mailbox user has assinged a valid
callback fuction before calling it.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Fernando Guzman Lugo [Sat, 13 Feb 2010 01:07:14 +0000 (19:07 -0600)]
Mailbox: flush pending deferred works before freeing blk queue
flush pending deferred works before freeing blk_queue to prevent
any attempt of access to blk_queue after it was freed
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Fernando Guzman Lugo [Sat, 13 Feb 2010 01:02:32 +0000 (19:02 -0600)]
Mailbox: free mailbox interrupt before freeing blk queue
Free interrupt before freeing blk_queue to avoid
any attempt of access to blk_queue after it was freed.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Vincent Sanders [Tue, 3 Aug 2010 20:19:21 +0000 (21:19 +0100)]
Remove ARM default configurations which duplicate omap3_defconfig
These configurations are no longer useful as the systems they support
are covered by the generic omap3_defconfig
Signed-off-by:Vincent Sanders <vince@simtec.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Anand Gadiyar [Wed, 14 Jul 2010 13:38:49 +0000 (13:38 +0000)]
omap: 3630: disable TLL SAR on 3630 ES1
USBTLL Save-and-Restore is broken in 3630 ES1.0. Having it
enabled could result in incorrect register restores as
the OMAP exits off-mode. This could potentially result in
unexpected wakeup events.
(Refer 3630 errata ID i579)
This is fixed in ES1.1. So disable it for ES1.0s.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Anand Gadiyar [Tue, 3 Aug 2010 19:59:24 +0000 (19:59 +0000)]
OMAP3630: Add ES1.1 and ES1.2 detection
Add revision detection for ES1.1 and ES1.2. Set default
revision as ES1.2.
Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later.
This is needed for at least one feature that is broken in
3630ES1.0 but exists on older (3430 ES3.1) and newer revisions.
Additionally, update some of the CHIP_GE_* macros to use other
macros for ease of maintenance.
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Manjunatha GK <manjugk@ti.com>
[tony@atomide.com: update to remove fallthrough handling]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Artem Bityutskiy [Mon, 12 Jul 2010 13:38:07 +0000 (13:38 +0000)]
omap: device: improve errors handling
Do not forget to check the 'platform_device_add_data()' error code
in 'omap_device_build_ss()'.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: Nishanth Menon <nm@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 4 Aug 2010 11:43:45 +0000 (14:43 +0300)]
Merge branch 'devel-map-io' into omap-for-linus
Mike Rapoport [Wed, 4 Aug 2010 11:43:18 +0000 (14:43 +0300)]
omap3: introduce omap3_map_io
Most OMAP3-based boards use exactly the same code for .map_io method in
the machine_desc structure.
This patch introduces omap3_map_io and updates board-* files to use it
as .map_io method.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sergio Aguirre [Wed, 4 Aug 2010 11:43:18 +0000 (14:43 +0300)]
omap3: Unify omap2_set_globals_3[43,6x]x functions
The only difference between them is the physical address of the
uart4 port, which is only present in 36xx chips.
We don't really need to care about keeping these 2 functions, since
the decision to use uart4 is more cleanly done later when we do have
access to omap_revision variable.
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
[tony@atomide.com: added comment for the uart4_phys]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Jason Wang [Tue, 3 Aug 2010 03:44:18 +0000 (11:44 +0800)]
omap: Fix DEBUG_LL uart to access phys addr when MMU isn't enable
Now we use a memory address to store the debug port info, So we need
to read/write this address when we choose DEBUG_LL. When MMU isn't
enable(I.E. the begining part of init stage of the linux kernel boot),
we need to access physical address instead of virtual address,
otherwise the kernel will crash.
Signed-off-by: Jason Wang <jason77.wang@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Wed, 4 Aug 2010 05:46:24 +0000 (08:46 +0300)]
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Linus Torvalds [Tue, 3 Aug 2010 21:31:24 +0000 (14:31 -0700)]
Merge branch 'devel' of /home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits)
ARM: AMBA: Add pclk support to AMBA bus infrastructure
ARM: 6278/2: fix regression in RealView after the introduction of pclk
ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128
ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY
ARM: 6246/1: mmci: support larger MMCIDATALENGTH register
ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants
ARM: 6244/1: mmci: add variant data and default MCICLOCK support
ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback
ARM: 6274/1: add global control registers definition header file for nuc900
mx2_camera: fix type of dma buffer virtual address pointer
mx2_camera: Add soc_camera support for i.MX25/i.MX27
arm/imx/gpio: add spinlock protection
ARM: Add support for the LPC32XX arch
ARM: LPC32XX: Arch config menu supoport and makefiles
ARM: LPC32XX: Phytec 3250 platform support
ARM: LPC32XX: Misc support functions
ARM: LPC32XX: Serial support code
ARM: LPC32XX: System suspend support
ARM: LPC32XX: GPIO, timer, and IRQ drivers
ARM: LPC32XX: Clock driver
...
Helge Deller [Mon, 2 Aug 2010 20:46:41 +0000 (22:46 +0200)]
PARISC: led.c - fix potential stack overflow in led_proc_write()
avoid potential stack overflow by correctly checking count parameter
Reported-by: Ilja <ilja@netric.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Tony Lindgren [Tue, 6 Jul 2010 07:50:31 +0000 (10:50 +0300)]
cbus: Fix compile for 770
Recent changes changed omap_otg_init. Rename tahvo specific init
to tahvo_usb_init to avoid the following error:
tahvo-usb.c:151: error: conflicting types for 'omap_otg_init'
include/plat/usb.h:95: error: previous declaration of 'omap_otg_init' was here
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Sat, 1 May 2010 18:01:10 +0000 (18:01 +0000)]
cbus: switch kmalloc() + memset() to kzalloc()
no functional changes, just using kzalloc().
compile tested with n8x0_defconfig and n770_defconfig
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Sat, 1 May 2010 18:01:09 +0000 (18:01 +0000)]
cbus: fix compilation with current mainline
commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 broke
compilation of the retu-pwrbutton driver when it dropped
implicit inclusion of slab.h and gfp.h.
Fix it by including slab.h on retu-pwrbutton.c, while at
that, also include slab.h on retu-rtc.c to avoid later
problems with implicit inclusion of that being dropped.
Compile tested with n770_defconfig and n8x0_defconfig
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 27 Apr 2010 01:23:31 +0000 (18:23 -0700)]
cbus: retu-wdt: misc cleanup on retu-wdt driver
a trivial cleanup on the driver. No functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:23:26 +0000 (18:23 -0700)]
cbus: retu-wtd: convert to platform_driver
trivial patch converting a device_driver into
platform_driver.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:23:15 +0000 (18:23 -0700)]
cbus: retu-wdt: remove the platform_device
it now comes from retu.c, so use that.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:23:09 +0000 (18:23 -0700)]
cbus: retu-rtc: switch to rtc class device
remove the old syfs interface and move to rtc class
device registration.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:23:04 +0000 (18:23 -0700)]
cbus: retu-rtc: make checkpatch.pl happy
trivial changes to make checkpatch.pl happy.
No functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:58 +0000 (18:22 -0700)]
cbus: retu-rtc: move retu_rtc_barrier up on source code
... and drop the function prototype.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:52 +0000 (18:22 -0700)]
cbus: retu-rtc: get rid of globals
allocate everything we need on demand and get rid
of global variables.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:46 +0000 (18:22 -0700)]
cbus: retu-rtc: split MODULE_AUTHOR into several entries
it's easier to read, no functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:41 +0000 (18:22 -0700)]
cbus: retu-rtc: convert to platform_driver
still needs work, but it's now using platform_driver
structure.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:36 +0000 (18:22 -0700)]
cbus: retu-rtc: remove platform_device code
that comes from retu.c now.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:18 +0000 (18:22 -0700)]
cbus: retu-headset: simplify module_init
it's enough to have it as:
return platform_driver_register();
in case of failure, platform code should print
any necessary info.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:12 +0000 (18:22 -0700)]
cbus: retu-pwrbutton: convert to platform_driver
now that we allocate the platform_devices in retu.c
we can convert this driver to platform_driver.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:07 +0000 (18:22 -0700)]
cbus: retu: allocate platform_device for Retu's children
after this patch, Retu's children can start moving to
platform_driver infrastructure.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:22:01 +0000 (18:22 -0700)]
cbus: tahvo: convert to platform_driver
cleanup a bit and start preparing for splitting
platform_device from platform_driver.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:56 +0000 (18:21 -0700)]
cbus: tahvo: convert printk into dev_*
during probe() we have a device * available so we
can use dev_* macros instead of printk.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:51 +0000 (18:21 -0700)]
cbus: tahvo: don't assign ret inside if ()
change codying style, no functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:45 +0000 (18:21 -0700)]
cbus: tahvo: move EXPORT_SYMBOL macros closer to functions
No functional changes but it avoids having to look for which
symbols are exported.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:39 +0000 (18:21 -0700)]
cbus: tahvo: split MODULE_AUTHOR into several entries
it's easier to read. No functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:33 +0000 (18:21 -0700)]
cbus: retu: convert to a platform_driver
preparing this driver for mainline. Convert into
a platform_driver and prepare to split platform_device
code from platform_driver code.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:28 +0000 (18:21 -0700)]
cbus: retu: convert printk to dev_*
during probe(), we have a dev * available, and we
can use that for pretty printing with dev_* macros.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:22 +0000 (18:21 -0700)]
cbus: retu: don't assing ret inside the if ()
better coding style.
Change:
if ((ret = driver_register(&retu_driver)))
into:
ret = driver_register(&retu_driver);
if (ret)
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:16 +0000 (18:21 -0700)]
cbus: retu: split one MODULE_AUTHOR into several
it's easier to read anyways.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:07 +0000 (18:21 -0700)]
cbus: retu: fix compile breakage on retu-headset
when building retu-headset as a module, we need to
export retu_set_clear_reg_bits() and retu_read_adc().
While at that, also move the EXPORT_SYMBOL() macros
closer to the function definitions.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:21:01 +0000 (18:21 -0700)]
cbus: retu-wdt: fix compile breakage
fix compile breakage on retu-wdt driver.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:56 +0000 (18:20 -0700)]
cbus: add kerneldoc
trivial patch, no functional changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:50 +0000 (18:20 -0700)]
cbus: introduce cbus_send/receive_data wrappers
encapsulate the for loop on those wrappers and
make the code easier to follow.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:43 +0000 (18:20 -0700)]
cbus: handle possible errors on cbus_send/receive_bit
gpio_direction_input might fail and we have
to handle that possibility. While at that,
also add the device pointer to struct cbus_host
and use that for printing debugging messages and
make cbus_receive_bit return int.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:36 +0000 (18:20 -0700)]
cbus: move cbus_host definition to C source
no-one else besides cbus.c wants to deal with
struct cbus_host, so move the definition to
the C source interested in it.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:29 +0000 (18:20 -0700)]
cbus: fix a resource leakage
sel_gpio was never freed on previous code, free it.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:22 +0000 (18:20 -0700)]
cbus: don't type case when issuing read/write
avoid type casting, fix the types used.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:16 +0000 (18:20 -0700)]
cbus: add read/write flag to cbus_transfer
don't do magic tricks with the data to be written, it's simpler
to pass down a flag which will for sure tell us if we're reading
or writing.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:10 +0000 (18:20 -0700)]
cbus: no ternary on return
data is reset to 0 if is_read is true. No need
to use ternary operator before returning.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:20:02 +0000 (18:20 -0700)]
cbus: rely on gpiolib
don't define our own concurrent accesses to gpio banks
if we already have gpiolib to handle that.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:19:54 +0000 (18:19 -0700)]
cbus: don't export the global cbus_host variable
we can keep it static to cbus.c and refer to it when
calling cbus_transfer().
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:19:47 +0000 (18:19 -0700)]
cbus: checkpatch.pl fix on cbus.c
make checkpatch.pl (almost) happy.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:19:41 +0000 (18:19 -0700)]
cbus: NULL global variable on exit
just to be sure, let's set it to NULL.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Felipe Balbi [Tue, 27 Apr 2010 01:19:35 +0000 (18:19 -0700)]
cbus: convert u32 base to void __iomem *base
to avoid casting later, pass the parameter of the
correct type already.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Alexander Shishkin [Wed, 21 Apr 2010 14:26:07 +0000 (14:26 +0000)]
cbus: fix comilation breakage
Just tried to build n8x0_defconfig on the current master and
got cbus failing to compile due to implicit kzalloc() (and
others from slab.h) references. I'm not sure that including
slab.h directly is the right thing to do here, though.
Signed-off-by: Alexander Shishkin <ash@koowaldah.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Francisco Alecrim [Tue, 3 Aug 2010 09:10:02 +0000 (12:10 +0300)]
n8x0_defconfig: active cbus, retu-wd and omap-wd
It's critical for correct n8x0 operation. Device turn power-off after some
seconds without these options.
Signed-off-by: Francisco Alecrim <alecrim@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:10:01 +0000 (12:10 +0300)]
cbus: Fix tahvo init without cbus
Basically don't even try to use it except on Nokia boards.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:10:00 +0000 (12:10 +0300)]
cbus: Fix init on boards with no cbus
This really should get fixed by converting cbus to
use drivers/mfd.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:10:00 +0000 (12:10 +0300)]
cbus: Fix compile if not selected
Fix compile if not selected
Signed-off-by: Tony Lindgren <tony@atomide.com>
Francisco Alecrim [Tue, 3 Aug 2010 09:10:00 +0000 (12:10 +0300)]
fix compile for tahvo-usb.c
drivers/cbus/tahvo-usb.c:138: undefined reference to 'usb_bus_start_enum'
usb_bus_start_enum only exported if USB_OTG enabled
Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:59 +0000 (12:09 +0300)]
cbus: add platform_data to pass gpios
also add the platform_data to the related
board files.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:59 +0000 (12:09 +0300)]
cbus: move to platform_driver
also add the platform_device to 770 and n8x0 board files.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:56 +0000 (12:09 +0300)]
cbus: separate into several MODULE_AUTHOR entries
will look cleaner on modinfo.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:55 +0000 (12:09 +0300)]
cbus: move EXPORT_SYMBOL close to its exported symbols
while there, also add a missing static to cbus_bus_init().
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:55 +0000 (12:09 +0300)]
cbus: switch to kzalloc
change kmalloc() + memset() to kzalloc(), no functional
changes.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Felipe Balbi [Tue, 3 Aug 2010 09:09:54 +0000 (12:09 +0300)]
cbus: tahvo-usb: make it build again
plenty of legacy code sitting there. Make it build
again. Later patches will come to clean that up.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:09:54 +0000 (12:09 +0300)]
cbus: Make retu watchdog behave like a standard Linux watchdog
Make retu watchdog behave like a standard Linux watchdog.
Let the kernel do the kicking until the watchdog device is opened.
Note: We should remove the old non-standard interface, please
change to use standard /dev/watchdog instead.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:09:54 +0000 (12:09 +0300)]
cbus: Fix compile and don't try to use tag
Fix compile and don't try to use tag
This should be really passed as platform_data from
the board-*.c files.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 3 Aug 2010 09:09:53 +0000 (12:09 +0300)]
omap: Search and replace headers to use plat
Search and replace headers to use plat
Signed-off-by: Tony Lindgren <tony@atomide.com>
Juha Yrjola [Tue, 3 Aug 2010 09:09:53 +0000 (12:09 +0300)]
omap: Add drivers/cbus support
CBUS is the bus that Energy Management ASICs are connected to on
some Nokia mobile devices. Added support for CBUS and two EM ASIC
drivers.
This commit is a merge of all the commits that were in the linux-omap
tree:
aae6da6d5f09307b1feb391a47d1ddb6bf2d523e CBUS: Switch to gpio_request/free calls
702e65cebefe0af8ac4a648286f229947f3e1b68 cbus build fixes
f03fdeddbbaafb57f0f62629a316036f270a973d use gpio_to_irq (OMAP tree only)
570f10b7d3aaa3d542b749622df2a1f86e54ebc3 use gpio_direction_output (OMAP tree only)
d59842e6881e8f58cb17de5c0d11866796347d50 use gpio_direction_input (OMAP tree only)
7270f33b7b0139f40fcfbf771dc5ec5a773a71cd use standard gpio get/set calls (OMAP tree only)
f228a725b975832ac5771ab2fc86d06bd694cdb3 ARM: OMAP: Remove io_p2v, use ioremap and XXX_IO_ADDRESS
fdee8764947cde1e6933e7d981ce5b9de00e83e6 Merge current mainline tree into linux-omap tree
5061bcd119547453b32c847d2b9490a052bc1755 Merge mainline v2.6.27-rc2 tree into linux-omap tree
2d46b9c984d1c862f2525b4d0cabcb092f77ac64 CBUS: A workaround for ADC S/H HW bug: always keep ch 8 selected when S/H is used
648f41f57c2bfa7152f0760ca29a1e9dac566ca4 USB: Change omap USB code to use omap_read/write instead of __REG for multi-omap
d305c615bb7f85d49788a4ed28cb6aace2317ab7 ARM: OMAP: Misc compile fixes
bfbd53fcc738ff33ebcf91bc3ef25ae637cc4175 CBUS: Checkpatch.pl fixes for retu-wdt.c
2d28be5848928fbb17952e8eb5295fb506e0c40e CBUS: Fix retu mutex handling
7faa6dd4ae4db44f9c3142484266e17080314d79 CBUS: Fix retu-headset driver by not using removed input_dev->private field
8964c7d13133723ef2fe6a2b798a3fd336b15f4e ARM: OMAP: Add return value check for input_register_device()
2cf7bc8a039d6a6b4558c8c3a319ea15eccab60c CBUS: Fix retu-headset driver by not using removed input_dev->cdev field
97b705ad835f1481270c4b67b402d6e37fa8ad15 ARM: OMAP: Misc compile fixes after syncing with mainline
488de021a75771df95473c85bfaa9c8f1c9db659 tahvo-usb: compile fix usb/gadget.h
d079a1c74ea46f75cc406838c45652b97205e6be CBUS: Do not BUG_ON in retu-headset in case of spurious release event
074e3419440ba83e659be554f827e928826b512d CBUS: Fix reentrant issues in retu-headset driver
9afd4b705891e8afd505ecabec25539b22416d7a CBUS: Manage bias voltage in retu-headset suspend/resume code
0de1ae4b1cee28514dec435bf58c4b5960dfb4e1 CBUS: Cleanup retu-headset driver
dff99b718dffb5c041c99eebb3607f411d377f4d ARM: OMAP: Misc compile fixes after updating to current mainline tree
e0f2c271e0e3feaab8f8190b39876683099d3f6a ARM: OMAP: Fix inconsistency of completion in retu-rtc
6cda72c73944cc50250b3ae959174b6778d5e19f ARM: OMAP: Fix USB compilation for N770 defconfig
d041f80e997ff7c21b14fdee920a034e576aa226 CBUS: Add driver for Retu/Vilma headset detection
699d8412c1bf505f24d1a2048b49b8ffd8fe1d00 ARM: OMAP: Clean up bitrot to sync with mainline
ba9ca80b6468c5500a84a5c5e84383a6925a0bc3 ARM: OMAP: Convert driver interrupt flags SA_* to IRQF_*
7adeaaa4390dff8dcd4e44e6bcb144befcc2816f ARM: OMAP: Workqueue changes for retu-rtc
708739a058a59b76f72062bda81fb961e05d61e8 ARM: OMAP: Workqueue changes for tahvo-usb
995dda5fa21c77d337fa2fc07914ecb15cd08e54 ARM: OMAP: Fix warnings in N770 build
e2f0b012fd0fc16899dcdabc0b43fabdfdadcd8c ARM: OMAP: Fix broken N770 build (tahvo-usb)
d5c772f519236d8683b460e5da37f4a943ca4aae Fix some pt_regs users
229b59cdb41742aa4aee3628962af6ef2c4d944a Sync with mainline: Get rid of unnecessary pt_regs
b983452be56be4169233c34be1134e8030be674b Sync with mainline: Get rid of <#include linux/config.h>
77845293a4eb6cfea806ecc74ea9988c044a76bc CBUS: Retu: add atomic set and clear register bits function
d2db44bd92af99576cdf976f7dfc95f54884b14d CBUS: Tahvo: add atomic set and clear register bits function
e19cba0ecf9dd2d9adfdba175e335aebe973023a CBUS: Enable suspend wakeup for Retu IRQ
8c81aa40bea255769f13449dfb7699552ddb8438 Merge source.mvista.com:/home/git/linux-omap-2.6
1230366a669d16c7a292586adc7ab0725395f5b4 Manual merge to make things compile after updating to 2.6.18-rc4
6b411907432fe97bce3e6a253f6b98ab6c105efc CBUS: turn off tahvo-usb OTG idle mode during enabling
e3b2a7b6c6bcb4d6e839695fdac3e23b86046f98 CBUS: Make Retu RTC and Tahvo USB drivers use sysfs_notify
fe3702054f6412aea04373ceb9d27a4a417ff3f0 OMAP: Fix USB on Nokia 770
9c926661738080ee298bc3a51240dd102973fa61 [PATCH] ARM: OMAP: tahvo_user: sem2mutex conversion
ea90ef431139e4ac40b1d08726f45283f98d50ef [PATCH] ARM: OMAP: tahvo usb: sem2mutex conversion
06563a863d399ab6a3a5c104ddf086030f33b6f6 [PATCH] ARM: OMAP: retu-user: sem2mutex conversion
72a222f41989a4b8ad8cddf62c47608ad2e9e358 [PATCH] ARM: OMAP: retu-rtc: sem2mutex conversion
7508d984603f5ce3cb6883c229c97ed0a35d24c6 [PATCH] CBUS: Fix tahvo-usb omap_otg_remove
07f4f04763e2ff4333d44bec438d4bacbea0b4ae CBUS: Convert Retu power button driver to use input_allocate_device()
c604ff0bb1bbd3c6bf14bb9e5cae67c5a89e4ece cbus: Update tahvo-usb for kernel API changes.
f5c9432bb9bd44968cb785e3bb8aad95d6af3431 [PATCH] ARM: OMAP: gpio-switch and retu-rtc kobject_uevent() fixes
517df76f9295ac1865494476e8b531c65232dc5a ARM: OMAP: Replace clock.h with clk.h
93cb1e87df6ac03d315c0408634831e7db898a77 ARM: OMAP: Support for new Retu chips
480a299b3f3a5302f068fb7e3c68069ab3d355a5 ARM: OMAP: Support for 7-bit backlight register on new Tahvo chips
19deb6846965d9fdd5a87cae3593a953ccfea778 ARM: OMAP: Add CBUS support
Thomas Weber [Fri, 9 Jul 2010 07:40:53 +0000 (07:40 +0000)]
OMAP2: powerdomain: Add break in switch statement
Add a missing break at end of switch statement. At the moment it is a
fall through to WARN_ON(1) and return -EEXIST.
Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sukumar Ghorai [Fri, 9 Jul 2010 14:27:51 +0000 (14:27 +0000)]
omap3: add support for NAND on LDP board
patch adds NAND support to LDP board.
Signed-off-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sukumar Ghorai [Fri, 9 Jul 2010 14:27:50 +0000 (14:27 +0000)]
omap-3630-sdp : Add support for Flash
add support for NAND, OneNAND, NOR on omap 3630-sdp board.
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sukumar Ghorai [Fri, 9 Jul 2010 14:27:49 +0000 (14:27 +0000)]
omap3: add support for NAND on zoom3 board
patch adds NAND support to zoom3 board.
Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
git.openpandora.org / pandora-kernel.git / log