summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-05-20OMAP3 clock: remove unnecessary duplicate of dpll4_m2_ck, added for 36xxPaul Walmsley
Commit 678bc9a2eabb7f444ef8ad1cfc5ef394e2bd8bf2 split dpll4_m2_ck, creating a 34xx and a 36xx variant, to handle the additional 16 divider steps provided on the 36xx. This in turn required dynamic rewriting of the clock tree during initialization, which is undesirable. All this seems to be unnecessary, though, since the additional 16 divider steps can simply be marked with RATE_IN_36XX. This patch does so and re-merges the affected structures. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Vishwanath Sripathy <vishwanath.bs@ti.com>
2010-05-20OMAP3 clock: rename RATE_IN_343X, RATE_IN_3430ES2 to match realityPaul Walmsley
Rename the RATE_IN_343X clksel_rate.rate flag to be RATE_IN_3XXX, to reflect that these rates are valid on all OMAP3 platforms, not just 343X. Also rename the RATE_IN_OMAP3430ES2 clksel_rate.rate flag to be RATE_IN_OMAP3430ES2PLUS, to reflect that these flags are valid on all OMAP3 platforms after 3430ES2. This patch should not result in any functional changes. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Richard Woodruff <r-woodruff2@ti.com> Cc: Rajendra Nayak <rnayak@ti.com> Cc: Ranjith Lohithakshan <ranjithl@ti.com>
2010-05-20OMAP2+ clock: clean up clkt_clksel.cPaul Walmsley
This patch cleans up arch/arm/mach-omap2/clkt_clksel.c. It: - makes several functions static that are not called outside the file; - adds documentation; - makes some code paths easier to read (hopefully), by breaking up compound statements and removing redundant checks; - converts some pr_err()s that indicate clock tree data problems into WARN()s, so they are more likely to be noticed; - and moves omap2_clk_round_rate() back into mach-omap2/clock.c, its proper home, since it is not clksel-specific. Signed-off-by: Paul Walmsley <paul@pwsan.com>
2010-05-20OMAP2+ clock: remove DEFAULT_RATE clksel_rate flagPaul Walmsley
The DEFAULT_RATE clksel_rate flag is essentially useless. It was set on some of the lowest divisors, which, when switching to a much higher-rate parent, could have potentially resulted in rates that exceeded the hardware specifications for downstream clocks in the window between the clk_set_parent(), and a subsequent clk_set_rate(). It seems much safer to just remove the flag and always use the highest available divisor (resulting in the lowest possible rate) after the switch, and this patch does so. Ideally, it would be best to first attempt to switch to a divisor that matches the clock's rate with the previous parent, if at all possible. But that is a project for some other day or some other person. The parent changing code is rarely used. Signed-off-by: Paul Walmsley <paul@pwsan.com>
2010-05-20OMAP3: PM: PM_MPUGRPSEL writes should use GRPSEL macros, not EN macrosPaul Walmsley
Writes to the PM_*GRPSEL registers should use _GRPSEL_ macros, not _EN_ macros, to match the TRM and guard against inadvertent error. This patch should not cause any functional change. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Jouni Högander <jouni.hogander@nokia.com>
2010-05-20OMAP2+ PRCM: convert remaining PRCM macros to the _SHIFT/_MASK suffixesPaul Walmsley
Fix all of the remaining PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@deeprootsystems.com>
2010-05-20OMAP3 PRCM: convert OMAP3 PRCM macros to the _SHIFT/_MASK suffixesPaul Walmsley
Fix all of the remaining OMAP3 PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@deeprootsystems.com>
2010-05-20OMAP2 PRCM: convert OMAP2 PRCM macros to the _SHIFT/_MASK suffixesPaul Walmsley
Fix all of the remaining OMAP2 PRCM register shift/bitmask macros that did not use the _SHIFT/_MASK suffixes to use them. This makes the use of these macros consistent. It is intended to reduce error, as code can be inspected visually by reviewers to ensure that bitshifts and bitmasks are used in the appropriate places. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@deeprootsystems.com>
2010-05-20OMAP1 clock: fix section mismatch on clk_initFelipe Balbi
remove the section annotation from omap1_clk_disable_unused() to kill the section mismatch warning. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
2010-05-20AM3517: rename the i2c boardinfo to make it more readablestanley.miao
There are three i2c buses on am3517, and each i2c bus has several devices on it, so we can't name the i2c boardinfo structures with one of these devices. In order to make it more readable, now rename these three boardinfo structures based on i2c indexes. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Acked-By: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20omap: GPIO: Fix OMAP4 GPIO reg access issuesCharulatha V
Access to some of the OMAP4 GPIO registers are not properly handled. This patch fixes it. This patch is tested on 3430SDP and 4430SDP boards Signed-off-by: Charulatha V <charu@ti.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20omap4: Move SOC specific code from board fileSantosh Shilimkar
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>
2010-05-20OMAP4: Networking: Defconfig SupportAbraham Arce
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>
2010-05-20OMAP4: Ethernet: KS8851 Board SupportAbraham Arce
Enable Micrel KS8851 SPI network chip for OMAP4430 Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20OMAP4: SPI: Fix Driver KconfigSyed Rafiuddin
Change dependency to ARCH_OMAP2PLUS to allow systems based on omap24xx, omap34xx or omap44xx Cc: spi-devel-general@lists.sourceforge.net Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com> Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20omap: hsmmc: fix the hsmmc driver for am3517stanley.miao
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>
2010-05-20omap: init the gpio pinmux for mmcstanley.miao
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>
2010-05-20omap: DMA: Fix multi-line commentsmanjugk manjugk
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>
2010-05-20OMAP2/3/4: DMA: disable channel interrupts in omap_init_dma()Mika Westerberg
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>
2010-05-20Merge branch 'v2.6.34-rc7.iommu' of git://gitorious.org/~doyu/lk/mainline ↵Tony Lindgren
into omap-for-linus
2010-05-20OMAP: RX51: Add "vdds_sdi" supply voltage for SDIRoger Quadros
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>
2010-05-20Merge branch 'pm-next' of ↵Tony Lindgren
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
2010-05-20Merge branch 'gpio-2.6.35' of ↵Tony Lindgren
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
2010-05-20Merge branch 'omap-boards' into omap-for-linusTony Lindgren
2010-05-20OMAP1: Amstrad Delta: modify defconfig for external keyboardsupportJanusz Krzysztofik
The patch adds a CONFIG directive required for supporting the Amstrad Delta connected external keyboard by default. Created and tested against linux-omap master, commit 104a77440f05430f29f9d3f4ecb88c1536819585 dated 2010-04-27. Works on top of PATCH v4 4/5(7), "input: serio: add support for Amstrad Delta serial keyboard port". Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20AM35x: fix UI card EHCI port and LCD dependencyAjay Kumar Gupta
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>
2010-05-20omap: rx51: Add supplies for the tlv320aic3x codec driverJarkko Nikula
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>
2010-05-20omap: rx51: Add i2c2 board_info with tlv320aic3xJarkko Nikula
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>
2010-05-20omap: rx51: Change the TWL4030 VMMC2 voltage constraints andsupply nameJarkko Nikula
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>
2010-05-20omap: Overo: Add support for second ethernet portSteve Sakoman
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>
2010-05-20AM3517: defconfig update to enable EMAC supportSriram
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>
2010-05-20OMAP3: clock data: Update name string for EMAC clocksSriram
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>
2010-05-20AM35xx: Platform specific hookup for EMAC moduleSriram
Modified AM35xx EVM init sequence to handle EMAC initialization. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20AM35xx EMAC: define submodule offsetsSriram
Define offsets for EMAC sub modules. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20can: ti_hecc: Enable CAN support on AM3517Sriram
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>
2010-05-20can: ti_hecc: board specific hookup on AM3517EVMSriram
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>
2010-05-20omap: Devkit8000: Update default configurationThomas Weber
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>
2010-05-20omap: Devkit8000: Add mux initializationThomas Weber
Initialize multiplexed pins with correct mode. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
2010-05-20omap2: select ARCH_OMAP_OTG for OMAP2430 SDPViral Mehta
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>
2010-05-20omap2: Add OHCI USB platform init for 2430 SDPViral Mehta
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>
2010-05-20omap2: Add I2C bus 1 initialisation for 2430sdpViral Mehta
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>
2010-05-20omap1: amsdelta: defconfig updatesJanusz Krzysztofik
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>
2010-05-14omap iommu: Reject unaligned addresses at setting page table entryHiroshi DOYU
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>
2010-05-14omap iommu: Exit iteration if no possibility of available areaHiroshi DOYU
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>
2010-05-14omap iommu: Insert a gap page between IOVMAs against overrideHiroshi DOYU
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>
2010-05-14omap iommu: Make CONFIG_OMAP_IOMMU_DEBUG selectableHiroshi DOYU
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>
2010-05-14omap iommu: Introduce iteration macro for iotlb entry scanHiroshi DOYU
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>
2010-05-14omap iommu: add TLB preservation supportKanigeri, Hari
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>
2010-05-14omap iommu: missing check for TLB valid entryKanigeri, Hari
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>
2010-05-14omap iommu: support for OMAP4Kanigeri, Hari
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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-19 13:55:34 +0000