summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* omap4: Move SOC specific code from board fileSantosh Shilimkar2010-05-207-54/+101
| | | | | | | | | | This patch moves OMAP4 soc specific code from 4430sdp board file. The change is necessary so that newer board support can be added with minimal changes. This will be also problematic for multi-board, multi-omap builds. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP4: Networking: Defconfig SupportAbraham Arce2010-05-201-2/+55
| | | | | | | | | | | | | | | Enable KS8851 SPI support + Networking Support - Packet Socket - TCP/IP Network Filesystems - NFS Client - Root Filesystem on NFS Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP4: Ethernet: KS8851 Board SupportAbraham Arce2010-05-201-0/+81
| | | | | | | Enable Micrel KS8851 SPI network chip for OMAP4430 Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: hsmmc: fix the hsmmc driver for am3517stanley.miao2010-05-202-6/+25
| | | | | | | | AM3517 don't have the register OMAP343X_CONTROL_PBIAS_LITE and the regulators like "vmmc", so we set a noop "set_power" function for it. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: init the gpio pinmux for mmcstanley.miao2010-05-201-0/+9
| | | | | | | | | There is two gpio for mmc use, one is for card detecting, another is used for checking write protect. Intialize its pinmux in case the bootloader doesn't set it. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: DMA: Fix multi-line commentsmanjugk manjugk2010-05-201-6/+12
| | | | | | | | | Multi line comments are fixed as per CodingStyle guidelines. Cc: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Manjunatha GK <manjugk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP2/3/4: DMA: disable channel interrupts in omap_init_dma()Mika Westerberg2010-05-201-8/+19
| | | | | | | | | | | | | | | | | | | If we are softbooting another kernel using kexec, DMA controller state is not known when we are performing omap_init_dma(). It is possible that some DMA channels are already active. For example after kexec we get: <4>IRQ 0020 for non-allocated DMAchannel 5 <4>IRQ 0020 for non-allocated DMAchannel 5 <4>IRQ 0020 for non-allocated DMAchannel 5 <4>IRQ 0020 for non-allocated DMAchannel 5 <4>IRQ 0020 for non-allocated DMAchannel 5 To prevent any weird things happening, we disable all channel interrupts during init. Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Merge branch 'v2.6.34-rc7.iommu' of git://gitorious.org/~doyu/lk/mainline ↵Tony Lindgren2010-05-208-151/+244
|\ | | | | | | into omap-for-linus
| * omap iommu: Reject unaligned addresses at setting page table entryHiroshi DOYU2010-05-141-0/+18
| | | | | | | | | | | | | | | | | | This rejects unaligned device virtual address('da') and physical address('pa') and informs error to caller when a page table entry is set. Otherwise, a wrong address can be used by IO device. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Cc: Hari Kanigeri <h-kanigeri2@ti.com>
| * omap iommu: Exit iteration if no possibility of available areaHiroshi DOYU2010-05-141-1/+4
| | | | | | | | | | | | | | Searching avaialable spaces should be stopped as soon as it turns out that there's no possibility with the rest of it. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
| * omap iommu: Insert a gap page between IOVMAs against overrideHiroshi DOYU2010-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | Inserting a gap page between IOVMAs could detect an override on other IOVMA with iommu fault. This was originally suggested by Sakari Ailus and based on the work and comment by David Cohen. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Cc: David Cohen <david.cohen@nokia.com> Cc: Sakari Ailus <Sakari.Ailus@nokia.com>
| * omap iommu: Make CONFIG_OMAP_IOMMU_DEBUG selectableHiroshi DOYU2010-05-141-2/+7
| | | | | | | | | | | | | | | | This CONFIG_OMAP_IOMMU_DEBUG option cannot be selected because it's not visible on menu. Make this option selectable. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| * omap iommu: Introduce iteration macro for iotlb entry scanHiroshi DOYU2010-05-141-27/+31
| | | | | | | | | | | | | | | | | | There are some places to scan iotlb entries. This iteration macro could make these code a bit simpler with proceeding iotlb entries transparently. Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Tested-by: Hari Kanigeri <h-kanigeri2@ti.com>
| * omap iommu: add TLB preservation supportKanigeri, Hari2010-05-142-18/+29
| | | | | | | | | | | | | | This patch adds TLB preservation support to IOMMU module Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
| * omap iommu: missing check for TLB valid entryKanigeri, Hari2010-05-141-1/+1
| | | | | | | | | | | | | | Added the missing TLB valid entry setting for cam register Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
| * omap iommu: support for OMAP4Kanigeri, Hari2010-05-142-5/+57
| | | | | | | | | | | | | | This patch provides the iommu support for OMAP4 co-processors. Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
| * omap iommu: renamed omap3-iommu to omap-iommuKanigeri, Hari2010-05-142-14/+14
| | | | | | | | | | | | | | | | | | | | This patch includes changes to omap3-iommu.c file to make it generic for all OMAPs. Renamed omap3-iommu.c to omap-iommu.c [Hiroshi DOYU: Remove unnecessary "iommu-y" in Makefile] Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
* | OMAP: RX51: Add "vdds_sdi" supply voltage for SDIRoger Quadros2010-05-201-0/+15
| | | | | | | | | | | | | | | | The SDI Display subsystem needs access to the vdds_sdi supply regulator. This is TWL4030's VAUX1 supply on RX-51. Signed-off-by: Roger Quadros <roger.quadros@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
* | Merge branch 'pm-next' of ↵Tony Lindgren2010-05-205-28/+41
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
| * | OMAP3: PM: Remove PER wakeup dependency on CORE.Mike Chan2010-05-121-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can remove this wakeup dependency since now, when GPIO2-6 are enabled for IO-pad wakeup, PER domain is gauranteed to be awake or be woken up to service. The previous dependency did not handle all corner cases. Since there was no sleep dependency between CORE and PER domains, if PER enters RET and CORE is ON, PER will not be active for GPIO handling. Signed-off-by: Mike Chan <mike@android.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: PM: Enable IO / IO-CHAIN wakeups for PERMike Chan2010-05-121-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IO events can also come from GPIO modules, which reside in the PER domain. It is possible for the PER to enter RET while CORE is still in ON. If GPIO 2-6 are enabled for IO-pad wakeups, the PER domain will not wakeup in this case, unless we enable it. Signed-off-by: Mike Chan <mike@android.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: PM: Enable wakeup from ads7846 touchscreenRanjith Lohithakshan2010-05-122-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the wakeup capabilities of ads7846 touchscreen driver. ads7846 driver can now wakeup the system from suspend on OMAP3430 EVM and SDP boards. The earlier approach of enabling wakeup on the touchscreen GPIO pin during board level mux init is removed. Instead the wakeup flag in ads7846_platform_data is enabled. Based on the flag, the ads7846 driver will do an enable_irq_wake which will eventually call into the OMAP GPIO layer and will enable the wakeup capability on the GPIO pin. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3EVM: Update pad configuration for wakeup enabled padsRanjith Lohithakshan2010-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP3530 TRM section 7.4.4.4.2 requires OFFOUTENABLE to be set (active low) if wakeup capabilities are enabled on a pad. During OFF mode testing on OMAP3530 EVM, it was observed that the device was not residing in the OFF state. The device enters into the OFF state and immediately exits from that state as if an IO wakeup event has occured. The issue was traced down to the pad configuration of wkaeup enabled pad's. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: PM: Add milliseconds interface to suspend wakeup timerAri Kauppi2010-05-123-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Millisecond resolution is possible and there are use cases for it (automatic testing). Seconds-based interface is preserved for compatibility. Signed-off-by: Ari Kauppi <Ext-Ari.Kauppi@nokia.com> Reviewed-by: Phil Carmody <ext-phil.2.carmody@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: PRCM interrupt: only check and clear enabled PRCM IRQsKevin Hilman2010-05-121-5/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | While handling PRCM IRQs, mask out interrupts that are not enabled in PRM_IRQENABLE_MPU. If these are not masked out, non-enabled interrupts are caught, a WARN() is printed due to no 'handler' and the events are cleared. In addition to being noisy, this can also interfere with independent polling of this register by SR/VP code. This was noticed using SmartReflex transitions which cause the VPx_* interrupts to be handled since they are set in PRM_IRQSTATUS_MPU even but not enabled in PRM_IRQENABLE_MPU. Acked-by: Mike Turquette <mturquette@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | Merge branch 'gpio-2.6.35' of ↵Tony Lindgren2010-05-204-136/+53
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
| * | OMAP: GPIO: remove duplicate debugfs interfaceKevin Hilman2010-05-121-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generic gpiolib provides a debugfs interface to GPIOs which provides identical (but nicer looking) data as the OMAP specific one. This patch completely drops the OMAP specific interface (/debug/omap_gpio) in favor of using the generic one (/debug/gpio.) Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: GPIO: Removed a couple of unneeded registers from context save/restoreTero Kristo2010-05-121-10/+0
| | | | | | | | | | | | | | | | | | | | | setwkuena and setdataout are covered already by wake_en and dataout fields. Signed-off-by: Tero Kristo <tero.kristo@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: GPIO: disable GPIO debounce clocks on idleKevin Hilman2010-05-121-0/+8
| | | | | | | | | | | | | | | | | | | | | Ensure GPIO debounce clocks are disabled when idle. Otherwise, clocks will prevent PER powerdomain from entering retention. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP2/3: GPIO: generalize prepare for idleKevin Hilman2010-05-124-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the GPIO 'prepare' hook is only called when going to off-mode, while the function is called 'prepare_for_retention.' This patch renames the function to 'prepare_for_idle' and calls it for any powersate != PWRDM_POWER_ON passing in the powerstate. The hook itself is then responsible for doing various preparation based on the powerstate. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: GPIO: Only enable WAKEUPEN for edge detection GPIOsChunqiu Wang2010-05-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the GPIO 'Wakeup and Interrupt' section of the TRM[1], wake-up requests can only be generated on edge transitions. Also for OMAP3, only edge GPIOs may lose interrupts when PER enters RET/OFF state, this is addressed by gpio prepare|resume idle functions [1] Section 25.5.3.1 OMAP34xx_ES3.1_TRM_V_Q Signed-off-by: Chunqiu Wang <cqwang@motorola.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | OMAP3: GPIO fixes for off-modeTero Kristo2010-05-122-9/+20
| |/ | | | | | | | | | | | | | | | | | | Off mode is now using the omap2 retention fix code for scanning GPIOs during off-mode transitions. All the *non_wakeup_gpios variables are now used for off-mode transition tracking on OMAP3. This patch fixes cases where GPIO state changes are missed during off-mode. Signed-off-by: Tero Kristo <tero.kristo@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | Merge branch 'omap-boards' into omap-for-linusTony Lindgren2010-05-2088-757/+1673
|\ \
| * | AM35x: fix UI card EHCI port and LCD dependencyAjay Kumar Gupta2010-05-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | EHCI port on UI card and LCD share two pins (GPIO 181 and 182) thus they have to be mutually exclusive. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: rx51: Add supplies for the tlv320aic3x codec driverJarkko Nikula2010-05-201-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcoming change to tlv320aic3x codec driver require four supplies. Implement this by connecting analogic supplies to TWL4030 VMMC2 and digital supplies to TWL4030 VIO. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Cc: Eduardo Valentin <eduardo.valentin@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: rx51: Add i2c2 board_info with tlv320aic3xJarkko Nikula2010-05-201-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes possible to probe the audio codec and add another i2c2 components in the future. Fix also indentation for the first omap_register_i2c_bus. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: rx51: Change the TWL4030 VMMC2 voltage constraints andsupply nameJarkko Nikula2010-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe the VMMC2 constraints must be the same than with VAUX3. Older boards are using TWL4030 VMMC2 supply for internal MMC whereas newer are using VAUX3 that has more limited constraints defined in this same file. More over, the VMMC2 supply is used also for analog audio domain and the miminum analog voltage of the TLV320AIC34 codec is 2.7 V. To combine these two facts, the patch changes supply name to V28_A as the newer boards register VMMC2_30 for VAUX3 and uses the same constraints than VAUX3 since those constraints are ok for the TLV320AIC34. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Cc: Adrian Hunter <adrian.hunter@nokia.com> Cc: Eduardo Valentin <eduardo.valentin@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Overo: Add support for second ethernet portSteve Sakoman2010-05-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Some Overo add-on boards include a second ethernet port. This patch adds support for that second port. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | AM3517: defconfig update to enable EMAC supportSriram2010-05-201-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | Update the default configuration for AM3517EVM to enable support for EMAC peripheral. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | OMAP3: clock data: Update name string for EMAC clocksSriram2010-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emac driver currently uses Davinci clock names for the module and phy clocks. Updated the omap3xxx_clks table to match the names used by the Davinci emac driver. Note that eventually the EMAC clocks should be renamed to be generic. Signed-off-by: Sriramakrishnan <srk@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> [tony@atomide.com: updated patch description to match the patch] Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | AM35xx: Platform specific hookup for EMAC moduleSriram2010-05-201-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | Modified AM35xx EVM init sequence to handle EMAC initialization. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | AM35xx EMAC: define submodule offsetsSriram2010-05-201-1/+10
| | | | | | | | | | | | | | | | | | | | | Define offsets for EMAC sub modules. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | can: ti_hecc: Enable CAN support on AM3517Sriram2010-05-201-4/+18
| | | | | | | | | | | | | | | | | | | | | Modify the default kernel configuration on AM3517 to enable CAN. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | can: ti_hecc: board specific hookup on AM3517EVMSriram2010-05-202-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | Add board specific hookup for TI HECC driver on AM3517 EVM Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Devkit8000: Update default configurationThomas Weber2010-05-201-66/+91
| | | | | | | | | | | | | | | | | | | | | This patch updates the new default configuration for the Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Devkit8000: Add mux initializationThomas Weber2010-05-201-0/+155
| | | | | | | | | | | | | | | | | | | | | Initialize multiplexed pins with correct mode. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap2: select ARCH_OMAP_OTG for OMAP2430 SDPViral Mehta2010-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Configuration for OMAP2430 should select ARCH_OMAP_OTG just like it is done for OMAP2420 Signed-off-by: Viral Mehta <viral.mehta@lntinfotech.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap2: Add OHCI USB platform init for 2430 SDPViral Mehta2010-05-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add platform init code for OHCI USB on OMAP2430 SDP Signed-off-by: Viral Mehta <viral.mehta@lntinfotech.com> [tony@atomide.com: Updated subject to mention the board name] Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap2: Add I2C bus 1 initialisation for 2430sdpViral Mehta2010-05-201-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Initialize isp1301 FS USB transceiver and add I2C bus1 initialization code for OMAP2430 SDP Signed-off-by: Viral Mehta <viral.mehta@lntinfotech.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap1: amsdelta: defconfig updatesJanusz Krzysztofik2010-05-201-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch provides the following ams_delta_defconfig updates: - explicitly select preemptable RCU, - replace outdated CONFIG_LBD and CONFIG_LSF options with CONFIG_LBDAF, - activate support for LCD contrast setting (new in 2.6.34), - turn off verbose bug reporting for smaller kernel. Created and tested against linux-2.6.34-rc3. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>