summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* omap: Devkit8000: Remove unused pinsThomas Weber2010-04-241-20/+0
| | | | | | | | Old code from original patch contains beagle board pins that are not available on the Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Change position of init callsThomas Weber2010-04-241-4/+4
| | | | | | | Change position of calling serial and ethernet initialization. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Remove unnecessary include fileThomas Weber2010-04-241-1/+0
| | | | | | | Remove include otg.h. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Fix typo in pin nameThomas Weber2010-04-241-2/+2
| | | | | | | Replace wrong sdr_cke[01] with sdrc_cke[01]. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Add missing package selectionThomas Weber2010-04-241-2/+4
| | | | | | | | | | | | Devkit8000 uses the CUS package for OMAP3530. This patch adds missing package selection for CUS and enables CONFIG_MUX. Replace whitespace with tab in Kconfig. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Fix typo in suppliesThomas Weber2010-04-241-1/+1
| | | | | | | Replace wrong vdss_dsi with vdds_dsi. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* n8x0_defconfig: remove CONFIG_NILFS2_FS overrideFrancisco Alecrim2010-04-241-1/+0
| | | | | | | | arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to symbol NILFS2_FS Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: board-sdp-flash.c: Fix typos in debug outputThomas Weber2010-04-241-4/+4
| | | | | | | | | Corrected type of flash in output (OneNAND => NOR). Removed whitespace after newline in output. Removed double whitespace in output. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap4: Fix McBSP4 base addressSantosh Shilimkar2010-04-241-1/+1
| | | | | | | This patch fixes the McBSP4 base address for OMAP4 Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: rx51_defconfig: Remove CONFIG_SYSFS_DEPRECATED*=y optionsJarkko Nikula2010-04-241-2/+0
| | | | | | | | | Modern udev will not work with the CONFIG_SYSFS_DEPRECATED*=y options and it seems also that the Maemo release works without when testing with the Maemo 2.6.28 kernel. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: rx51_defconfig: Remove duplicate phonetJarkko Nikula2010-04-241-1/+0
| | | | | | | | | Phonet is enabled by the commit bce54fed941e03695ab557100a4bd1e457abca42 and this duplicate gives a warning when doing make rx51_defconfig. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: fix a gpmc nand problemstanley.miao2010-04-241-0/+3
| | | | | | | | If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause a Oops. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* AM3517: initialize i2c subsystem after mux subsystemstanley.miao2010-04-241-2/+2
| | | | | | | | The initialize of i2c subsystem will set pinmux, so it should be done after the initialize of mux subsystem initialization. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: remove one of the define of INT_34XX_BENCH_MPU_EMULstanley.miao2010-04-241-2/+0
| | | | | | | INT_34XX_BENCH_MPU_EMUL was defined twice, another is at Line 312. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: fix the compile error if CONFIG_MTD_NAND_OMAP2 is notenabledstanley.miao2010-04-241-0/+7
| | | | | | | | If CONFIG_MTD_NAND_OMAP2 is not enabled, there will be a compile error, "gpmc_nand_init() is not defined". Add a inline noop function to fix it. Signed-off-by: Stanley.Miao <stanley.miao@windriver.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP4: Clocks: Change SPI Instance NamesAbraham Arce2010-04-241-4/+4
| | | | | | | | | | | | | Change the name for the spi instances on omap44xx_clks to match the names omap2 spi driver gives: omap-mcspi.1 -> omap2_mcspi.1 omap-mcspi.2 -> omap2_mcspi.2 omap-mcspi.3 -> omap2_mcspi.3 omap-mcspi.4 -> omap2_mcspi.4 Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Devkit8000: Fix wrong usb port on Devkit8000Thomas Weber2010-04-241-2/+2
| | | | | | | | Disable the nonexistent ehci port on Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Acked-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP4: Fix for CONTROL register BaseSantosh Shilimkar2010-04-241-1/+1
| | | | | | | | | This patch fixes the base address of CONTROL register on OMAP4430SDP. The control base is used by peripherals like MMC1 for PBIAS configuration. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* OMAP4-HSMMC: FIX for MMC5 Controller IRQ Basekishore kadiyala2010-04-241-1/+1
| | | | | | | This patch fixes HSMMC Controller5 IRQ Base. Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap3: Fix EHCI port for IGEP v2 boardEnric Balletbo i Serra2010-04-241-4/+4
| | | | | | | | IGEP v2 uses EHCI port 1 instead of EHCI port 2. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: Fix n8x0 mmc_mmc_init compile warnings and typosTony Lindgren2010-04-241-9/+9
| | | | | | | Fix warning: 'return' with a value, in function returning void in n8x0_mmc_init. Also fix a search and replace typo. Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap2: Fix ARM processor check for 24xxTony Lindgren2010-04-241-1/+1
| | | | | | | | The value to check is 7 for V6 instead. The code has been working as it falls through to 24xx code if the other checks fail. Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap4: Fix build break when used with gcc-4.4.1 (2009-q3)Richard Woodruff2010-04-242-4/+4
| | | | | | | | | | | | | | | This patch adds argument to smc calls as gcc-4.4.1 requires it otherwise the build breaks with 2009-q3 toolchanin. arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc' make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 Signed-off-by: Richard Woodruff <r-woodruff2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: DMA: Init CDAC to zeromanjugk manjugk2010-04-231-0/+9
| | | | | | | | | | | | The register DMA4_CDAC needs to be initialized to zero before starting DMA transfer. Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Govindraj R <govindraj.raja@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Reported-by:S, Venkatraman <svenkatr@ti.com> Signed-off-by: Manjunatha GK <manjugk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTHJanusz Krzysztofik2010-04-231-3/+3
| | | | | | | | | | | | | Since IRQ_TYPE_EDGE_BOTH is defined as (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING), testing against it with a bitwise AND also matches both single-edge cases in addition to the intended both edges case. Fix it, replacing with a more accurate expression. Created and tested againts linux-2.6.34-rc3. Applicable to 2.6.33-stable as well. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
* arm: omap1: remove dead code from timer32k.cFelipe Balbi2010-04-231-15/+0
| | | | | | | Trivial patch, no functional changes Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* omap: fix clocksource_32k to start from zeroAaro Koskinen2010-04-231-5/+14
| | | | | | | | | | | | | | | | | | | | When the 32k sync timer is used for sched_clock(), it should count time from the kernel boot (clocksource init) instead of the last HW reset. Otherwise printk.time values will jump suddenly during the boot: [ 0.000000] calling omap2_clk_arch_init+0x0/0x138 @ 1 [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned -22 after 0 usecs [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned with error code -22 [ 0.000000] calling omap_init_clocksource_32k+0x0/0x98 @ 1 [ 508.697937] initcall omap_init_clocksource_32k+0x0/0x98 returned 0 after 0 usecs [ 508.697967] calling omap_init_devices+0x0/0x38 @ 1 [ 508.698425] initcall omap_init_devices+0x0/0x38 returned 0 after 0 usecs This will confuse tools such as scripts/bootgraph.pl. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into ↵Tony Lindgren2010-04-22362-2000/+3343
|\ | | | | | | omap-fixes-for-linus
| * OMAP3: clock: fix enable bit used for dpll4_m4x2 clockRanjith Lohithakshan2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | The enable bit for dpll4_m4x2 clock should be OMAP3430_PWRDN_DSS1_SHIFT. The code erroneously uses OMAP3430_PWRDN_CAM_SHIFT which is meant for dpll4_m5x2 clock. This came into notice during a recent review of the clock tree. Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * OMAP4: prcm: Use logical OR instead of bitwise ORRajendra Nayak2010-03-313-6/+6
| | | | | | | | | | | | | | | | | | | | This patch fixes usage of bitwise OR in if conditions, and instead uses logical OR. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Cc: Abhijit Pagare <abhijitpagare@ti.com> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * OMAP: HWMOD: Bug fixes in hwmod structure definitionsThara Gopinath2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | This patch corrects the width of sysc_flags in hwmod sysconfig structure where the values to be stored to this variable exceed the current field width. Signed-off-by: Thara Gopinath <thara@ti.com> [paul@pwsan.com: edited to apply; rearranged structure members to pack] Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * OMAP: HWMOD: Adding clockdomain checkThara Gopinath2010-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | This patch adds check for presence of clockdomain structure in the API omap_hwmod_get_pwrdm before trying to access the powerdomain structure. This will prevent unnecessary crashing of the system in case of a clock node with out an associated clockdomain. Signed-off-by: Thara Gopinath <thara@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
| * Linux 2.6.34-rc3v2.6.34-rc3Linus Torvalds2010-03-301-1/+1
| |
| * KEYS: Add MAINTAINERS recordDavid Howells2010-03-301-0/+10
| | | | | | | | | | | | | | Add a MAINTAINERS record for the key management facility. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * Merge branch 'for-linus' of ↵Linus Torvalds2010-03-301-1/+5
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: CRED: Fix memory leak in error handling
| | * CRED: Fix memory leak in error handlingMathieu Desnoyers2010-03-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix a memory leak on an OOM condition in prepare_usermodehelper_creds(). Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfsLinus Torvalds2010-03-307-36/+67
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Erase new journal segments [LogFS] Move reserved segments with journal [LogFS] Clear PagePrivate when moving journal Simplify and fix pad_wbuf Prevent data corruption in logfs_rewrite_block() Use deactivate_locked_super Fix logfs_get_sb_final error path Write out both superblocks on mismatch Prevent schedule while atomic in __logfs_readdir Plug memory leak in writeseg_end_io Limit max_pages for insane devices Open segment file before using it
| | * | [LogFS] Erase new journal segmentsJoern Engel2010-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the device contains on old logfs image and the journal is moved to segment that have never been used by the current logfs and not all journal segments are erased before the next mount, the old content can confuse mount code. To prevent this, always erase the new journal segments. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | [LogFS] Move reserved segments with journalJoern Engel2010-03-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a GC livelock. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | [LogFS] Clear PagePrivate when moving journalJoern Engel2010-03-283-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | do_logfs_journal_wl_pass() must call freeseg(), thereby clear PagePrivate on all pages of the current journal segment. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Simplify and fix pad_wbufJoern Engel2010-03-281-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A comment in the old code read: /* The math in this function can surely use some love */ And indeed it did. In the case that area->a_used_bytes is exactly 4096 bytes below segment size it fell apart. pad_wbuf is now split into two helpers that are significantly less complicated. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Prevent data corruption in logfs_rewrite_block()Joern Engel2010-03-281-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment was correct, so make the code match the comment. As the new comment indicates, we might be able to do a little less work. But for the current -rc series let's keep it simple and just fix the bug. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Use deactivate_locked_superJoern Engel2010-03-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Found by Al Viro. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Fix logfs_get_sb_final error pathJoern Engel2010-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rootdir was already allocated, so we must iput it again. Found by Al Viro. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Write out both superblocks on mismatchJoern Engel2010-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the first superblock is wrong and the second gets written, there will still be a mismatch on next mount. Write both to make sure they match. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Prevent schedule while atomic in __logfs_readdirJoern Engel2010-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Apparently filldir can sleep, which forbids kmap_atomic. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Plug memory leak in writeseg_end_ioJoern Engel2010-03-271-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Limit max_pages for insane devicesJoern Engel2010-03-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel SSDs have a limit of 0xffff as queue_max_hw_sectors(q). Such a limit may make sense from a hardware pov, but it causes bio_alloc() to return NULL. Signed-off-by: Joern Engel <joern@logfs.org>
| | * | Open segment file before using itJoern Engel2010-03-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | logfs_recover_sb() needs it open. Signed-off-by: Joern Engel <joern@logfs.org>
| * | | Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds2010-03-306-13/+44
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Do not free zero sized per cpu areas x86: Make sure free_init_pages() frees pages on page boundary x86: Make smp_locks end with page alignment
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 10:34:51 +0100