commit ecb78ab6f30106ab72a575a25b1cdfd1633b7ca2 Merge: 85cf0ac 5e42d10 Author: Linus Torvalds Date: Wed Mar 30 12:22:15 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build breakage - sn_force_interrupt_flag: undefined commit 85cf0ac38c10b1f19fb1682354df1f7d9380a973 Merge: 50f3515 af71dda Author: Linus Torvalds Date: Wed Mar 30 09:46:36 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix whitespace coding style issues nilfs2: fix oops due to a bad aops initialization nilfs2: fix data loss in mmap page write for hole blocks commit 50f3515828024582402044bcced6804c070c491c Merge: 6aba74f 4b2a58a Author: Linus Torvalds Date: Wed Mar 30 09:46:09 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: Create a new key type "ceph". libceph: Get secret from the kernel keys api when mounting with key=NAME. ceph: Move secret key parsing earlier. libceph: fix null dereference when unregistering linger requests ceph: unlock on error in ceph_osdc_start_request() ceph: fix possible NULL pointer dereference ceph: flush msgr_wq during mds_client shutdown commit 6aba74f2791287ec407e0f92487a725a25908067 Merge: a8e498b dd8ea6a Author: Linus Torvalds Date: Wed Mar 30 09:35:52 2011 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: avr32: Fix missing irq namespace conversion powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip genirq: Remove the now obsolete config options and select statements arm: versatile : Fix typo introduced in irq namespace cleanup sound: Fixup the last user of the old irq functions genirq: Remove obsolete comment genirq: Remove now obsolete set_irq_wake() sh: Fix irq cleanup fallout x86: apb_timer: Fixup genirq fallout genirq: Fix misnamed label in handle_edge_eoi_irq Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h: - commit eead4d5c63ff ("powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip") made the helper functions use irq_desc_get_handler_data() instead of the legacy (and no longer existing) get_irq_desc_data. - commit d4db35e8dc96 ("powerpc/qe_ic: Fix another breakage from the irq_data conversion") used irq_desc_get_chip_data() instead. According to Thomas, the former is the correct direct conversion, but it does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c seems to initialize both to the same thing), and the chip data in some ways is the more logical. Somebody should really decide on one of the other. This merge picks irq_desc_get_handler_data() as the straightforward pure conversion to new names, as per Thomas. commit a8e498b768d912ad3e7069c86b86bdb821d43b5f Merge: a8a4492 d4db35e Author: Linus Torvalds Date: Wed Mar 30 07:53:17 2011 -0700 Merge branch 'merge' of 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/qe_ic: Fix another breakage from the irq_data conversion powerpc/8xx: Fix another breakage from the irq_data conversion powerpc/cell: Use handle_edge_eoi_irq for real powerpc/pseries: Enable Chelsio network and iWARP drivers powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory powerpc: Fix accounting of softirq time when idle powerpc/pseries/smp: query-cpu-stopped-state support won't change powerpc/xics: Use hwirq for xics domain irq number powerpc/xics: Fix numberspace mismatch from irq_desc conversion powerpc: Wire up new syscalls powerpc/booke: Correct the SPRN_MAS5 definition. powerpc: ARCH_PFN_OFFSET should be unsigned long powerpc: Implement dma_mmap_coherent() powerpc/nvram: Don't overwrite oops/panic report on normal shutdown powerpc: Restore some misc devices to our configs commit a8a44921383039bd5387020d035123d21660b309 Merge: 85eb151 92a19d6 Author: Linus Torvalds Date: Wed Mar 30 07:51:29 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bitops: fix include order after little endian inclusion Blackfin: defconfigs: update after misc devices defaulted to N Blackfin: use more standard pr_fmt in the module loader commit 85eb1513c15652cdaa9fd656345825bf55514a96 Merge: e122996 b43d151 Author: Linus Torvalds Date: Wed Mar 30 07:50:45 2011 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits) ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support ARM: 6838/1: etm: fix section mismatch warning ARM: 6837/1: remove unused pci_fixup_prpmc1100 ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC Fix the broken build for Marvell Dove platform. ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency ARM: 6834/1: perf: reset counters on all CPUs during initialisation ARM: 6833/1: perf: add required isbs() to ARMv7 backend ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 eukrea_mbimxsd51: add SD Card detect eukrea_mbimxsd25-baseboard: add SD card detect mx3/eukrea_mbimxsd-baseboard: add SD card detect support mx3/eukrea_mbimxsd-baseboard: fix gpio request ARM: mxs/mx28evk: add mmc device ARM: mxs/mx23evk: add mmc device ARM: mxs: dynamically allocate mmc device ARM: mx51_efika: update platform data for new mfd changes mx2/iomux: Set direction for CSPI2 pins ... commit dd8ea6af1b9f4cedefb718dbfff60203c458d7ab Author: Thomas Gleixner Date: Wed Mar 30 15:33:51 2011 +0200 avr32: Fix missing irq namespace conversion Signed-off-by: Thomas Gleixner commit eead4d5c63ff9200a46d71345227f2b2f3eb86c0 Author: Richard Cochran Date: Wed Mar 30 15:25:04 2011 +0200 powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip These two functions disappeared in commit 0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1 "genirq: Remove compat code" but they still exist in qe_ic.h. This patch renames the function to their new names. Signed-off-by: Richard Cochran Cc: linuxppc-dev@lists.ozlabs.org Cc: Lennert Buytenhek Cc: Benjamin Herrenschmidt LKML-Reference: <20110330132504.GA31832@riccoc20.at.omicron.at> Signed-off-by: Thomas Gleixner commit 78c89825649a9a5ed526c507603196f467d781a5 Author: Thomas Gleixner Date: Wed Mar 30 14:13:23 2011 +0200 genirq: Remove the now obsolete config options and select statements Signed-off-by: Thomas Gleixner commit e282326600f31ab38d8814fd6deb277a48850c35 Author: Grant Likely Date: Wed Mar 30 00:02:29 2011 -0600 arm: versatile : Fix typo introduced in irq namespace cleanup Commit 6845664(arm: Cleanup the irq namespace) introduces a typo causing a build failure for the versatile platform. [ tglx: Sorry, my bad. Have no idea how I fatfingered that ] Signed-off-by: Grant Likely Cc: Catalin Marinas Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org LKML-Reference: <20110330060229.27397.7628.stgit@ponder> Signed-off-by: Thomas Gleixner commit af71dda0b8e667d03eec21d25f90265eec5efea1 Author: Nicolas Kaiser Date: Sat Mar 19 16:47:54 2011 +0100 nilfs2: fix whitespace coding style issues Fixes whitespace coding style issues. Signed-off-by: Nicolas Kaiser Signed-off-by: Ryusuke Konishi commit d611b22f1a5ddd0823e9d6a30bac91219f800e41 Author: Ryusuke Konishi Date: Wed Mar 30 11:49:20 2011 +0900 nilfs2: fix oops due to a bad aops initialization Nilfs in 2.6.39-rc1 hit the following oops: BUG: unable to handle kernel NULL pointer dereference at 0000000000000048 IP: [] try_to_release_page+0x2a/0x3d PGD 234cb6067 PUD 234c72067 PMD 0 Oops: 0000 [#1] SMP Process truncate (pid: 10995, threadinfo ffff8802353c2000, task ffff880234cfa000) Stack: ffff8802333c77b8 ffffffff810b64b0 0000000000003802 ffffffffa0052cca 0000000000000000 ffff8802353c3b58 0000000000000000 ffff8802353c3b58 0000000000000001 0000000000000000 ffffea0007b92308 ffffea0007b92308 Call Trace: [] ? invalidate_inode_pages2_range+0x15f/0x273 [] ? nilfs_palloc_get_block+0x2d/0xaf [nilfs2] [] ? bit_waitqueue+0x14/0xa1 [] ? wake_up_bit+0x10/0x20 [] ? nilfs_forget_buffer+0x66/0x7a [nilfs2] [] ? nilfs_btree_concat_left+0x5c/0x77 [nilfs2] [] ? nilfs_btree_delete+0x395/0x3cf [nilfs2] [] ? nilfs_bmap_do_delete+0x6e/0x79 [nilfs2] [] ? nilfs_btree_last_key+0x14b/0x15e [nilfs2] [] ? nilfs_bmap_truncate+0x2f/0x83 [nilfs2] [] ? nilfs_bmap_last_key+0x35/0x62 [nilfs2] [] ? nilfs_truncate_bmap+0x6b/0xc7 [nilfs2] [] ? nilfs_truncate+0x79/0xe4 [nilfs2] [] ? vmtruncate+0x33/0x3b [] ? nilfs_setattr+0x4d/0x8c [nilfs2] [] ? do_page_fault+0x31b/0x356 [] ? notify_change+0x17d/0x262 [] ? do_truncate+0x65/0x80 [] ? sys_ftruncate+0xf1/0xf6 [] ? system_call_fastpath+0x16/0x1b Code: c3 48 83 ec 08 48 8b 17 48 8b 47 18 80 e2 01 75 04 0f 0b eb fe 48 8b 17 80 e6 20 74 05 31 c0 41 59 c3 48 85 c0 74 11 48 8b 40 58 8b 40 48 48 85 c0 74 04 41 58 ff e0 59 e9 b1 b5 05 00 41 54 RIP [] try_to_release_page+0x2a/0x3d RSP CR2: 0000000000000048 This oops was brought in by the change "block: remove per-queue plugging" (commit: 7eaceaccab5f40bb). It initializes mapping->a_ops with a NULL pointer for some pages in nilfs (e.g. btree node pages), but mm code doesn't NULL pointer checks against mapping->a_ops. (the check is done for each callback function) This corrects the aops initialization and fixes the oops. Signed-off-by: Ryusuke Konishi Acked-by: Jens Axboe commit 34094537943113467faee98fe67c8a3d3f9a0a8b Author: Ryusuke Konishi Date: Sun Mar 27 22:50:49 2011 +0900 nilfs2: fix data loss in mmap page write for hole blocks From the result of a function test of mmap, mmap write to shared pages turned out to be broken for hole blocks. It doesn't write out filled blocks and the data will be lost after umount. This is due to a bug that the target file is not queued for log writer when filling hole blocks. Also, nilfs_page_mkwrite function exits normal code path even after successfully filled hole blocks due to a change of block_page_mkwrite function; just after nilfs was merged into the mainline, block_page_mkwrite() started to return VM_FAULT_LOCKED instead of zero by the patch "mm: close page_mkwrite races" (commit: b827e496c893de0c). The current nilfs_page_mkwrite() is not handling this value properly. This corrects nilfs_page_mkwrite() and will resolve the data loss problem in mmap write. [This should be applied to every kernel since 2.6.30 but a fix is needed for 2.6.37 and prior kernels] Signed-off-by: Ryusuke Konishi Tested-by: Ryusuke Konishi Cc: stable [2.6.38] commit 5e42d10adcf717e0cf10ae5da4998d5b74889db0 Author: Tony Luck Date: Tue Mar 29 17:22:23 2011 -0700 [IA64] Fix build breakage - sn_force_interrupt_flag: undefined Latest irq changes removed the need for this forcing flag, and the definition - but missed the code that allowed it to be tweaked via /proc. Delete accessor functions too. Signed-off-by: Tony Luck commit d4db35e8dc963cf2aca15fc22cc5e5a7d98f9255 Author: Benjamin Herrenschmidt Date: Wed Mar 30 11:17:15 2011 +1100 powerpc/qe_ic: Fix another breakage from the irq_data conversion Signed-off-by: Benjamin Herrenschmidt commit b3cf2bb3d5de306aebfd1dfbcb0c8d33c0214046 Author: Benjamin Herrenschmidt Date: Wed Mar 30 11:07:13 2011 +1100 powerpc/8xx: Fix another breakage from the irq_data conversion Signed-off-by: Benjamin Herrenschmidt commit e122996ae1edf2caf19643cb79366fc2117a6188 Author: Stephen Rothwell Date: Wed Mar 30 10:48:28 2011 +1100 powerpc/cell: fixup for removal of handle_iic_irq Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit ac0e0447be3b7a3dd583193b0230bfe3ddef0442 Author: Stephen Rothwell Date: Wed Mar 30 10:55:12 2011 +1100 genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER build Fixes these errors: kernel/irq/chip.c: In function 'handle_edge_eoi_irq': kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 8987eccde8abce02a4fc765d81a4c5de3d110ab5 Author: Thomas Gleixner Date: Tue Mar 29 10:37:28 2011 +0000 powerpc/cell: Use handle_edge_eoi_irq for real Missed one instance when moving that to the core code. Signed-off-by: Thomas Gleixner Cc: linuxppc-dev@lists.ozlabs.org Cc: michael@ellerman.id.au Cc: mingo@elte.hu Signed-off-by: Benjamin Herrenschmidt commit 23c621104360b71fd6d713142a24e6583418c3e1 Author: Anton Blanchard Date: Sat Mar 5 02:00:26 2011 +0000 powerpc/pseries: Enable Chelsio network and iWARP drivers Ensure the Chelsio T3/T4 network drivers and iWARP drivers are enabled in the pseries config. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 84493804bbbc10291492661440728668b2b06abe Author: Benjamin Herrenschmidt Date: Sun Mar 6 18:09:07 2011 +0000 powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory Recent upstream builds with allmodconfig fail due to lack of space between 0x3000 and 0x6000. We have a hard block at 0x7000 but we can spare a page by moving the STAB0 from 0x6000 to 0x8000. Signed-off-by: Benjamin Herrenschmidt commit ad5d1c888e556bc00c4e86f452cad4a3a87d22c1 Author: Anton Blanchard Date: Sun Mar 20 15:28:03 2011 +0000 powerpc: Fix accounting of softirq time when idle commit cf9efce0ce31 (powerpc: Account time using timebase rather than PURR) used in_irq() to detect if the time was spent in interrupt processing. This only catches hardirq context so if we are in softirq context and in the idle loop we end up accounting it as idle time. If we instead use in_interrupt() we catch both softirq and hardirq time. The issue was found when running a network intensive workload. top showed the following: 0.0%us, 1.1%sy, 0.0%ni, 85.7%id, 0.0%wa, 9.9%hi, 3.3%si, 0.0%st 85.7% idle. But this was wildly different to the perf events data. To confirm the suspicion I ran something to keep the core busy: # yes > /dev/null & 8.2%us, 0.0%sy, 0.0%ni, 0.0%id, 0.0%wa, 10.3%hi, 81.4%si, 0.0%st We only got 8.2% of the CPU for the userspace task and softirq has shot up to 81.4%. With the patch below top shows the correct stats: 0.0%us, 0.0%sy, 0.0%ni, 5.3%id, 0.0%wa, 13.3%hi, 81.3%si, 0.0%st Signed-off-by: Anton Blanchard Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt commit 2d86938a4eacb4acf5c4466171ea577d7b8dc4d4 Author: Milton Miller Date: Mon Mar 21 08:12:13 2011 +0000 powerpc/pseries/smp: query-cpu-stopped-state support won't change If a given firmware doesn't have a token to support query-cpu-stopped-state, its not likely to change during the lifetime of the kernel. Only print this information once, not once per secondary thread. While here, make the line wrap grep friendly. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 943739fd59d3b77e1020ca788bc64439d679693f Author: Milton Miller Date: Mon Mar 21 08:12:13 2011 +0000 powerpc/xics: Use hwirq for xics domain irq number To try to avoid future confusion, rename irq to hwirq when it refers to a xics domain number instead of a linux irq number. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 4f1fc48a73a49a60b3e03e6d8fb363d1b328bd4e Author: Milton Miller Date: Mon Mar 21 11:38:02 2011 +0000 powerpc/xics: Fix numberspace mismatch from irq_desc conversion commit 79f26c268ebad29bd75d078cfc09d3d82b30ccbd (powerpc: platforms/pseries irq_data conversion) pushed irq_desc down into many functions, dererencing the descriptor irq field as late as possible. But it incorrectly passed a linix virtural irq number to RTAS, resulting in the interrupt not being disabled and possibly other bad things, such as another interrupt being disabled and/or a checkstop. In addition this missed the point of xics_mask_unknown_vec and the seperation of xics_mask_real_irq from xics_mask_irq. When xics_mask_unknown_vec is called it's because the hardware delivered an irq source for which we have no linux irq allocated, and thefore we can not have an irq_desc allocated. Revert xics_mask_real_irq to its prior version, naming the argument hwirq to highlight the difference. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 834796a8493809ae6667b65c4c044066f41d32c7 Author: Stephen Rothwell Date: Wed Mar 23 18:40:47 2011 +0000 powerpc: Wire up new syscalls These syscalls have been added recently: name_to_handle_at open_by_handle_at clock_adjtime syncfs Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 05e02d7f88a08b500f0a100733109e4b09ffbeb2 Author: Varun Sethi Date: Thu Mar 24 11:50:26 2011 +0000 powerpc/booke: Correct the SPRN_MAS5 definition. 339 is the SPR number for MAS5 documented by Power ISA 2.06, and implemented by e500mc. It is not yet used anywhere in the kernel, so nothing should be relying on the wrong number. Signed-off-by: Varun Sethi Signed-off-by: Scott Wood Signed-off-by: Benjamin Herrenschmidt commit 67eb54944bb9de5f568ea2c28d4f20a5b7d2611d Author: Scott Wood Date: Thu Mar 24 11:51:19 2011 +0000 powerpc: ARCH_PFN_OFFSET should be unsigned long pfns are unsigned long, but MEMORY_START is phys_addr_t. This leads to page_to_pfn() returning phys_addr_t, and thus type mismatches in a few print statements. Signed-off-by: Scott Wood Signed-off-by: Benjamin Herrenschmidt commit 6090912c4abcfc6c81b156cf2bb4cda23ae6e847 Author: Benjamin Herrenschmidt Date: Thu Mar 24 20:50:06 2011 +0000 powerpc: Implement dma_mmap_coherent() This is used by Alsa to mmap buffers allocated with dma_alloc_coherent() into userspace. We need a special variant to handle machines with non-coherent DMAs as those buffers have "special" virt addresses and require non-cachable mappings Signed-off-by: Benjamin Herrenschmidt commit 15d260b36facc1aa769fb39b0efc41f4c8c44729 Author: Jim Keniston Date: Fri Mar 25 12:47:58 2011 +0000 powerpc/nvram: Don't overwrite oops/panic report on normal shutdown For normal halt, reboot, and poweroff events, refrain from overwriting the lnx,oops-log partition. Also, don't save the dmesg buffer on an emergency-restart event if we've already saved it earlier in panic(). Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit ff56535d294245b75fd8f79633b935a3b85993c8 Author: Stephen Rothwell Date: Fri Mar 25 21:11:29 2011 +0000 powerpc: Restore some misc devices to our configs Uwe Kleine-König reported: while working on an defconfig (arm/mx27) I noticed that just updating it[1] results in removing CONFIG_EEPROM_AT24=y. The reason is that since commit v2.6.36-5965-g5f2365d (misc devices: do not enable by default) MISC_DEVICES isn't enabled anymore by default. So all defconfigs that have CONFIG_SOME_SYMBOL=y (or =m) (with SOME_SYMBOL depending on MISC_DEVICES) but not CONFIG_MISC_DEVICES=y suffer from the same problem. This restores those misc devices to the powerpc defconfigs. Signed-off-by: Stephen Rothwell Cc: Uwe Kleine-König Acked-by: Uwe Kleine-König Signed-off-by: Benjamin Herrenschmidt commit 458f7f8f819b63431f1098a086fafce4a503fb77 Author: Thomas Gleixner Date: Wed Mar 30 00:39:44 2011 +0200 sound: Fixup the last user of the old irq functions I had seen that before, but now that I removed set_irq_wake it broke. Signed-off-by: Thomas Gleixner commit 28959f268f910b2cd1c25e838b63c342062e28f2 Author: Thomas Gleixner Date: Wed Mar 30 00:37:41 2011 +0200 genirq: Remove obsolete comment Signed-off-by: Thomas Gleixner commit 380a26be7d5af83f3831c3b6697031dffbb1c8f3 Author: Thomas Gleixner Date: Wed Mar 30 00:35:34 2011 +0200 genirq: Remove now obsolete set_irq_wake() Missed that one in the big compat remval patch Signed-off-by: Thomas Gleixner commit 286b9bfe8ef6d97213c86bbaf30c250fd1f67568 Author: Thomas Gleixner Date: Wed Mar 30 00:15:49 2011 +0200 sh: Fix irq cleanup fallout I missed that coccinelle does not fix up header files by default. Reported-by: Rafael J. Wysocki Signed-off-by: Thomas Gleixner Cc: Paul Mundt Cc: commit 86cc8dfc211695193a060a240ac9c9287606e5d8 Author: Thomas Gleixner Date: Wed Mar 30 00:09:01 2011 +0200 x86: apb_timer: Fixup genirq fallout The lonely user of the internal interface was not in the coccinelle script. Reported-by: Randy Dunlap Signed-off-by: Thomas Gleixner commit b43d151e9679a06df896ac3db65a9dca80040fed Merge: dfad549 5f18386 Author: Russell King Date: Tue Mar 29 21:54:54 2011 +0100 Merge branches 'fixes' and 'devel-stable' into for-linus commit 353c8ed44f8f7414be614685ed29d1e23f5fa76b Author: Thomas Gleixner Date: Tue Mar 29 22:18:28 2011 +0200 genirq: Fix misnamed label in handle_edge_eoi_irq Reported-by: michael@ellerman.id.au Signed-off-by: Thomas Gleixner Cc: linuxppc-dev@lists.ozlabs.org commit 4b2a58abd1e17c0ee53c8dded879e015917cca67 Author: Tommi Virtanen Date: Mon Mar 28 14:59:38 2011 -0700 libceph: Create a new key type "ceph". This allows us to use existence of the key type as a feature test, from userspace. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit e2c3d29b4295c3eec18294bc34f0c99a7b9ae413 Author: Tommi Virtanen Date: Fri Mar 25 16:40:48 2011 -0700 libceph: Get secret from the kernel keys api when mounting with key=NAME. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit 8323c3aa74cd92465350294567142d12ffdcc963 Author: Tommi Virtanen Date: Fri Mar 25 16:32:57 2011 -0700 ceph: Move secret key parsing earlier. This makes the base64 logic be contained in mount option parsing, and prepares us for replacing the homebew key management with the kernel key retention service. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit fbdb9190482fd83a3eb20cdeb0da454759f479d7 Author: Sage Weil Date: Tue Mar 29 12:11:06 2011 -0700 libceph: fix null dereference when unregistering linger requests We should only clear r_osd if we are neither registered as a linger or a regular request. We may unregister as a linger while still registered as a regular request (e.g., in reset_osd). Incorrectly clearing r_osd there leads to a null pointer dereference in __send_request. Also simplify the parallel check in __unregister_request() where we just removed r_osd_item and know it's empty. Signed-off-by: Sage Weil commit 234af26ff123dfb2aa48772124721b1354c8e0a5 Author: Dan Carpenter Date: Tue Mar 29 06:25:59 2011 +0300 ceph: unlock on error in ceph_osdc_start_request() There was a missing unlock on the error path if __map_request() failed. Signed-off-by: Dan Carpenter Signed-off-by: Sage Weil commit dfad549d98b60160547d1b8299051b9456c8da85 Author: Stephen Boyd Date: Wed Mar 23 22:46:15 2011 +0100 ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support The inline assembly differences for v6 vs. v7 are purely optimizations. On a v7 processor, an mrc with the pc sets the condition codes to the 28-31 bits of the register being read. It just so happens that the TX/RX full bits the DCC support code is testing for are high enough in the register to be put into the condition codes. On a v6 processor, this "feature" isn't implemented and thus we have to do the usual read, mask, test operations to check for TX/RX full. Thus, we can drop the v7 implementation and just use the v6 implementation for both. Cc: Tony Lindgren Signed-off-by: Stephen Boyd Signed-off-by: Russell King commit 8e8806990cfd91a4ec25df6f00528008c4b0087a Author: Ming Lei Date: Mon Mar 28 06:10:25 2011 +0100 ARM: 6838/1: etm: fix section mismatch warning The patch fixes the warning below: WARNING: arch/arm/kernel/built-in.o(.data+0x27c): Section mismatch in reference from the variable etb_driver to the function .init.text:etb_probe() The variable etb_driver references the function __init etb_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: arch/arm/kernel/built-in.o(.data+0x2cc): Section mismatch in reference from the variable etm_driver to the function .init.text:etm_probe() The variable etm_driver references the function __init etm_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Ming Lei Signed-off-by: Russell King commit 7f479c64a52094354c10309fcacaa71de015dc9e Author: Colin Cross Date: Sun Mar 27 00:45:25 2011 +0100 ARM: 6837/1: remove unused pci_fixup_prpmc1100 The PrPMC1100 machine was removed in 2.6.11, but left a reference to machine_is_prpmc1100 in arch/arm/kernel/bios32.c. 6f82f4db80189281a8ac42f2e72396accb719b57 removed the machine type, which causes a build failure: CC arch/arm/kernel/bios32.o arch/arm/kernel/bios32.c: In function 'pci_fixup_prpmc1100': arch/arm/kernel/bios32.c:174: error: implicit declaration of function 'machine_is_prpmc1100' Remove the unused pci_fixup_prpcm1100. Signed-off-by: Colin Cross Signed-off-by: Russell King commit 0652f067360fc3be2c3e668085f5fb2b76402928 Author: Viktor Rosendahl Date: Sat Mar 26 18:11:01 2011 +0100 ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC The Rn value from the emulation is unconditionally written back; this is fine as long as Rn != PC because in that case, even if the instruction isn't a write back instruction, it will only result in the same value being written back. In case Rn == PC, then the emulated instruction doesn't have the actual PC value in Rn but an adjusted value; when this is written back, it will result in the PC being incorrectly updated. An altenative solution would be to check bits 24 and 22 to see whether the instruction actually is a write back instruction or not. I think it's enough to check whether Rn != PC, because: - it's looks cheaper than the alternative - to my understaning it's not permitted to update the PC with a write back instruction, so we don't lose any ability to emulate legal instructions. - in case of writing back for non write back instructions where Rn != PC, it doesn't matter because the values are the same. Regarding the second point above, it would possibly be prudent to add some checking to prep_emulate_ldr_str(), so that instructions with both write back and Rn == PC would be rejected. Signed-off-by: Viktor Rosendahl Signed-off-by: Russell King commit 255bae73b214f143a3c7cc74d4792eb166a10d46 Merge: a737823 dc7b602 Author: Russell King Date: Mon Mar 28 18:57:19 2011 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes commit 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf Merge: 938c0ac a10aabd Author: Russell King Date: Mon Mar 28 18:52:44 2011 +0100 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e Author: Konstantin Porotchkin Date: Sun Mar 27 11:54:49 2011 +0200 Fix the broken build for Marvell Dove platform. Remove call to the old GPIO init function. Fix old MPP control offset value. Signed-off-by: Konstantin Porotchkin Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 Author: Mariusz Kozlowski Date: Sat Mar 26 19:29:34 2011 +0100 ceph: fix possible NULL pointer dereference This patch fixes 'event_work' dereference before it is checked for NULL. Signed-off-by: Mariusz Kozlowski Signed-off-by: Sage Weil commit a737823d37666255e3e74ce84bc9611a038e0888 Author: Will Deacon Date: Fri Mar 25 17:12:37 2011 +0100 ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency If a counter overflows during a perf stat profiling run it may overtake the last known value of the counter: 0 prev new 0xffffffff |----------|-------|----------------------| In this case, the number of events that have occurred is (0xffffffff - prev) + new. Unfortunately, the event update code will not realise an overflow has occurred and will instead report the event delta as (new - prev) which may be considerably smaller than the real count. This patch adds an extra argument to armpmu_event_update which indicates whether or not an overflow has occurred. If an overflow has occurred then we use the maximum period of the counter to calculate the elapsed events. Acked-by: Jamie Iles Reported-by: Ashwin Chaugule Signed-off-by: Will Deacon Signed-off-by: Russell King commit 574b69cbb633037a9c305d2993aeb680f4a8badd Author: Will Deacon Date: Fri Mar 25 13:13:34 2011 +0100 ARM: 6834/1: perf: reset counters on all CPUs during initialisation ARMv7 dictates that the interrupt-enable and count-enable registers for each PMU counter are UNKNOWN following core reset. This patch adds a new (optional) function pointer to struct arm_pmu for resetting the PMU state during init. The reset function is called on each CPU via an arch_initcall in the generic ARM perf_event code and allows the PMU backend to write sane values to any UNKNOWN registers. Acked-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4 Author: Will Deacon Date: Fri Mar 25 13:12:23 2011 +0100 ARM: 6833/1: perf: add required isbs() to ARMv7 backend The ARMv7 architecture does not guarantee that effects from co-processor writes are immediately visible to following instructions. This patch adds two isbs to the ARMv7 perf code: (1) Immediately after selecting an event register, so that the PMU state following this instruction is consistent with the new event. (2) Immediately before writing to the PMCR, so that any previous writes to the PMU have taken effect before (typically) enabling the counters. Acked-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit fb4fe87d79511398a68000d2100c825f54b51652 Author: Nicolas Pitre Date: Tue Mar 22 19:09:14 2011 +0100 ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues Signed-off-by: Nicolas Pitre Reviewed-by: Dave Martin Signed-off-by: Russell King commit 0efc48ecaf0f84430524a1759ab9c60aad8eab1e Author: Pawel Moll Date: Thu Mar 17 13:10:22 2011 +0100 ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile The second GIC, present when EB board is used with a MPCore tile, was initialised starting with irq number 64, which made interrupts 64-95 in the primary GIC unusable. Signed-off-by: Pawel Moll Signed-off-by: Russell King commit 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e Merge: 16c29da 5898eb7 Author: Russell King Date: Sat Mar 26 10:03:03 2011 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/tosa.c commit 92a19d66a3cc17feae20b4c1147e8b4dbf7b2282 Author: Mike Frysinger Date: Fri Mar 25 16:24:36 2011 -0400 Blackfin: bitops: fix include order after little endian inclusion The le.h header requires things like test_bit to be declared, so we need to move its inclusion to after the point where that happens. Signed-off-by: Mike Frysinger commit 901c23fb18fad6506c90e17fa265970c311b9227 Author: Mike Frysinger Date: Thu Mar 24 02:34:42 2011 -0400 Blackfin: defconfigs: update after misc devices defaulted to N The default value for misc devices was changed from Y to N which causes problems for mini defconfigs that were relying on this defaulting to Y. So update all of the defconfigs accordingly. Reported-by: Uwe Kleine-König Signed-off-by: Mike Frysinger commit b75a9e6bfba5c7343391ac1bacd44d6652dde8da Author: Joe Perches Date: Wed Oct 20 11:11:51 2010 -0700 Blackfin: use more standard pr_fmt in the module loader Changed pr_fmt(fmt) to make the format arguments match the format. Changed an argument name in apply_relocate from me to mod so that the pr_err is consistent with the other uses. Added missing '\n' to a format. Signed-off-by: Joe Perches Signed-off-by: Mike Frysinger commit ef550f6f4f6c9345a27ec85d98f4f7de1adce79c Author: Sage Weil Date: Fri Mar 25 13:27:48 2011 -0700 ceph: flush msgr_wq during mds_client shutdown The release method for mds connections uses a backpointer to the mds_client, so we need to flush the workqueue of any pending work (and ceph_connection references) prior to freeing the mds_client. This fixes an oops easily triggered under UML by while true ; do mount ... ; umount ... ; done Also fix an outdated comment: the flush in ceph_destroy_client only flushes OSD connections out. This bug is basically an artifact of the ceph -> ceph+libceph conversion. Signed-off-by: Sage Weil commit a10aabd5e313ec6481569be20d120191692b4ca6 Author: Wolfram Sang Date: Wed Feb 23 14:51:57 2011 +0100 arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer commit ef560bfe01eff692a307b7d73e60625ccdf05d87 Author: Eric Bénard Date: Fri Feb 25 14:38:31 2011 +0100 eukrea_mbimxsd51: add SD Card detect Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 01ea9aeae84536e2afe769be69b994de9f7ceed7 Author: Eric Bénard Date: Fri Feb 25 13:49:14 2011 +0100 eukrea_mbimxsd25-baseboard: add SD card detect Signed-off-by: Eric Bénard Acked-by: Wolfram Sang Signed-off-by: Sascha Hauer commit d335cf97060c44e9beb2a25151b5fba8740e1929 Author: Eric Bénard Date: Fri Feb 25 13:49:58 2011 +0100 mx3/eukrea_mbimxsd-baseboard: add SD card detect support Signed-off-by: Eric Bénard Acked-by: Wolfram Sang Signed-off-by: Sascha Hauer commit da8db3aab55142ad39061e6b0db1e7b065eac61a Author: Eric Bénard Date: Fri Feb 25 13:49:57 2011 +0100 mx3/eukrea_mbimxsd-baseboard: fix gpio request without this patch, we get : ------------[ cut here ]------------ WARNING: at drivers/gpio/gpiolib.c:99 gpio_ensure_requested+0x4c/0x104() autorequest GPIO-4 .../... [] (platform_lcd_set_power+0x34/0x40) from [] (platform_lcd_probe+0xb8/0xd8) Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 5bb2c828420992357cfe66ceb6f4c3d4121ae1ce Author: Shawn Guo Date: Tue Feb 22 16:50:24 2011 +0800 ARM: mxs/mx28evk: add mmc device Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Tested-by: Marc Kleine-Budde [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer commit 1b6f1e885ef08c6fda87979a2ca05e910d479985 Author: Shawn Guo Date: Tue Feb 22 16:49:19 2011 +0800 ARM: mxs/mx23evk: add mmc device Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Acked-by: Marc Kleine-Budde [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer commit 47babe692e90e0333b2448969639b8f0940e3682 Author: Shawn Guo Date: Wed Mar 16 11:31:06 2011 +0100 ARM: mxs: dynamically allocate mmc device Signed-off-by: Shawn Guo [ukleinek: fix naming to include complete device name in functions] Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 251290a6078cb88382344b3ee535ae8c6254c1b5 Author: Andres Salomon Date: Fri Mar 4 08:06:53 2011 -0800 ARM: mx51_efika: update platform data for new mfd changes Note that this relies on stuff currently in mfd's next tree, but this is also a newer driver. I'm not sure which tree it should go through, as it's a problem that shows up in next. From: Andres Salomon MFD changes in c738892f cause the mc13xxx_platform_data struct to change. This changes one more (new) user of it, fixing a build error. Signed-off-by: Andres Salomon Signed-off-by: Sascha Hauer commit 58d5ad5e3c39311835ffcf80353d1318e4f9c155 Author: Julien Boibessot Date: Thu Mar 24 17:29:15 2011 +0100 mx2/iomux: Set direction for CSPI2 pins Signed-off-by: Julien Boibessot Signed-off-by: Sascha Hauer commit 0adf882b6894cd150392400e9642787cf691016a Author: Dinh Nguyen Date: Mon Mar 21 16:30:37 2011 -0500 ARM: mx51: Implement code to allow mx51 to enter WFI Implement code for MX51 that allows the SoC to enter WFI when arch_idle is called. This patch is also necessary for correctly suspending the system. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit b6e89b21824cc37ab19e0209a7754c74d237a123 Author: Dinh Nguyen Date: Mon Mar 21 16:30:36 2011 -0500 ARM: mx51: Add entry for gpc_dvfs_clk For MX51 SRPG, we need to turn on the GPC clock in order to set the SRPG registers. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 16f246e69b8857c6a2993f1b6663e92d4d4e5395 Author: Dinh Nguyen Date: Mon Mar 21 16:30:35 2011 -0500 ARM: mx50: Add support to get the silicon revision For MX50, the HW_ADADIG_DIGPROG register in the ANATOP module will have the correct silicon revision: Major Minor Description 0x50 0x0 TO1.0 0x50 0x1 TO1.1 Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 021ebc2da02a7f3107a8f31d8a0ebfbe4175429e Author: Lothar Waßmann Date: Mon Mar 21 17:48:05 2011 +0100 ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 Signed-off-by: Lothar Waßmann Signed-off-by: Sascha Hauer commit 5d18724588a4f632e836357a43b33bf4b538af82 Author: Shawn Guo Date: Sun Mar 20 11:17:59 2011 +0800 ARM: mxc: fix buggy '.end' of IORESOURCE_MEM in device codes Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 65047a0f695ed975855e9b83bb922ecb1ff250ab Author: Huang Weiyi Date: Fri Mar 18 22:05:55 2011 +0800 ARM i.MX: remove duplicated #include Remove duplicated #include('s) in arch/arm/mach-mx5/mx51_efika.c Signed-off-by: Huang Weiyi Signed-off-by: Sascha Hauer commit 5658bff6c2c4a07fb25195eac70205934b8f5a0d Author: Uwe Kleine-König Date: Fri Mar 18 12:24:08 2011 +0100 ARM: imx: let MACH_IMX27_VISSTRIM_M10 select IMX_HAVE_PLATFORM_IMX_SSI mach-imx27_visstrim_m10.c uses imx27_add_imx_ssi() so it needs to select IMX_HAVE_PLATFORM_IMX_SSI to fix: arch/arm/mach-imx/built-in.o: In function `visstrim_m10_board_init': mach-imx27_visstrim_m10.c:(.init.text+0x308): undefined reference to `imx_add_imx_ssi' mach-imx27_visstrim_m10.c:(.init.text+0x394): undefined reference to `imx27_imx_ssi_data' Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 0ff2593bf6c06cd99f5414295ecb31bc629b3d15 Author: Julien Boibessot Date: Fri Mar 18 09:31:46 2011 +0100 MX51: Add AUDMUX ports definitions Signed-off-by: Julien Boibessot Signed-off-by: Sascha Hauer commit c124befc0d1981f5f3e438d06313fa8270a9edb6 Author: Jan Weitzel Date: Thu Mar 17 13:44:30 2011 +0100 ARM: mxc: Add sched_clock to mxc platform Add sched_clock using cyc_to_sched_clock and update_sched_clock with HAVE_SCHED_CLOCK tested on iMX27 and iMX35 Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer commit 93b20e4fdbe1ddc4bef79d968cb1ba453324a499 Author: Jan Weitzel Date: Thu Mar 17 13:44:29 2011 +0100 ARM: mxc: Add dummy_get_cycles to avoid access before init is done this is needed to use get_cycles with sched_clock. Accessing timer without enabled clk will result in crash Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer commit 350ac9ddce074855030b88c9e8c016574d2e9097 Author: Fabio Estevam Date: Wed Mar 16 22:52:34 2011 -0300 ARM: mx5/mx53_evk: Make the reset pin name more meaningful As there is a mx53_smd board in the kernel, using SMD_FEC_PHY_RST as the pin name can be misleading when used on a MX53_EVK board. Change the pin name to reflect the board name. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 6ea6392cc4ff9214c7356e8ca71244c006a95ddb Author: Fabio Estevam Date: Wed Mar 16 22:52:33 2011 -0300 ARM: mx5/mx53_evk: Use gpio_request_one in mx53_evk_fec_reset Current code inside mx53_evk_fec_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit ce191e415cd0c6d5240caf5c6827500842868da2 Author: Fabio Estevam Date: Wed Mar 16 22:52:31 2011 -0300 ARM: mx5/babbage: Use gpio_request_one in babbage_fec_reset Current code inside babbage_fec_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value to the same level right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 14fb20c9d25be4ee115cafd7201d4833664ae59d Author: Frank Li Date: Tue Mar 15 17:04:10 2011 +0800 ARM: mx53_loco: Add GPIO Keypad support Signed-off-by: Frank Li Signed-off-by: Sascha Hauer commit 76422dbf3ccdd46d925cdb0909445e4616b55187 Author: Fabio Estevam Date: Thu Mar 17 23:32:11 2011 -0300 ARM: mx51: Print silicon revision on boot Having the silicon revision to appear on the boot log is a useful information. MX31 and MX35 already show the silicon revision on boot. Add support for displaying such information for MX51 as well. Tested on a MX51EVK, where it shows: CPU identified as i.MX51, silicon rev 3.0 Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 7780c803bd103895a9c1c9a3c91db5b45c66e367 Author: Robin Becker Date: Sat Mar 12 15:32:45 2011 +0000 arm: mach-kirkwood: add led in sheevaplug-setup.c This patch adds a second, red, led for the standard sheevaplug. The sheeva_esata mpp config is left unchanged. Tested on a standard sheevaplug Signed-off-by: Robin Becker Acked-by: Peter Korsgaard Signed-off-by: Nicolas Pitre commit 5898eb79fb45d4fd4ce22139c168de937bfaab38 Author: Axel Lin Date: Mon Mar 7 13:56:11 2011 +0800 ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path If gpio_request fails when i > 0, gpios[0] is not freed in current implementation. Signed-off-by: Axel Lin Signed-off-by: Eric Miao commit 8aad172e6c54c74b1effe88ded2f308db3e1b658 Author: Axel Lin Date: Mon Mar 7 13:55:15 2011 +0800 ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path If gpio_request fails when i > 0, gpios[0] is not freed in current implementation. Signed-off-by: Axel Lin Signed-off-by: Eric Miao commit e3b1ceedf7adc4adfc989ee78a30fca7b62480b5 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:22 2011 +0200 ARM: PXA: Z2: Use switch event for lid Otherwise userspace might be confused. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 54d5710058ebe34451f4ab1d73d86cd8214897b7 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:21 2011 +0200 ARM: PXA: Z2: Add default triggers for LEDs So user can see if there's any mmc activity and if device's charging. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 034e17563b90fa20342b78a2faac9cba3a1c4a38 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:20 2011 +0200 ARM: PXA: Z2: Keep kbd backlight disabled by default It eats too much power, and anyway it's not usefull during boot process. Userspace can enable it later. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit b8f56a78e3a161f10bfd4e648a3d3828718aaa80 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:19 2011 +0200 ARM: PXA: Z2: Fix libertas init/tear down sequences GPIO15 seems to be not related to WiFi, so don't touch it. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 233cdbce55b8948b46fcd76ad77c1f33b8c01095 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:18 2011 +0200 ARM: PXA: Z2: Fix battery pdata Fix coefficients to get actual voltage, and make voltage_max/voltage_min looks like values for LiIon battery. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 2e62344de8e2a7e402fe2a009c3d09bc6fd589e6 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:17 2011 +0200 ARM: PXA: Z2: Use only power button as wake source It's very easy to press some keypad key when Z2 is closed, so to prevent unexpected wakeups, use only 'Power' key to wake Z2 from sleep. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 27be9a9e378dad166fc81df310e052e7b67cb667 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:50 2011 +0200 ARM: pxafb: don't disable controller on cpufreq transition if overlay in use It's not safe to disable controller if overlay(s) is enabled (results in system hang). So we avoid to disable controller in this case. Userspace should choose proper governor to avoid freq changing when overlay is in use, otherwise LCD may blink. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit dcf8eee94f7eb2671e6d5774e81d45ad06b4f980 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:49 2011 +0200 ARM: pxafb: fix typo in ypos assignment Sascha Hauer pointed that ypos takes value of xpos due to typo. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 7779cee3f45122d2f81397f55d7a14f654a0b276 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:48 2011 +0200 ARM: pxafb: fix plane Z-ordering problem pxafb_overlay_init is not right place to change Z-ordering, move it to main plane initialization. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 1b98d7c4491e5eaba7c403ec1bc5997e6596e569 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:47 2011 +0200 ARM: pxafb: rework pxafb overlay memory management PXAFB overlay memory management is something messy: - it allocates memory dynamically on open/release, and it results in memory allocation failure after ~1h of uptime (system does not have 115k of physically contiguous memory) - in release callback it tries to free memory even if it was not allocated. Also driver touches FDADR1 on main plane reconfiguration, and it can cause problems if overlay1 is enabled. This patch attempts to fix those issues. Patch is based on Russell King's work. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 1014cc38280f29ea0a39ec9a853fa0c3fdfebc7c Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:20 2011 +0300 ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info Neither pxa25x_udc, nor pxa27x_udc use gpio_vbus/gpio_vbus_inverted anymore. Drop those two fields from udc info completely. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit a8ecc860ef117f9405758d8d1378553afcdd9ca3 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:19 2011 +0300 ARM: pxa25x_udc: stop handling gpio-vbus internally Stop handling gpio-vbus internally. All boards that depended on this functionality have been converted to use gpio-vbus tranceiver. All new boards can use it right from the start. Drop unused code. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit ef8b3cc68a1df83717bc8f9e7737084246a56ce2 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:18 2011 +0300 ARM: pxa/tosa: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit d19f4cbd4ba08d32d5e5d0cbc98f920fcc225448 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:17 2011 +0300 ARM: pxa/gumstix: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Cc: Steve Sakoman Signed-off-by: Eric Miao commit 133dce0687b4c38184609fa921d060a54dff93e9 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:16 2011 +0300 ARM: pxa/eseries: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Cc: Ian Molton Signed-off-by: Eric Miao commit ccc46e29a63c88aa9ac72aac86ff0cfd5c627a11 Author: Haojian Zhuang Date: Wed Nov 24 11:54:23 2010 +0800 ARM: pxa: auto compute shift and mult of timer Use auto-computed shift and mult of timer with new API clocksource_calc_mult_shift()/clockevents_calc_mult_shift(). Signed-off-by: Haojian Zhuang Cc: Nicolas Pitre Signed-off-by: Eric Miao commit 4321e1a12b811c02441240aa6183156791204f3f Author: Russell King - ARM Linux Date: Tue Feb 15 15:37:30 2011 +0800 ARM: pxa: clean up set_pxa_fb_info set_pxa_fb_info() has been a long-standing wart in the naming scheme of the pxa_set_xxx_info() functions. This renames the function, and combines set_pxa_fb_parent() with set_pxa_fb_info(). Signed-off-by: Russell King Acked-by: Igor Grinberg Signed-off-by: Eric Miao commit 54a93b69a4341a14acb67e0bb19b9bf1cc878cb2 Author: Marek Vasut Date: Thu Jan 13 11:45:30 2011 +0100 ARM: pxa: PalmZ72: Add OV9640 camera support Rework of patch from 2009: PalmZ72: Add support for OV9640 camera sensor Signed-off-by: Marek Vasut commit 9ed3fbf1cbc2b747b3532985059f4738c15f4c07 Author: Marek Vasut Date: Sat Jan 15 19:22:19 2011 +0100 ARM: pxa: Update copyright notices for Palm devices Signed-off-by: Marek Vasut commit 6b1e3fca6ffb981db05688b1660a5d03d242edd4 Author: Marek Vasut Date: Sat Jan 15 19:19:05 2011 +0100 ARM: pxa: Use gpio arrays in palmld_hdd driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. This patch also properly frees GPIOs in case ata_host_activate() call fails. Signed-off-by: Marek Vasut commit e27af7edda008d225ad542c3b6645483683a7e91 Author: Marek Vasut Date: Sat Jan 15 19:11:16 2011 +0100 ARM: pxa: Use gpio arrays in vpac270_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 235a175c401ab2d79d63f08257acebe1558a0621 Author: Marek Vasut Date: Sat Jan 15 18:59:55 2011 +0100 ARM: pxa: Use gpio arrays in palmtx_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit ba388307946cf86050d63cd398b4b341e2fb5043 Author: Marek Vasut Date: Sat Jan 15 18:59:43 2011 +0100 ARM: pxa: Use gpio arrays in palmtc_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 2070417dffa9e75b370a5c0dee8c5dc3605e1c4d Author: Marek Vasut Date: Sat Jan 15 18:49:07 2011 +0100 ARM: pxa: Use gpio arrays in palmld_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit e593106ca409e5e37d18121d922fc4f449c60d41 Author: Marek Vasut Date: Sat Jan 15 18:40:49 2011 +0100 ARM: pxa: Use gpio arrays in colibri_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 7428fff20494935b4ce767d7c80de077e8d1d745 Author: Marek Vasut Date: Sat Jan 15 17:55:45 2011 +0100 ARM: pxa: PalmTE2: Use gpio arrays in backlight init Use gpio_request_array() / gpio_free_array() in backlight init and exit functions. This makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 7bcdca95c039d1cd1cfddd6aa012026b409ddb14 Author: Alexander Clouter Date: Sun Mar 6 10:04:31 2011 +0000 ARM: orion5x: replace printk with pr_{err,info,...} in ts78xx-setup.c Signed-off-by: Alexander Clouter Signed-off-by: Nicolas Pitre