summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* omap4: Add auto-generated irq and dma headersSantosh Shilimkar2010-02-232-0/+291
| | | | | | | | | | | | | | | | | These files are generated along with the HWMOD and will eventually be in the existing header files as soon as all drivers will be migrate to omap_hwmod / omap_device. The dma-44xx.h and irqs-44xx.h file should be in 'arch/arm/mach-omap2/include/mach/', but omap1 and omap2plus common devices still share these defines and hence currently placed in plat-omap/include/plat/ directory. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3/4: Remove overlapping mapping of L4_WKUP io spaceSantosh Shilimkar2010-02-233-25/+0
| | | | | | | | | | | This patch removes the L4 wakeup io mapping section for omap3 and omap4. L4 wakeup space is part of 4MB L4 space which is already mapped and hence remove the overlapped mapping. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap4: Fix omap_type() for omap4Santosh Shilimkar2010-02-232-0/+5
| | | | | | | | | | This patch fixes the omap_type function to detect whether the device is GP or HS Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: sdma: Limit the secure reserve channel fix for omap3Santosh Shilimkar2010-02-231-1/+2
| | | | | | | | | | | | | | | | The commit 'ba50ea7e' reserves DMA channels 0 and 1 on high security devices, in order to avoid collision between kernel dma transfers and ROM code dma transfers. This fix is applicable only for OMAP3 so add an appropriate check. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> CC: Kalle Jokiniemi <kalle.jokiniemi@digia.com> CC: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap4: sdma: Enable the idle modes on omap4Santosh Shilimkar2010-02-231-1/+1
| | | | | | | | | | This patch enables smart-idle idlemodes and autoidle for sDMA on OMAP4 Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap2/3/4: ioremap omap_globals moduleSantosh Shilimkar2010-02-235-32/+57
| | | | | | | | | | | | | This is a clean-up patch towards dynamic allocation of IO space instead of using harcoded macros to calculate virtual addresses. Also update the sdrc, prcm and control module to allocate iospace dynamically Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3/4: uart: fix full-fifo write abortSantosh Shilimkar2010-02-231-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is addition to the already merged commit on non-empty uart fifo read abort. "ce13d4716a276f4331d78ba28a5093a63822ab95" OMAP3630 and OMAP4430 UART IP blocks have a restriction on TX FIFO too. If you try to write to the tx fifo when it is full, the system aborts. More details on this thread are here: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg19447.html This can be easily reproducible by not suppressing interconnect errors or long duration testing where continuous prints over console from multiple threads. This patch is addressing the issue by ensuring that write is not issued while fifo is full. A timeout is added to avoid any hang on fifo-full for 10 mS which is unlikely case. Patch is validated on OMAP3630 and OMAP4 SDP. V2 version removed the additional 1 uS on every TX as per Tony's suggestion Signed-off-by: Woodruff Richard <r-woodruff2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> CC: Ghorai Sukumar <s-ghorai@ti.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap4: multi-omap: Allow build to workSantosh Shilimkar2010-02-231-1/+3
| | | | | | | | | | | | | | | | The musb support is enabled in omap3 platforms. For omap4 only board support is available and the driver still isn't supported. Because of this build with omap3_defconfig used for multi-omap doesn't work on omap4430 sdp. This patch avoids usb_musb_init() by adding a cpu check in the board file. Thanks to Anand Gadiyar and Mankad Maulik for the suggestion of patching board file instead of musb driver. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ASoC: OMAP-McBSP: ASoC interface for McBSP sidetoneIlkka Koskinen2010-02-232-0/+140
| | | | | | | | | | | Add ASoC interface for OMAP McBSP2 and McBSP3 sidetones. Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* McBSP: OMAP3: Add sidetone featureEero Nurkkala2010-02-233-1/+463
| | | | | | | | | | | Add sidetone feature to McBSP instances 2 and 3 on OMAP3 based devices. Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: Add USB support to 4430 SDP board fileMaulik Mankad2010-02-233-2/+18
| | | | | | | | | | | | | | | | | | | | This patch adds support for Mentor USB to 4430 SDP board file. It also defines the base address for HS USB OTG controller in OMAP4. Also updates platform specfic structure with base address and IRQ details. Signed-off-by: Maulik Mankad <x0082077@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Felipe Balbi <felipe.balbi@nokia.com> Cc: David Brownell <david-b@pacbell.net> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: remove unnecessary returnFelipe Balbi2010-02-191-3/+1
| | | | | | | | trivial patch, no functional changes. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: remove unused dma dataFelipe Balbi2010-02-191-3/+0
| | | | | | | | | we don't use those anywhere on musb driver, so let's remove those old stuff. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: remove unused soft_con fieldFelipe Balbi2010-02-191-1/+0
| | | | | | | | remove unused data. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* arm: omap: musb: we can use clk frameworkFelipe Balbi2010-02-191-22/+0
| | | | | | | | | ... in order to handle musb's clock. Let's start removing the old musb-only set_clock function. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: remove unused dataFelipe Balbi2010-02-191-34/+0
| | | | | | | | eps_bits wasn't being used anywhere, let's remove it. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: Pass board specific data from board fileMaulik Mankad2010-02-1916-16/+109
| | | | | | | | | | | | | | | | | | Pass board specific data for MUSB (like interface_type, mode etc) from board file by defining board specific structure. Each board file can define this structure based on its requirement and pass this information to the driver. Signed-off-by: Maulik Mankad <x0082077@ti.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Felipe Balbi <felipe.balbi@nokia.com> Cc: David Brownell <david-b@pacbell.net> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Gupta Ajay Kumar <ajay.gupta@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* arm: omap: musb: ioremap only what's oursFelipe Balbi2010-02-191-1/+1
| | | | | | | | omap3430 TRM says the OTG address space is 4k, not 8k. Cc: linux-usb@vger.kernel.org Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: musb: Remove #ifdef from board-omap3evm.cMaulik Mankad2010-02-191-2/+2
| | | | | | | | | | | This patch removes #ifdef around usb_nop_xceiv_register() from board-omap3evm.c Signed-off-by: Maulik Mankad <x0082077@ti.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* USB: Add empty functions in otg.hMaulik Mankad2010-02-191-0/+10
| | | | | | | | | | | | | | | | | Add empty functions for usb_nop_xceiv_register() and usb_nop_xceiv_unregister() in otg.h so that these functions can be called even when CONFIG_NOP_USB_XCEIV is not enabled. It allows to remove ifdef's from board file. Signed-off-by: Maulik Mankad <x0082077@ti.com> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Ajay Kumar Gupta <ajay.gupta@ti.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP3EVM: PM: Update defconfigSanjeev Premi2010-02-191-2/+4
| | | | | | | | | | | This patch updates the omap3_evm_defconfig to select these options: * CONFIG_PM_DEBUG * CONFIG_DEBUG_FS * CONFIG_OMAP_SMARTREFLEX Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Add devkit8000_defconfigThomas Weber2010-02-191-0/+1889
| | | | | | | This patch adds a default config for the Timll Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Add minimal support for DevKit8000Thomas Weber2010-02-193-0/+697
| | | | | | | | | | | | These patches add board support for the Timll DevKit8000. The DevKit8000 is a beagle board clone from Timll, sold by armkits.com. The DevKit8000 has RS232 serial port, LCD, DVI-D, S-Video, Ethernet, SD/MMC, keyboard, camera, SPI, I2C, USB and JTAG interface. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* AM3517: Enable I2C-GPIO Expander driver support for AM3517EVMVaibhav Hiremath2010-02-191-2/+38
| | | | | | | | | | | | Add platform hook-up interface to support I2C based GPIo expander (TCA6416). There are 3 instances of I2C Expander on AM3517EVM, - One is over I2C-2 mounted on Base board - Two are over I2C3 mounted on UI Card Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* AM3517: Enable RTC driver support for AM3517EVMVaibhav Hiremath2010-02-191-0/+39
| | | | | | | Add platform hook-up interface to support RTC driver (S35390A). Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* AM3517: Enable basic I2C SupportVaibhav Hiremath2010-02-191-0/+11
| | | | | | | | Add basic I2C board Hook-up support, where all the 3 I2C instances are getting registered. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* IGEPv2: Use Red Led1 as Heartbeat if configuredJonas Zetterberg2010-02-191-2/+28
| | | | | | | If not configured it will be exported as normal GPIO led. Signed-off-by: Jonas Zetterberg <jozz@jozz.se> Signed-off-by: Tony Lindgren <tony@atomide.com>
* IGEPv2: Added WIFI supportJonas Zetterberg2010-02-191-0/+40
| | | | | | | | | Enabled VMMC2 LDO voltage regulator on TWL4030. Added GPIO's (power down and reset) for WIFI chip. Signed-off-by: Anders Hedlund <anders.j.hedlund@gmail.com> Signed-off-by: Jonas Zetterberg <jozz@jozz.se> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Update defconfig for IGEP v2 to allow new drivers andfeaturesEnric Balletbo i Serra2010-02-191-216/+309
| | | | | Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Use timing data for omap2_init_common_hw on IGEP v2Enric Balletbo i Serra2010-02-191-1/+2
| | | | | Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: SDRC: add timing data for Numonyx M65KxxxxAMEnric Balletbo i Serra2010-02-171-0/+51
| | | | | | | | Add timing data for the Numonyx M65KxxxxAM SDRAM chip, used on the IGEP v2 board. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Add support for flash on IGEP v2 boardEnric Balletbo i Serra2010-02-171-0/+101
| | | | | | | | This patch adds support for flashes on IGEP v2 boards. For now only OneNAND is supported. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Enable DSS2 for IGEP v2 boardEnric Balletbo i Serra2010-02-171-0/+75
| | | | | Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Add platform init code for EHCI driver on IGEP v2Enric Balletbo i Serra2010-02-171-0/+12
| | | | | | | Add platform init code for EHCI driver on IGEP v2 Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Fix typo on IGEP v2 boardEnric Balletbo i Serra2010-02-171-1/+1
| | | | | | | Fix typo on IGEP v2 board Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Add platform data for the twl4030_codec MFD on IGEP v2Enric Balletbo i Serra2010-02-171-0/+10
| | | | | | | Add platform data for the twl4030_codec MFD on IGEP v2 Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: pandora: update defconfigGrazvydas Ignotas2010-02-171-165/+513
| | | | | | | Enable DSS2 and update defconfig for current kernel. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: pandora: update regulator setupGrazvydas Ignotas2010-02-171-33/+78
| | | | | | | | | | Update pandora's regulator setup: - add new regulators: VAUX2, VAUX4 and VSIM - add new consumers: ads7846, nub controllers, USB PHY, audio DAC - use dev names instead of struct device pointers Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP: pandora: add DSS2 support and related regulatorsGrazvydas Ignotas2010-02-171-0/+111
| | | | | | | | | This patch adds configuration data for DSS2 and sets up display related regulators. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3evm: Configure GPIO175 for touchscreen PEN_IRQSanjeev Premi2010-02-171-1/+3
| | | | | | | | GPIO175 is used for PEN_IRQ on the EVM. This patch sets the mux settings for the same. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3evm: Fixes after moving to matrix_keypadSanjeev Premi2010-02-171-12/+15
| | | | | | | | | | | The keypad was not working properly after migrating to matrix_keypad. Swapped the row, col fields of the KEY() macro in the keymap definition to get it working again. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3evm: Add mux settings for keypadSanjeev Premi2010-02-171-0/+4
| | | | | | | | This patch sets SYS_NIRQ for keypad input. It also sets the same as a wakeup event from OFF mode. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: zoom3: enable ehci supportvikram pandita2010-02-171-0/+14
| | | | | | | | | Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy. GPIO_64 is connected to the PHY reset pin. Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Cc: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Merge branch 'omap-fixes-for-linus' into omap-for-linusTony Lindgren2010-02-17219-1393/+2611
|\
| * omap: Remove DEBUG_FS dependency for mux name checkingRanjith Lohithakshan2010-02-171-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for a valid mux name should be performed regardless of whether DEBUG_FS is enabled or not. Otherwise without DEBUG_FS, we get: Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 Internal error: Oops: 5 [#1] last sysfs file: Modules linked in: CPU: 0 Not tainted (2.6.33-rc8 #10) PC is at strcmp+0x18/0x40 LR is at omap_mux_init_signal+0x68/0x14c ... This fixes the issue currently seen with boards not booting up if DEBUG_FS is not enabled in defconfig. Note that the earlier ifndef + ifdef now becomes simpler ifdef else: If CONFIG_OMAP_MUX is selected, we use pin names. If it's not selected, we only want the GPIO to mux register mapping. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * Linux 2.6.33-rc8v2.6.33-rc8Linus Torvalds2010-02-121-1/+1
| |
| * Merge branch 'fix/hda' of ↵Linus Torvalds2010-02-121-6/+3
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - use WARN_ON_ONCE() for zero-division detection
| | * ALSA: hda - use WARN_ON_ONCE() for zero-division detectionTakashi Iwai2010-02-121-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Replace the zero-division warning message with WARN_ON_ONCE() per the advice by Linus. This shouldn't happen, but if it happens, it's possible that the bug happens often due to buggy IRQs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | Merge branch 'for-linus' of ↵Linus Torvalds2010-02-128-142/+332
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: hold ref on flip object until it completes drm/i915: Fix crash while aborting hibernation drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls. drm/i915: fix pipe source image setting in flip command drm/i915: fix flip done interrupt on Ironlake drm/i915: untangle page flip completion drm/i915: handle FBC and self-refresh better drm/i915: Increase fb alignment to 64k drm/i915: Update write_domains on active list after flush. drm/i915: Rework DPLL calculation parameters for Ironlake
| | * | drm/i915: hold ref on flip object until it completesJesse Barnes2010-02-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent things from falling over if the user frees the flip buffer before we complete the flip, since we'll hold an internal reference. Reported-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Eric Anholt <eric@anholt.net>
OpenPOWER on IntegriCloud