- 16 Mar, 2012 3 commits
-
-
Jason Cooper authored
Signed-off-by:
Andrew Lunn <andrew@lunn.ch> Signed-off-by:
Jason Cooper <jason@lakedaemon.net> Acked-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Arnd Bergmann <arnd@arndb.de>
-
Andrew Lunn authored
It is not used anywhere in the sound driver. Signed-off-by:
-
Andrew Lunn authored
Signed-off-by:
-
- 04 Mar, 2012 2 commits
-
-
Arnd Bergmann authored
Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards Tegra board updates. Most of the board updates for tegra30 and for some of the driver device-tree conversions have gone in through the other branches, so that leaves quite little left here -- mostly a couple of updates to the not-yet-converted tegra2 boards and a couple of device-tree updates. * tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra: ARM: tegra: match SoC name not board name in DT board files ARM: tegra: PCIe: Provide 3.3V supply voltage ARM: dt: tegra: add the wifi led to paz00 device tree ARM: dt: tegra: add the power gpio key to paz00 device tree ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree Signed-off-by:
-
Stephen Warren authored
board-dt-tegra*.c should support any board using Tegra when booted using device tree. Instead of explicitly listing all the supported boards, which requires a kernel change for each new board, list the supported SoC model instead. Note that the board files do currently have explicit support for setting up each board's pinmux. However, it's fairly likely that at least the basic devices on any new board will work just fine as set up by the boot- loader, and the pinmux data should be moving into device tree soon anyway. Signed-off-by:
Stephen Warren <swarren@nvidia.com> Signed-off-by:
Olof Johansson <olof@lixom.net>
-
- 02 Mar, 2012 9 commits
-
-
Arnd Bergmann authored
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards * 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6: mx31moboard: Add watchdog support mx31moboard: update maintainer
-
Arnd Bergmann authored
Merge branch 'features/imx27-visstrim' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards * 'features/imx27-visstrim' of git://git.pengutronix.de/git/imx/linux-2.6: i.MX27: visstrim_m10: Add led support. i.MX27: visstrim_m10: Add video support. i.MX27: visstrim_m10: Register I2C devices after I2C busses have been added. i.MX27: visstrim_m10: Sort IMX_HAVE_PLATFORM_MXC_MMC properly. i.MX27: visstrim_m10: Add m41t00 RTC support.
-
Philippe Rétornaz authored
Signed-off-by:
Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by:
Sascha Hauer <s.hauer@pengutronix.de>
-
Philippe Rétornaz authored
Signed-off-by:
-
Javier Martin authored
Vista Silicon Visstrim_m10 board has 4 leds to signal several working conditions. Signed-off-by:
Javier Martin <javier.martin@vista-silicon.com> Signed-off-by:
-
Javier Martin authored
Vista Silicon Visstrim_m10 board has a tvp5150 video decoder attached to the CSI interface Signed-off-by:
-
Javier Martin authored
Signed-off-by:
-
Javier Martin authored
Signed-off-by:
-
Javier Martin authored
Signed-off-by:
-
- 29 Feb, 2012 1 commit
-
-
Arnd Bergmann authored
Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards * 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: input: serio: ams-delta: toggle keyboard power over GPIO omapfb: lcd_ams_delta: drive control lines over GPIO MTD: NAND: ams-delta: use GPIO instead of custom I/O LED: drop leds-ams-delta driver ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio ARM: OMAP1: ams-delta: register latch dependent devices later
-
- 28 Feb, 2012 6 commits
-
-
git://github.com/hzhuang1/linuxArnd Bergmann authored
* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits) ARM: pxa: add dummy clock for pxa25x and pxa27x ARM: mmp: append irq name of gpio device pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values pxa/hx4700: Add ASIC3 LED support pxa/hx4700: Correct StrataFlash block size discovery (update to v3.3-rc5)
-
Haojian Zhuang authored
gpio-pxa driver is shared among arch-pxa and arch-mmp. Clock is the essential component on pxa3xx/pxa95x and arch-mmp. So we need to define dummy clock in pxa25x/pxa27x instead. Signed-off-by:Haojian Zhuang <haojian.zhuang@marvell.com>
-
Haojian Zhuang authored
IRQ name is required in gpio-pxa driver. So we need to append the name in gpio device. Otherwise, we can't register gpio-pxa driver successfully. Signed-off-by: -
Paul Parsons authored
The hx4700 platform has 72 board gpios: 64 ASIC3 gpios numbered 192..255, and 8 EGPIO gpios numbered 256..263 (plus a 9th which is not used). Thus the new CONFIG_ARCH_NR_GPIO config option must be set to 264. Signed-off-by:
Paul Parsons <lost.distance@yahoo.com> Acked-by:
Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by:
Haojian Zhuang <haojian.zhuang@gmail.com>
-
Paul Parsons authored
Add LED support for the HTC ASIC3. Underlying support is provided by the mfd/asic3 and leds/leds-asic3 drivers. An example configuration is provided by the pxa/hx4700 platform. Signed-off-by:
-
Paul Parsons authored
The HP iPAQ hx4700 has 128Mb of flash provided by two Intel StrataFlash devices. The hx4700 platform configuration defines a single 128Mb flash resource, resulting in the MTD physmap-flash driver probing the first device only and presuming the second device is identical: physmap platform flash device: 08000000 at 00000000 physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008816 physmap-flash: Found 2 x16 devices at 0x4000000 in 32-bit bank <snip> erase region 0: offset=0x0,size=0x10000,blocks=4 erase region 1: offset=0x40000,size=0x40000,blocks=255 erase region 2: offset=0x4000000,size=0x10000,blocks=4 erase region 3: offset=0x4040000,size=0x40000,blocks=255 physmap-flash: 2 set(s) of 2 interleaved chips --> 32 partitions of 4096 KiB Unfortunately the two devices are not identical. The first has a device ID of 0x8816, identifying a bottom parameter device. The second has a device ID of 0x8813, identifying a top parameter device. By not probing the second device, physmap-flash does not discover the correct block sizes. This patch splits the configuration into two 64Mb flash resources, forcing physmap-flash to probe both devices and thus discover the correct block sizes: physmap platform flash device: 04000000 at 00000000 physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008816 <snip> erase region 0: offset=0x0,size=0x10000,blocks=4 erase region 1: offset=0x40000,size=0x40000,blocks=255 physmap-flash: 1 set(s) of 2 interleaved chips --> 16 partitions of 4096 KiB physmap platform flash device: 04000000 at 04000000 physmap-flash: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x000089 Chip ID 0x008813 <snip> erase region 0: offset=0x0,size=0x40000,blocks=255 erase region 1: offset=0x3fc0000,size=0x10000,blocks=4 physmap-flash: 1 set(s) of 2 interleaved chips --> 16 partitions of 4096 KiB Concatenating MTD devices: (0): "physmap-flash" (1): "physmap-flash" into device "physmap-flash" Signed-off-by:
-
- 27 Feb, 2012 3 commits
-
-
Arnd Bergmann authored
* kirkwood/board: (2 commits) ARM: kirkwood: convert uart0 to devicetree. ARM: kirkwood: add dreamplug (fdt) support. Series sent by email from Jason Cooper <jason@lakedaemon.net> Update to Linux 3.3-rc3 Signed-off-by: -
Jason Cooper authored
This uart is the primary console for the dreamplug. Removed kirkwood_uart0_init() call from board-dt.c. Signed-off-by:
Nicolas Pitre <nico@linaro.org> Signed-off-by:
-
Jason Cooper authored
Initially, copied guruplug-setup.c and did s/guruplug/dreamplug/g. Then, switched to SPI based NOR flash. After talking to Arnd Bergman, chose an incremental approach to adding devicetree support. First, we use the dtb to tell us we are on the dreamplug, then we gradually port over drivers. Driver porting will start with the uart (see next patch), and progress from there. Possibly, spi/flash/partitions will be next. When done, board-dt.c will no longer be dreamplug specific, and dt's can be made for the other kirkwood boards. Signed-off-by:
-
- 26 Feb, 2012 1 commit
-
-
Thierry Reding authored
The PCIe reference clock needs a 3.3V supply voltage to work properly. Signed-off-by:
Thierry Reding <thierry.reding@avionic-design.de> Acked-by:
-
- 25 Feb, 2012 6 commits
-
-
Linus Torvalds authored
-
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-stagingLinus Torvalds authored
Couple of minor driver fixes. * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (max34440) Fix resetting temperature history hwmon: (f75375s) Fix register write order when setting fans to full speed hwmon: (ads1015) Fix file leak in probe function hwmon: (max6639) Fix PPR register initialization to set both channels hwmon: (max6639) Fix FAN_FROM_REG calculation
-
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuildLinus Torvalds authored
three kbuild fixes for 3.3: - make deb-pkg symlink race fix. - make coccicheck fix. - Dropping the check for modutils. This is not a regression, but allows the module-init-tools replacement kmod work with the 3.3 kernel. * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: coccicheck: change handling of C={1,2} when M= is set builddeb: Don't create files in /tmp with predictable names kbuild: do not check for ancient modutils tools
-
Ian Kent authored
When the autofs protocol version 5 packet type was added in commit 5c0a32fc ("autofs4: add new packet type for v5 communications"), it obvously tried quite hard to be word-size agnostic, and uses explicitly sized fields that are all correctly aligned. However, with the final "char name[NAME_MAX+1]" array at the end, the actual size of the structure ends up being not very well defined: because the struct isn't marked 'packed', doing a "sizeof()" on it will align the size of the struct up to the biggest alignment of the members it has. And despite all the members being the same, the alignment of them is different: a "__u64" has 4-byte alignment on x86-32, but native 8-byte alignment on x86-64. And while 'NAME_MAX+1' ends up being a nice round number (256), the name[] array starts out a 4-byte aligned. End result: the "packed" size of the structure is 300 bytes: 4-byte, but not 8-byte aligned. As a result, despite all the fields being in the same place on all architectures, sizeof() will round up that size to 304 bytes on architectures that have 8-byte alignment for u64. Note that this is *not* a problem for 32-bit compat mode on POWER, since there __u64 is 8-byte aligned even in 32-bit mode. But on x86, 32-bit and 64-bit alignment is different for 64-bit entities, and as a result the structure that has exactly the same layout has different sizes. So on x86-64, but no other architecture, we will just subtract 4 from the size of the structure when running in a compat task. That way we will write the properly sized packet that user mode expects. Not pretty. Sadly, this very subtle, and unnecessary, size difference has been encoded in user space that wants to read packets of *exactly* the right size, and will refuse to touch anything else. Reported-and-tested-by:
Thomas Meyer <thomas@m3y3r.de> Signed-off-by:
Ian Kent <raven@themaw.net> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infinibandLinus Torvalds authored
One InfiniBand/RDMA regression fix for 3.3: - mlx4 SR-IOV changes added static exported functions, which doesn't build on powerpc at least. Fix from Doug Ledford for this. * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: mlx4_core: Exported functions can't be static
-
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds authored
SCSI fixes on 20120224: "This is a set of assorted bug fixes for power management, mpt2sas, ipr, the rdac device handler and quite a big chunk for qla2xxx (plus a use after free of scsi_host in scsi_scan.c). " * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_dh_rdac: Fix for unbalanced reference count [SCSI] scsi_pm: Fix bug in the SCSI power management handler [SCSI] scsi_scan: Fix 'Poison overwritten' warning caused by using freed 'shost' [SCSI] qla2xxx: Update version number to 8.03.07.13-k. [SCSI] qla2xxx: Proper detection of firmware abort error code for ISP82xx. [SCSI] qla2xxx: Remove resetting memory during device initialization for ISP82xx. [SCSI] qla2xxx: Complete mailbox command timedout to avoid initialization failures during next reset cycle. [SCSI] qla2xxx: Remove check for null fcport from host reset handler. [SCSI] qla2xxx: Correct out of bounds read of ISP2200 mailbox registers. [SCSI] qla2xxx: Remove errant clearing of MBX_INTERRUPT flag during CT-IOCB processing. [SCSI] qla2xxx: Clear options-flags while issuing stop-firmware mbx command. [SCSI] qla2xxx: Add an "is reset active" helper. [SCSI] qla2xxx: Add check for null fcport references in qla2xxx_queuecommand. [SCSI] qla2xxx: Propagate up abort failures. [SCSI] isci: Fix NULL ptr dereference when no firmware is being loaded [SCSI] ipr: fix eeh recovery for 64-bit adapters [SCSI] mpt2sas: Fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
-
- 24 Feb, 2012 9 commits
-
-
Greg Dietsche authored
This patch reverts a portion of d0bc1fb4 so that coccicheck will work properly when C=1 or C=2. Reported-and-tested-by:
Brice Goglin <Brice.Goglin@inria.fr> Signed-off-by:
Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by:
Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by:
Michal Marek <mmarek@suse.cz>
-
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-mediaLinus Torvalds authored
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] hdpvr: update picture controls to support firmware versions > 0.15 [media] wl128x: fix build errors when GPIOLIB is not enabled [media] hdpvr: fix race conditon during start of streaming [media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes [media] imon: don't wedge hardware after early callbacks
-
Oleg Nesterov authored
signalfd_cleanup() ensures that ->signalfd_wqh is not used, but this is not enough. eppoll_entry->whead still points to the memory we are going to free, ep_unregister_pollwait()->remove_wait_queue() is obviously unsafe. Change ep_poll_callback(POLLFREE) to set eppoll_entry->whead = NULL, change ep_unregister_pollwait() to check pwq->whead != NULL under rcu_read_lock() before remove_wait_queue(). We add the new helper, ep_remove_wait_queue(), for this. This works because sighand_cachep is SLAB_DESTROY_BY_RCU and because ->signalfd_wqh is initialized in sighand_ctor(), not in copy_sighand. ep_unregister_pollwait()->remove_wait_queue() can play with already freed and potentially reused ->sighand, but this is fine. This memory must have the valid ->signalfd_wqh until rcu_read_unlock(). Reported-by:
Maxime Bizon <mbizon@freebox.fr> Cc: <stable@kernel.org> Signed-off-by:
Oleg Nesterov <oleg@redhat.com> Signed-off-by:
-
Oleg Nesterov authored
This patch is intentionally incomplete to simplify the review. It ignores ep_unregister_pollwait() which plays with the same wqh. See the next change. epoll assumes that the EPOLL_CTL_ADD'ed file controls everything f_op->poll() needs. In particular it assumes that the wait queue can't go away until eventpoll_release(). This is not true in case of signalfd, the task which does EPOLL_CTL_ADD uses its ->sighand which is not connected to the file. This patch adds the special event, POLLFREE, currently only for epoll. It expects that init_poll_funcptr()'ed hook should do the necessary cleanup. Perhaps it should be defined as EPOLLFREE in eventpoll. __cleanup_sighand() is changed to do wake_up_poll(POLLFREE) if ->signalfd_wqh is not empty, we add the new signalfd_cleanup() helper. ep_poll_callback(POLLFREE) simply does list_del_init(task_list). This make this poll entry inconsistent, but we don't care. If you share epoll fd which contains our sigfd with another process you should blame yourself. signalfd is "really special". I simply do not know how we can define the "right" semantics if it used with epoll. The main problem is, epoll calls signalfd_poll() once to establish the connection with the wait queue, after that signalfd_poll(NULL) returns the different/inconsistent results depending on who does EPOLL_CTL_MOD/signalfd_read/etc. IOW: apart from sigmask, signalfd has nothing to do with the file, it works with the current thread. In short: this patch is the hack which tries to fix the symptoms. It also assumes that nobody can take tasklist_lock under epoll locks, this seems to be true. Note: - we do not have wake_up_all_poll() but wake_up_poll() is fine, poll/epoll doesn't use WQ_FLAG_EXCLUSIVE. - signalfd_cleanup() uses POLLHUP along with POLLFREE, we need a couple of simple changes in eventpoll.c to make sure it can't be "lost". Reported-by:
-
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfsLinus Torvalds authored
Quoth Chris: "This is later than I wanted because I got backed up running through btrfs bugs from the Oracle QA teams. But they are all bug fixes that we've queued and tested since rc1. Nothing in particular stands out, this just reflects bug fixing and QA done in parallel by all the btrfs developers. The most user visible of these is: Btrfs: clear the extent uptodate bits during parent transid failures Because that helps deal with out of date drives (say an iscsi disk that has gone away and come back). The old code wasn't always properly retrying the other mirror for this type of failure." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (24 commits) Btrfs: fix compiler warnings on 32 bit systems Btrfs: increase the global block reserve estimates Btrfs: clear the extent uptodate bits during parent transid failures Btrfs: add extra sanity checks on the path names in btrfs_mksubvol Btrfs: make sure we update latest_bdev Btrfs: improve error handling for btrfs_insert_dir_item callers Btrfs: be less strict on finding next node in clear_extent_bit Btrfs: fix a bug on overcommit stuff Btrfs: kick out redundant stuff in convert_extent_bit Btrfs: skip states when they does not contain bits to clear Btrfs: check return value of lookup_extent_mapping() correctly Btrfs: fix deadlock on page lock when doing auto-defragment Btrfs: fix return value check of extent_io_ops btrfs: honor umask when creating subvol root btrfs: silence warning in raid array setup btrfs: fix structs where bitfields and spinlock/atomic share 8B word btrfs: delalloc for page dirtied out-of-band in fixup worker Btrfs: fix memory leak in load_free_space_cache() btrfs: don't check DUP chunks twice Btrfs: fix trim 0 bytes after a device delete ... -
git://linux-c6x.org/git/projects/linux-c6x-upstreamingLinus Torvalds authored
This is the arch/c6x part of commit 7c431851 ("Kbuild: Use dtc's -d (dependency) option") which was dropped because c6x had not yet been merged at the time. * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: Kbuild: Use dtc's -d (dependency) option
-
Kyle McMartin authored
I don't even live in the same country as any of my PA-RISC hardware these days, so the odds of me touching the code are pretty low. (Also re-order things to ensure jejb gets CC'd since he's been the primary maintainer for the last few years.) Signed-off-by:
Kyle McMartin <kyle@mcmartin.ca> Signed-off-by:
-
David Howells authored
Don't clear vm_mm in a deleted VMA as it's unnecessary and might conceivably break the filesystem or driver VMA close routine. Reported-by:
Al Viro <viro@zeniv.linux.org.uk> Signed-off-by:
David Howells <dhowells@redhat.com> Acked-by:
-
David Howells authored
Lock i_mmap_mutex for access to the VMA prio list to prevent concurrent access. Currently, certain parts of the mmap handling are protected by the region mutex, but not all. Reported-by:
-
