aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-07OMAP15xx: GPIO: Introduce support for GPIO initVaradarajan, Charulatha3-8/+118
Add support for handling OMAP15xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V <[email protected]> Acked-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07OMAP: GPIO: Make omap_gpio_show_rev bank specificTony Lindgren1-6/+6
Otherwise GPIO init on 16xx may try to access uninitialized GPIO bank as the MPUIO bank does not have a revision register. Acked-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07OMAP: GPIO: prepare for platform driverVaradarajan, Charulatha1-116/+118
Prepare for implementing GPIO as a platform driver. Modifies omap_gpio_init() to make use of omap_gpio_chip_init() and omap_gpio_mod_init(). omap_gpio_mod_init() does the module init by clearing the status register and initializing the GPIO control register. omap_gpio_chip_init() initializes the chip request, free, get, set and other function pointers and sets the gpio irq handler. This is only to reorganize the code so that the "omap gpio platform driver implementation patch" looks cleaner and better to review. Signed-off-by: Charulatha V <[email protected]> Acked-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: Fix gpio_request calls to happen as arch_initcallTony Lindgren8-36/+42
Looks like some boards are calling gpio_request from init_irq. This will make the request_irq fail, as GPIO will be initialized as postcore_initcall. Reported-by: Paul Walmsley <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: Don't select mux by default for each boardTony Lindgren1-4/+0
This should be only selected in CONFIG_ARCH_OMAP2PLUS_TYPICAL to make it easy to disable. Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: McBSP: Make the free variable update more readableShubhrajyoti D1-4/+4
Using true/false instead of 1/0 to update the free variable. Signed-off-by: Shubhrajyoti D <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: McBSP: Fix potential memory leak in omap_mcbsp_removeJarkko Nikula1-7/+1
Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups and clk_disable calls since they are not needed here. This is not problem currently but becomes if the mcbsp driver is ever modularized. Signed-off-by: Jarkko Nikula <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: Ptr "isr_reg" tracked as NULL was dereferencedEvgeny Kuznetsov1-0/+5
Value of "isr_reg" pointer is depend on configuration and GPIO method. Potentially it may have NULL value and it is dereferenced later in code. Warning and exit from function are added in this case. Signed-off-by: Evgeny Kuznetsov <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07omap: Fix undefined reference to omap2_i2c_mux_pinsTony Lindgren1-0/+7
In some cases we can get error function `omap2_i2c_add_bus': arch/arm/plat-omap/i2c.c:136: undefined reference to `omap2_i2c_mux_pins' arch/arm/plat-omap/i2c.c:141: undefined reference to `omap_hwmod_lookup' arch/arm/plat-omap/i2c.c:157: undefined reference to `omap_device_build' Signed-off-by: Tony Lindgren <[email protected]>
2010-12-07OMAP1: I2C: fix device initializationPaul Walmsley1-0/+5
Commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 ("OMAP: I2C: split device registration and convert OMAP2+ to omap_device") broke I2C on OMAP1. The following messages appear at boot: i2c_omap i2c_omap.1: failure requesting irq 0 i2c_omap: probe of i2c_omap.1 failed with error -22 Investigation revealed that a chunk of code is missing from the original plat-omap/i2c.c file which configured the IRQ and base address for the I2C block on OMAP1. Upon adding this back, the OMAP1 I2C block seems to initialize correctly. Thanks to Cory Maccarrone <[email protected]> for reporting the bug, and apologies for the breakage. Signed-off-by: Paul Walmsley <[email protected]> Cc: Janusz Krzysztofik <[email protected]> Tested-by: Cory Maccarrone <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux ↵Tony Lindgren12-147/+2310
into omap-for-linus
2010-11-30Merge branch 'pm-hwmod-i2c' of ↵Tony Lindgren11-126/+886
ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
2010-11-30Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into ↵Tony Lindgren200-1348/+9462
omap-for-linus
2010-11-30omap: Serial: Define register access modes in LCRAndrei Emeltchenko5-45/+43
Access to some registers depends on register access mode Three different modes are available for OMAP (at least) • Operational mode LCR_REG[7] = 0x0 • Configuration mode A LCR_REG[7] = 0x1 and LCR_REG[7:0]! = 0xBF • Configuration mode B LCR_REG[7] = 0x1 and LCR_REG[7:0] = 0xBF Define access modes and remove redefinitions and magic numbers in serial drivers (and later in bluetooth driver). Signed-off-by: Andrei Emeltchenko <[email protected]> Acked-by: Govindraj.R <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbersAndrei Emeltchenko5-14/+28
Define MDR1 register serial definitions used in serial and bluetooth drivers. Change magic number to ones defined in serial_reg for omap1/2 serial driver. Remove redefined MDR1 register definitions in omap-serial driver. Signed-off-by: Andrei Emeltchenko <[email protected]> Acked-by: G, Manjunath Kondaiah <[email protected]> Acked-by: Govindraj.R <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30omap: AM3517/05: Add craneboard supportSrinath4-0/+77
Craneboard is a hardware development platform based on the Sitara AM3517 ARM Cortex - A8 microprocessor device. This is a low cost reference design. This patch adds basic board file. Detailed support will follow in subsequent patches. [1] http://www.ti.com/arm [2] http://www.mistralsolutions.com/products/craneboard.php Signed-off-by: Srinath <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30OMAP1: drop AMS_DELTA_FIQ config optionJanusz Krzysztofik4-15/+3
This patches removes a config option that was used to select a FIQ handler to be build for Amstrad Delta, as required by the on-board serio interface driver. Not having any problem reports received since it was introduced in 2.6.35, the FIQ handler can now be built and initialized by default, thus reqiring no extra config option. Signed-off-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30arm: omap: zoom: substitute gpio number with symbolic nameFelipe Balbi1-2/+4
It's easier to understand what that number means and also avoids problems if we ever have to change it. Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30arm: omap: combine zoom2 and zoom3 board-filesFelipe Balbi3-160/+61
They are extremely similar anyway, let's get rid of one file. While at that, also remove the empty zoom_config variable. Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30omap3: IGEP v2: Improve igep2_flash_init() functionEnric Balletbo i Serra1-12/+11
The changes are: - Use 'for' loop instead 'while' loop. - No need to initialize ret to 0, we're assigning it right after. - No need to check for onenandcs < GPMC_CS_NUM here, it will always be true. Signed-off-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-30omap3: IGEP v2: Remove igep2_config arrayEnric Balletbo i Serra1-5/+0
omap_board_config_size is implicitly initialized to 0 in plat-omap/common.c, get_config() won't dereference omap_board_config, so we can remove the empty igep2_config array. Signed-off-by: Enric Balletbo i Serra <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-11-29Linux 2.6.37-rc4Linus Torvalds1-1/+1
2010-11-29Merge branch 'merge' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Use call_rcu_sched() for pagetables
2010-11-30powerpc: Use call_rcu_sched() for pagetablesPeter Zijlstra1-1/+1
PowerPC relies on IRQ-disable to guard against RCU quiecent states, use the appropriate RCU call version. Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-29Revert "debug_locks: set oops_in_progress if we will log messages."Dave Airlie1-2/+0
This reverts commit e0fdace10e75dac67d906213b780ff1b1a4cc360. On-list discussion seems to suggest that the robustness fixes for printk make this unnecessary and DaveM has also agreed in person at Kernel Summit and on list. The main problem with this code is once we hit a lockdep splat we always keep oops_in_progress set, the console layer uses oops_in_progress with KMS to decide when it should be showing the oops and not showing X, so it causes problems around suspend/resume time when a userspace resume can cause a console switch away from X, only if oops_in_progress is set (which is what we want if an oops actually is in progress, but not because we had a lockdep splat 2 days prior). Cc: David S Miller <[email protected]> Cc: Ingo Molnar <[email protected]> Signed-off-by: Dave Airlie <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-29Merge branch 'for-linus' of ↵Linus Torvalds1-0/+24
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: tpm: Autodetect itpm devices
2010-11-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds30-203/+280
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits) af_unix: limit recursion level pch_gbe driver: The wrong of initializer entry pch_gbe dreiver: chang author ucc_geth: fix ucc halt problem in half duplex mode inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners ehea: Add some info messages and fix an issue hso: fix disable_net NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty cxgb4vf: fix setting unicast/multicast addresses ... net, ppp: Report correct error code if unit allocation failed DECnet: don't leak uninitialized stack byte au1000_eth: fix invalid address accessing the MAC enable register dccp: fix error in updating the GAR tcp: restrict net.ipv4.tcp_adv_win_scale (#20312) netns: Don't leak others' openreq-s in proc Net: ceph: Makefile: Remove unnessary code vhost/net: fix rcu check usage econet: fix CVE-2010-3848 econet: fix CVE-2010-3850 econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849 ...
2010-11-29Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds3-1/+23
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled OMAP: UART: don't resume UARTs that are not enabled.
2010-11-30tpm: Autodetect itpm devicesMatthew Garrett1-0/+24
Some Lenovos have TPMs that require a quirk to function correctly. This can be autodetected by checking whether the device has a _HID of INTC0102. This is an invalid PNPid, and as such is discarded by the pnp layer - however it's still present in the ACPI code, so we can pull it out that way. This means that the quirk won't be automatically applied on non-ACPI systems, but without ACPI we don't have any way to identify the chip anyway so I don't think that's a great concern. Signed-off-by: Matthew Garrett <[email protected]> Acked-by: Rajiv Andrade <[email protected]> Tested-by: Jiri Kosina <[email protected]> Tested-by: Andy Isaacson <[email protected]> Signed-off-by: James Morris <[email protected]>
2010-11-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds15-114/+572
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (24 commits) Btrfs: don't use migrate page without CONFIG_MIGRATION Btrfs: deal with DIO bios that span more than one ordered extent Btrfs: setup blank root and fs_info for mount time Btrfs: fix fiemap Btrfs - fix race between btrfs_get_sb() and umount Btrfs: update inode ctime when using links Btrfs: make sure new inode size is ok in fallocate Btrfs: fix typo in fallocate to make it honor actual size Btrfs: avoid NULL pointer deref in try_release_extent_buffer Btrfs: make btrfs_add_nondir take parent inode as an argument Btrfs: hold i_mutex when calling btrfs_log_dentry_safe Btrfs: use dget_parent where we can UPDATED Btrfs: fix more ESTALE problems with NFS Btrfs: handle NFS lookups properly btrfs: make 1-bit signed fileds unsigned btrfs: Show device attr correctly for symlinks btrfs: Set file size correctly in file clone btrfs: Check if dest_offset is block-size aligned before cloning file Btrfs: handle the space_cache option properly btrfs: Fix early enospc because 'unused' calculated with wrong sign. ...
2010-11-29Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds3-9/+9
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Fix typos in Documentation/edac.txt EDAC, MCE: Fix edac_init_mce_inject error handling EDAC: Remove deprecated kbuild goal definitions
2010-11-29Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds1-7/+8
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Userland expects quota limit/warn/usage in 512b blocks
2010-11-29af_unix: limit recursion levelEric Dumazet3-6/+35
Its easy to eat all kernel memory and trigger NMI watchdog, using an exploit program that queues unix sockets on top of others. lkml ref : http://lkml.org/lkml/2010/11/25/8 This mechanism is used in applications, one choice we have is to have a recursion limit. Other limits might be needed as well (if we queue other types of files), since the passfd mechanism is currently limited by socket receive queue sizes only. Add a recursion_level to unix socket, allowing up to 4 levels. Each time we send an unix socket through sendfd mechanism, we copy its recursion level (plus one) to receiver. This recursion level is cleared when socket receive queue is emptied. Reported-by: Марк Коренберг <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-29pch_gbe driver: The wrong of initializer entryToshiharu Okada1-4/+4
The wrong of initializer entry was modified. Signed-off-by: Toshiharu Okada <[email protected]> Reported-by: Dr. David Alan Gilbert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-29pch_gbe dreiver: chang authorToshiharu Okada2-6/+6
This driver's AUTHOR was changed to "Toshiharu Okada" from "Masayuki Ohtake". I update the Kconfig, renamed "Topcliff" to "EG20T". Signed-off-by: Toshiharu Okada <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-29Btrfs: don't use migrate page without CONFIG_MIGRATIONChris Mason1-1/+6
Fixes compile error Signed-off-by: Chris Mason <[email protected]>
2010-11-28ucc_geth: fix ucc halt problem in half duplex modeYang Li1-1/+2
In commit 58933c64(ucc_geth: Fix the wrong the Rx/Tx FIFO size), the UCC_GETH_UTFTT_INIT is set to 512 based on the recommendation of the QE Reference Manual. But that will sometimes cause tx halt while working in half duplex mode. According to errata draft QE_GENERAL-A003(High Tx Virtual FIFO threshold size can cause UCC to halt), setting UTFTT less than [(UTFS x (M - 8)/M) - 128] will prevent this from happening (M is the minimum buffer size). The patch changes UTFTT back to 256. Signed-off-by: Li Yang <[email protected]> Cc: Jean-Denis Boyer <[email protected]> Cc: Andreas Schmitz <[email protected]> Cc: Anton Vorontsov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28inet: Fix __inet_inherit_port() to correctly increment bsockets and num_ownersNagendra Tomar1-2/+1
inet sockets corresponding to passive connections are added to the bind hash using ___inet_inherit_port(). These sockets are later removed from the bind hash using __inet_put_port(). These two functions are not exactly symmetrical. __inet_put_port() decrements hashinfo->bsockets and tb->num_owners, whereas ___inet_inherit_port() does not increment them. This results in both of these going to -ve values. This patch fixes this by calling inet_bind_hash() from ___inet_inherit_port(), which does the right thing. 'bsockets' and 'num_owners' were introduced by commit a9d8f9110d7e953c (inet: Allowing more than 64k connections and heavily optimize bind(0)) Signed-off-by: Nagendra Singh Tomar <[email protected]> Acked-by: Eric Dumazet <[email protected]> Acked-by: Evgeniy Polyakov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28ehea: Add some info messages and fix an issueBreno Leitao1-4/+14
This patch adds some debug information about ehea not being able to allocate enough spaces. Also it correctly updates the amount of available skb. Signed-off-by: Breno Leitao <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28Btrfs: deal with DIO bios that span more than one ordered extentChris Mason3-4/+89
The new DIO bio splitting code has problems when the bio spans more than one ordered extent. This will happen as the generic DIO code merges our get_blocks calls together into a bigger single bio. This fixes things by walking forward in the ordered extent code finding all the overlapping ordered extents and completing them all at once. Signed-off-by: Chris Mason <[email protected]>
2010-11-28Un-inline get_pipe_info() helper functionLinus Torvalds2-12/+13
This avoids some include-file hell, and the function isn't really important enough to be inlined anyway. Reported-by: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-28Export 'get_pipe_info()' to other usersLinus Torvalds3-12/+13
And in particular, use it in 'pipe_fcntl()'. The other pipe functions do not need to use the 'careful' version, since they are only ever called for things that are already known to be pipes. The normal read/write/ioctl functions are called through the file operations structures, so if a file isn't a pipe, they'd never get called. But pipe_fcntl() is special, and called directly from the generic fcntl code, and needs to use the same careful function that the splice code is using. Cc: Jens Axboe <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Al Viro <[email protected]> Cc: Dave Jones <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-28Rename 'pipe_info()' to 'get_pipe_info()'Linus Torvalds1-10/+9
.. and change it to take the 'file' pointer instead of an inode, since that's what all users want anyway. The renaming is preparatory to exporting it to other users. The old 'pipe_info()' name was too generic and is already used elsewhere, so before making the function public we need to use a more specific name. Cc: Jens Axboe <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Al Viro <[email protected]> Cc: Dave Jones <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-11-28Merge branch 'perf-fixes-for-linus' of ↵Linus Torvalds4-19/+57
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix the software context switch counter perf, x86: Fixup Kconfig deps x86, perf, nmi: Disable perf if counters are not accessible perf: Fix inherit vs. context rotation bug
2010-11-28Merge branch 'fwnet' of ↵Linus Torvalds1-70/+90
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'fwnet' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: net: throttle TX queue before running out of tlabels firewire: net: replace lists by counters firewire: net: fix memory leaks firewire: net: count stats.tx_packets and stats.tx_bytes
2010-11-28hso: fix disable_netFilip Aben1-4/+6
The HSO driver incorrectly creates a serial device instead of a net device when disable_net is set. It shouldn't create anything for the network interface. Signed-off-by: Filip Aben <[email protected]> Reported-by: Piotr Isajew <[email protected]> Reported-by: Johan Hovold <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28NET: wan/x25_asy, move lapb_unregister to x25_asy_close_ttyJiri Slaby1-5/+6
We register lapb when tty is created, but unregister it only when the device is UP. So move the lapb_unregister to x25_asy_close_tty after the device is down. The old behaviour causes ldisc switching to fail each second attempt, because we noted for us that the device is unused, so we use it the second time, but labp layer still have it registered, so it fails obviously. Signed-off-by: Jiri Slaby <[email protected]> Reported-by: Sergey Lapin <[email protected]> Cc: Andrew Hendry <[email protected]> Tested-by: Sergey Lapin <[email protected]> Tested-by: Mikhail Ulyanov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28cxgb4vf: fix setting unicast/multicast addresses ...Casey Leedom2-63/+104
We were truncating the number of unicast and multicast MAC addresses supported. Additionally, we were incorrectly computing the MAC Address hash (a "1 << N" where we needed a "1ULL << N"). Signed-off-by: Casey Leedom <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28net, ppp: Report correct error code if unit allocation failedCyrill Gorcunov1-21/+22
Allocating unit from ird might return several error codes not only -EAGAIN, so it should not be changed and returned precisely. Same time unit release procedure should be invoked only if device is unregistering. Signed-off-by: Cyrill Gorcunov <[email protected]> CC: Paul Mackerras <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-11-28DECnet: don't leak uninitialized stack byteDan Rosenberg1-0/+2
A single uninitialized padding byte is leaked to userspace. Signed-off-by: Dan Rosenberg <[email protected]> CC: stable <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.