aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-23mfd: Drop data_size from mfd_cell structAndres Salomon1-3/+0
Now that there are no more users of this, drop it. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to mc13xxx driversAndres Salomon9-40/+39
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Note that mfd-core no longer makes a copy of platform_data, but the mc13xxx-core driver creates the pdata structures on the stack. In order to get around that, the various ARM mach types that set the pdata have been changed to hold the variable in static (global) memory. Also note that __initdata references in aforementioned pdata structs have been dropped. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to janz driversAndres Salomon3-3/+4
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to tc6387xb driversAndres Salomon1-5/+0
No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to twl4030 driversAndres Salomon3-5/+6
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to tc6393xb driversAndres Salomon3-34/+13
No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to sh_mobile_sdhi driversAndres Salomon1-2/+0
No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to wl1273 driversAndres Salomon3-4/+3
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to t7166xb driversAndres Salomon2-14/+5
No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to timberdale driversAndres Salomon9-37/+17
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Note that the mfd's platform_data is marked __devinitdata. This is still correct in all cases except for the timbgpio driver, whose remove hook has been changed to no longer reference the pdata. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to htc-pasic3 driversAndres Salomon1-4/+0
No need to explicitly set the cell's platform_data/data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to asic3 driversAndres Salomon3-19/+13
No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to ab3100 driversAndres Salomon2-4/+3
The cell's platform_data is now accessed with a helper function; change clients to use that, and remove the now-unused data_size. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to ab3550 driverAndres Salomon2-4/+1
No clients (in mainline kernel, I'm told that drivers exist in external trees that are planned for mainline inclusion) make use of this, nor do they make use of platform_data, so nothing really had to change here. The .data_size field is unused, so its usage gets removed. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: mfd_cell is now implicitly available to jz4740 driversAndres Salomon3-6/+2
No need to explicitly set the cell's platform_data/data_size. Modify clients to use mfd_get_cell helper function instead of accessing platform_data directly. Signed-off-by: Andres Salomon <[email protected]> Acked-by: Jean Delvare <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd-core: Unconditionally add mfd_cell to every platform_deviceAndres Salomon2-8/+24
Previously, one would set the mfd_cell's platform_data/data_size to point to the current mfd_cell in order to pass that information along to drivers. This causes the current mfd_cell to always be available to drivers. It also adds a wrapper function for fetching the mfd cell from a platform device, similar to what originally existed for mfd devices. Drivers who previously used platform_data for other purposes can still use it; the difference is that mfd_get_data() must be used to access it (and the pdata structure is no longer allocated in mfd_add_devices). Note that mfd_get_data is intentionally vague (in name) about where the data is stored; variable name changes can come later without having to touch brazillions of drivers. Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd-core: Fix up typos/vagueness in commentAndres Salomon1-2/+2
Signed-off-by: Andres Salomon <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Enabling twl4030_wdt and pwrbutton only for TritonKeerthy1-2/+2
Enabling twl4030_wdt and twl4030_pwrbutton only for Triton i.e for TWL4030 and TWL5030. This is to be excluded for Phoenix TWL6030. Tested OMAP4 blaze, OMAP2430, OMAP3630 boot up. Signed-off-by: Keerthy <[email protected]> Reviewed-by: Balaji T K <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Put WM8994 into reset when suspendingMark Brown1-0/+5
Ensure that the chip is in the lowest power mode possible when suspended by performing a soft reset on it. On early silicon revisions the lowest power modes can't be entered without using reset so we can't achieve equivalent results within the individual drivers. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Remove bitrotted genirq comment from wm831x IRQ codeMark Brown1-9/+0
Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23OMAP4: add clk32kg data to omap4panda and blaze board fileBalaji T K2-0/+14
In Blaze and Panda, 32KHz clock - CLK32KG to WLAN is supplied from Phoenix TWL6030. Add CLK32KG platform data to blaze and omap4panda board file. Signed-off-by: Balaji T K <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23regulator: twl: add clk32kg to twl-regulatorBalaji T K3-1/+29
In OMAP4 Blaze and Panda, 32KHz clock to WLAN is supplied from Phoenix TWL6030. The 32KHz clock state (ON/OFF) is configured in CLK32KG_CFG_[GRP, TRANS, STATE] register. This follows the same register programming model as other regulators in TWL6030. So add CLK32KG as pseudo regulator. Signed-off-by: Balaji T K <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Add new ab8500 GPADC driverArun Murthy4-0/+332
AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage Signed-off-by: Arun Murthy <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Mattias Wallin <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: ab8500: world-writable debugfs register-* filesVasiliy Kulikov1-3/+3
Don't allow everybody to interact with hardware registers. Signed-off-by: Vasiliy Kulikov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: ab3500: world-writable debugfs register-* filesVasiliy Kulikov1-3/+3
Don't allow everybody to interact with hardware registers. Signed-off-by: Vasiliy Kulikov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: ab3100: world-writable debugfs *_priv filesVasiliy Kulikov1-2/+2
Don't allow everybody to change device hardware registers. Signed-off-by: Vasiliy Kulikov <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: AB8500 system control driverMattias Nilsson3-1/+335
This adds a pretty straight-forward system control driver for the AB8500. This driver will be used from the core platform, e.g the clock tree implementation in the machine code, and is by nature singleton. There are a few simple functions to read, write, set and clear registers so that the machine code can control its own foundation. Cc: Mattias Wallin <[email protected]> Signed-off-by: Mattias Nilsson <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Add fast path for WM831x touchscreen interruptsMark Brown1-0/+12
The WM831x interrupt controller provides reporting of the touchscreen related interrupts in the primary interrupt status register as a performance optimisation - use this to avoid reading the secondary status registers for those interrupts. For code simplicity and to avoid iterating over all interrupts we open code for the two affected interrupt sources. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Convert WM831x SPI to use dev_pm_opsMark Brown1-9/+15
There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the WM831x SPI driver. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Invert tps6586x GPIO and subdevices initializationVincent Palatin1-10/+16
When using a fixed voltage regulator triggered by a TPS6586x GPIO, this allows to declare and initialize it conveniently from the "subdev" list. Signed-off-by: Vincent Palatin <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Add BTN_TOUCH event to ucb1x00-tsJochen Friedrich1-1/+4
Add BTN_TOUCH event reporting to ucb1x00_ts touchscreen driver. This will make this touchscreen driver behave consistently wrt. BTN_TOUCH. Signed-off-by: Jochen Friedrich <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Remove obsolete cleanup for wl1273 clientdataWolfram Sang1-2/+0
A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit or error. This is obsolete meanwhile, the core will do it. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Support configuration of WM831x /IRQ output in CMOS modeMark Brown2-0/+11
Provide platform data allowing the system to set the /IRQ pin into CMOS mode rather than the default open drain. The default value of this platform data reflects the default hardware configuration so there should be no change to existing users. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Convert pcf50633 to dev_pm_opsMark Brown1-12/+11
There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the pcf50633 driver. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Staticise non-exported symbols in MAX8998 driverMark Brown1-2/+2
No need to have them in the global namespace and sparse complains. Signed-off-by: Mark Brown <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Convert adp5520 to dev_pm_opsMark Brown1-8/+7
There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitiate updates to the PM core. Do this move for the adp5520 driver. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driverMark Brown1-0/+3
The WM831x touchscreen interrupts need acknowledgement even when using direct signals to the CPU (which don't go through the core) so leave the acknowledgement up to the touchscreen driver for simplicity. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-03-23perf top: Fix uninitialized 'counter' variableAkihiro Nagai1-1/+3
builtin-top.c has an uninitialized variable. gcc(version 4.5.1) warns about it and it results in build failure: builtin-top.c: In function 'display_thread': builtin-top.c:518:9: error: 'counter' may be used uninitialized This situation can indeed trigger, if the getline() call in prompt_integer() fails. Signed-off-by: Akihiro Nagai <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-03-23Merge branch 'tip/perf/urgent' of ↵Ingo Molnar1-2/+1
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
2011-03-23drm/i915: Avoid unmapping pages from a NULL address spaceChris Wilson1-3/+4
Found by gem_stress. As we perform retirement from a workqueue, it is possible for us to free and unbind objects after the last close on the device, and so after the address space has been torn down and reset to NULL: BUG: unable to handle kernel NULL pointer dereference at 00000054 IP: [<c1295a20>] mutex_lock+0xf/0x27 *pde = 00000000 Oops: 0002 [#1] SMP last sysfs file: /sys/module/vt/parameters/default_utf8 Pid: 5, comm: kworker/u:0 Not tainted 2.6.38+ #214 EIP: 0060:[<c1295a20>] EFLAGS: 00010206 CPU: 1 EIP is at mutex_lock+0xf/0x27 EAX: 00000054 EBX: 00000054 ECX: 00000000 EDX: 00012fff ESI: 00000028 EDI: 00000000 EBP: f706fe20 ESP: f706fe18 DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process kworker/u:0 (pid: 5, ti=f706e000 task=f7060d00 task.ti=f706e000) Stack: f5aa3c60 00000000 f706fe74 c107e7df 00000246 dea55380 00000054 f5aa3c60 f706fe44 00000061 f70b4000 c13fff84 00000008 f706fe54 00000000 00000000 00012f00 00012fff 00000028 c109e575 f6b36700 00100000 00000000 f706fe90 Call Trace: [<c107e7df>] unmap_mapping_range+0x7d/0x1e6 [<c109e575>] ? mntput_no_expire+0x52/0xb6 [<c11c12f6>] i915_gem_release_mmap+0x49/0x58 [<c11c3449>] i915_gem_object_unbind+0x4c/0x125 [<c11c353f>] i915_gem_free_object_tail+0x1d/0xdb [<c11c55a2>] i915_gem_free_object+0x3d/0x41 [<c11a6be2>] ? drm_gem_object_free+0x0/0x27 [<c11a6c07>] drm_gem_object_free+0x25/0x27 [<c113c3ca>] kref_put+0x39/0x42 [<c11c0a59>] drm_gem_object_unreference+0x16/0x18 [<c11c0b15>] i915_gem_object_move_to_inactive+0xba/0xbe [<c11c0c87>] i915_gem_retire_requests_ring+0x16e/0x1a5 [<c11c3645>] i915_gem_retire_requests+0x48/0x63 [<c11c36ac>] i915_gem_retire_work_handler+0x4c/0x117 [<c10385d1>] process_one_work+0x140/0x21b [<c103734c>] ? __need_more_worker+0x13/0x2a [<c10373b1>] ? need_to_create_worker+0x1c/0x35 [<c11c3660>] ? i915_gem_retire_work_handler+0x0/0x117 [<c1038faf>] worker_thread+0xd4/0x14b [<c1038edb>] ? worker_thread+0x0/0x14b [<c103be1b>] kthread+0x68/0x6d [<c103bdb3>] ? kthread+0x0/0x6d [<c12970f6>] kernel_thread_helper+0x6/0x10 Code: 00 e8 98 fe ff ff 5d c3 55 89 e5 3e 8d 74 26 00 ba 01 00 00 00 e8 84 fe ff ff 5d c3 55 89 e5 53 8d 64 24 fc 3e 8d 74 26 00 89 c3 <f0> ff 08 79 05 e8 ab ff ff ff 89 e0 25 00 e0 ff ff 89 43 10 58 EIP: [<c1295a20>] mutex_lock+0xf/0x27 SS:ESP 0068:f706fe18 CR2: 0000000000000054 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Keith Packard <[email protected]>
2011-03-23drm/i915: Fix use after free within tracepointChris Wilson1-2/+2
Detected by scripts/coccinelle/free/kfree.cocci. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Keith Packard <[email protected]>
2011-03-23drm/i915: Restore missing command flush before interrupt on BLT ringChris Wilson2-61/+55
We always skipped flushing the BLT ring if the request flush did not include the RENDER domain. However, this neglects that we try to flush the COMMAND domain after every batch and before the breadcrumb interrupt (to make sure the batch is indeed completed prior to the interrupt firing and so insuring CPU coherency). As a result of the missing flush, incoherency did indeed creep in, most notable when using lots of command buffers and so potentially rewritting an active command buffer (i.e. the GPU was still executing from it even though the following interrupt had already fired and the request/buffer retired). As all ring->flush routines now have the same preconditions, de-duplicate and move those checks up into i915_gem_flush_ring(). Fixes gem_linear_blit. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35284 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Tested-by: [email protected]
2011-03-23drm/i915: Disable pagefaults along execbuffer relocation fast pathChris Wilson1-4/+17
Along the fast path for relocation handling, we attempt to copy directly from the user data structures whilst holding our mutex. This causes lockdep to warn about circular lock dependencies if we need to pagefault the user pages. [Since when handling a page fault on a mmapped bo, we need to acquire the struct mutex whilst already holding the mm semaphore, it is then verboten to acquire the mm semaphore when already holding the struct mutex. The likelihood of the user passing in the relocations contained in a GTT mmaped bo is low, but conceivable for extreme pathology.] In order to force the mm to return EFAULT rather than handle the pagefault, we therefore need to disable pagefaults across the relocation fast path. Signed-off-by: Chris Wilson <[email protected]> Cc: [email protected] Reviewed-by: Daniel Vetter <[email protected]>
2011-03-23drm/i915: Fix computation of pitch for dumb bo creatorChris Wilson1-1/+1
Cc: Dave Airlie <[email protected]> Signed-off-by: Chris Wilson <[email protected]>
2011-03-23drm/i915: report correct render clock frequencies on SNBJesse Barnes2-5/+5
Fix up the debug file to report the right frequencies. On SNB, we program the PCU with a frequency ratio, which is multiplied by 100MHz on the CPU side. But GFX only runs at half that, so report it as such to avoid confusion. Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Keith Packard <[email protected]>
2011-03-23drm/i915/dp: Correct the order of deletion for ghost eDP devicesTakashi Iwai1-2/+2
The order of the calls does matter indeed. Swapping the call order of intel_dp_destroy() and intel_dp_encoder_destroy() fixes the problem. This is because i2c_del_adapter unregisters the device which parent is intel_connector, and connectors are removed in intel_dp_destroy(). Thus intel_dp_encoder_destroy() must be called before intel_dp_destroy(). Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24822 Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Keith Packard <[email protected]>
2011-03-23[S390] cmpxchg: implement cmpxchg64()Heiko Carstens1-9/+29
We have a cmpxchg64_local() implementation but strange enough the SMP capable variant cmpxchg64() is missing. So implement it. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-03-23[S390] xchg/cmpxchg: move to own header fileHeiko Carstens2-195/+206
Move xchg() and cmpxchg() functions to own header file like some other architectures have done. With this we make sure that system.h now really looks like a place where everything is gathered that doesn't fit anywhere else. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-03-23[S390] ccwgroup_driver: remove duplicate membersSebastian Ott6-16/+18
Remove the owner and name members of struct ccwgroup_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-03-23[S390] ccw_bus_type: make it staticSebastian Ott2-4/+2
Make ccw_bus_type static. ccw_device drivers have to use ccw_driver_register. Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.