summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2011-10-27PM / Runtime: Add new helper function: pm_runtime_status_suspended()Kevin Hilman
This boolean function simply returns whether or not the runtime status of the device is 'suspended'. Unlike pm_runtime_suspended(), this function returns the runtime status whether or not runtime PM for the device has been disabled or not. Also add entry to Documentation/power/runtime.txt Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Change-Id: I2e31841f087b5d44a0f4d6e2f8bba2d08cfc7b64 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35338 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-27PM: Limit race conditions between runtime PM and system sleep (v2)Rafael J. Wysocki
One of the roles of the PM core is to prevent different PM callbacks executed for the same device object from racing with each other. Unfortunately, after commit e8665002477f0278f84f898145b1f141ba26ee26 (PM: Allow pm_runtime_suspend() to succeed during system suspend) runtime PM callbacks may be executed concurrently with system suspend/resume callbacks for the same device. The main reason for commit e8665002477f0278f84f898145b1f141ba26ee26 was that some subsystems and device drivers wanted to use runtime PM helpers, pm_runtime_suspend() and pm_runtime_put_sync() in particular, for carrying out the suspend of devices in their .suspend() callbacks. However, as it's been determined recently, there are multiple reasons not to do so, inlcuding: * The caller really doesn't control the runtime PM usage counters, because user space can access them through sysfs and effectively block runtime PM. That means using pm_runtime_suspend() or pm_runtime_get_sync() to suspend devices during system suspend may or may not work. * If a driver calls pm_runtime_suspend() from its .suspend() callback, it causes the subsystem's .runtime_suspend() callback to be executed, which leads to the call sequence: subsys->suspend(dev) driver->suspend(dev) pm_runtime_suspend(dev) subsys->runtime_suspend(dev) recursive from the subsystem's point of view. For some subsystems that may actually work (e.g. the platform bus type), but for some it will fail in a rather spectacular fashion (e.g. PCI). In each case it means a layering violation. * Both the subsystem and the driver can provide .suspend_noirq() callbacks for system suspend that can do whatever the .runtime_suspend() callbacks do just fine, so it really isn't necessary to call pm_runtime_suspend() during system suspend. * The runtime PM's handling of wakeup devices is usually different from the system suspend's one, so .runtime_suspend() may simply be inappropriate for system suspend. * System suspend is supposed to work even if CONFIG_PM_RUNTIME is unset. * The runtime PM workqueue is frozen before system suspend, so if whatever the driver is going to do during system suspend depends on it, that simply won't work. Still, there is a good reason to allow pm_runtime_resume() to succeed during system suspend and resume (for instance, some subsystems and device drivers may legitimately use it to ensure that their devices are in full-power states before suspending them). Moreover, there is no reason to prevent runtime PM callbacks from being executed in parallel with the system suspend/resume .prepare() and .complete() callbacks and the code removed by commit e8665002477f0278f84f898145b1f141ba26ee26 went too far in this respect. On the other hand, runtime PM callbacks, including .runtime_resume(), must not be executed during system suspend's "late" stage of suspending devices and during system resume's "early" device resume stage. Taking all of the above into consideration, make the PM core acquire a runtime PM reference to every device and resume it if there's a runtime PM resume request pending right before executing the subsystem-level .suspend() callback for it. Make the PM core drop references to all devices right after executing the subsystem-level .resume() callbacks for them. Additionally, make the PM core disable the runtime PM framework for all devices during system suspend, after executing the subsystem-level .suspend() callbacks for them, and enable the runtime PM framework for all devices during system resume, right before executing the subsystem-level .resume() callbacks for them. Conflicts: drivers/base/power/main.c Change-Id: I184431a2e6663222685098d869272b5e84b93c11 Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35337 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27PM / Runtime: Update documentation of interactions with system sleepRafael J. Wysocki
The documents describing the interactions between runtime PM and system sleep generally refer to the model in which the system sleep state is entered through a global firmware or hardware operation. As a result, some recommendations given in there are not entirely suitable for systems in which this is not the case. Update the documentation to take the existence of those systems into account. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Reviewed-by: Kevin Hilman <khilman@ti.com> Change-Id: I926b72b01331e563d2e4a1e3b48c9e4c2ce29a05 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35336 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-27PM: Introduce generic "noirq" callback routines for subsystems (v2)Rafael J. Wysocki
Introduce generic "noirq" power management callback routines for subsystems in addition to the "regular" generic PM callback routines. The new routines will be used, among other things, for implementing system-wide PM transitions support for generic PM domains. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Change-Id: I345a1c6d221b402f349837581681bc7b5c464ea9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35335 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-05rtc: ab8500: Add calibration attribute to AB8500 RealTimeClockMark Godfrey
The rtc_calibration attribute allows user-space to get and set the AB8500's RtcCalibration register. The AB8500 will then use the value in this register to compensate for RTC drift every 60 seconds. ST Ericsson ID: 362204 Change-Id: I32a4bda5d6cc0812dcb53d721088e8b844c25b46 Signed-off-by: Mark Godfrey <mark.godfrey@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32922 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-04Build correction after moved header file.pender01
ST-Ericsson ID: 364916 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: - Change-Id: I86d796e347ce7e8c2f3a9ddf256863ba74449ee8 Signed-off-by: pender01 <peter.enderborg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32841 Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
2011-09-30mfd/cg2900: Support HCI Raw Channel.Hemant Gupta
Add support for HCI Raw channel so that CG2900 can be accessed directly from user space. ST-Ericsson Linux next: Not tested, ER351170 ST-Ericsson ID: 351170 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If8a2455be32f0eb99f7c0bc7a5cf0e09270fa6af Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32206 Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2011-09-28cg2900: Add KernelDocPar-Gunnar Hjalmdahl
This patch adds KernelDoc for the CG2900 driver. ST-Ericsson ID: 364042 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 364042 Change-Id: Idccbf196bcf4a9c5f280e3745ce3e72c499dee80 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32035 Reviewed-by: Hemant GUPTA <hemant.gupta@stericsson.com>
2011-09-23ux500:USB:Fix for Build issue of HTML DocsSakethram Bommisetti
"pubfunctions" is required in the .tmpl file as the compiler uses it. Adding "pubfunctions" in ux500_usb.tmpl file. ST-Ericsson ID: NA ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Change-Id: Ic927f2001e9d0fff070a7d7b9b9871c011905aef Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31845 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19CG2900 FM Radio: Handling Mono-Stereo Interrupt.Hemant Gupta
The linux FM driver for CG2900 now supports mono-stereo transition interrupt from the CG2900. It indicates stereo to mono transition or vice versa. Support for RDS Interrupt, Scan Completion Interrupt, CG2900 Reset Interrupt, etc is also added in this patch. ST-Ericsson ID: 324264 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I280a2a00a6f58e105d11f3a9f14ea662719c485e Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30511 Reviewed-by: Johan PALMAEUS <johan.xj.palmaeus@stericsson.com> Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2011-09-19vibrator: Force feedback vibrator driverMarcin Mielczarczyk
Implementation of ST-Ericsson's force feedback vibrator driver. ST-Ericsson ID: WP261766 Ref: Commit-id: 3f5213a6837ad774628c20b006958183b2c1932a Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: Iadea56106111af2f7b05b3f74a4aa58cda6721b1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29682 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19USB:Updating the documentationSakethram Bommisetti
Documentation from usb. Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Conflicts: Documentation/DocBook/Makefile
2011-09-19Vibrator: Timed output vibrator driverMarcin Mielczarczyk
ST-Ericsson vibrator driver which registers in Android specific timed output device class. Signed-off-by: Marcin Mielczarczyk <marcin.mielczarczyk@tieto.com> Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@tieto.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Timed output vibrator: New functionality. This patch allows to form the vibration characteristic using few parameters defined in the platform data: - boost level and period for start condition - on level as moderate speed - off level and period for brake condition Detailed information can be found here: Documentation\DocBook\ste_timed_vibra.html Signed-off-by: Grzegorz Sygieda <grzegorz.sygieda@tieto.com> Signed-off-by: Krzysztof Antonowicz <krzysztof.antonowicz@tieto.com> Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> vibrator: remove board specific control of vibrator Platform specific control of vibrator should be present in board file (here board-mop500.c). So, for example if GPIO pins are used to control the vibrator, its control function implemenation should be in board file. This patch provides the callback function support in the driver for the same. Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> android: vibrator: dont directly access ktime_t members Use ktime helper functions for converting ktime values Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> u8500: vibra: linear vibrators using vibra-pwm Linear vibrators operate on thier required resonance frequency (for COPAL and AAC its ~150Hz). This can be provided using AUDIO DA5 path. This software *workaround* enables linear vibrators using AB8500 vibra-pwm by generating required resonace frequency using software. In addition this patch provides support for separate platform data for Linear and Rotarty vibrators. Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> u8500: vibra: disable vibrator after vibration This patch disables vibrator i.e. configures the PWM duty cycle to zero after vibration duration is over. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19Merge linux-linaro-3.0-2011.07-1-android-1 into..Ulf Hansson
..linux-linaro-3.0-2011.07-1_glk3.0 Conflicts: arch/arm/common/Makefile drivers/misc/Kconfig drivers/misc/Makefile kernel/printk.c Change-Id: I126f34edb1879981909072beefb2738cad26f951
2011-09-19Doc: Fixing documentation for html generationRobert Marklund
Change documentation to align with header files and source file renames and move. Change-Id: I8e67e41e90dfb61255db5e2e84ead09972361c1c Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19u8500: shrm: Move shrm to drivers/modemKumar Sanghvi
Moves shrm specific files from arch/arm/mach-ux500/mach/include and drivers/misc to include/linux/modem/shrm and drivers/modem/shrm respectively ST-Ericsson ID: CR329459 Change-Id: I3a08f83e5302429d51eb865ee1c5e4e0ec73e31b Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23980 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19lsm303dlh: add DocBook documentationChethan Krishna N
Adding DocBook documentation for lsm303dlh accelerometer and magnetometer drivers. ST-Ericsson ID: 277198 Change-Id: Idfca43aa6ffaa39b7f73d0135dc6d2b01a0a44c6 Signed-off-by: Chethan Krishna N <chethan.krishna@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23784 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19u5500 : kernel-doc for Mailbox Logical DriverBibek Basu
Kernle-Doc created for u5500 Mailbox Logical Driver ST-Ericsson ID: 277198 Change-Id: I6e1298615a3943177fa05342a9ff8215e521fa72 Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23718 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19u5500:Docbook:Added the tmpl files for driversNaveen Kumar Gaddipati
Added the tmpl files for keypad and touchpad drivers with repect to kernel doc compliance. ST-Ericsson Linux next: - ST-Ericsson ID: AP 277198 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie704c10ff44f2b5b7f3806252cbcdd3d0f91f849 Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23735 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19kernel-doc: fix kernel-doc warningsom prakash
fix the potential kernel-doc warnings ST-Ericsson Linux next: - ST-Ericsson ID: 327425 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: om prakash <omprakash.pal@stericsson.com> Change-Id: Ibaa302ddbaa8e223b81bd047fceaf7c3b97af491 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23345 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19DocBook: Add CG2900 FM Radio templateHemant Gupta
This patch re-adds the cg2900_fm_radio.tmpl template file for DocBook, which for some unknown reason has been removed at a time earlier on. This patch also fixes some warnings while generating kernel docs in CG2900 FM Driver. ST-Ericsson ID: 327422 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1507156af91cfff80af8063f618626a79d955c6a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17877 Reviewed-by: Andreas KARLSSON <andreas.z.karlsson@stericsson.com> Reviewed-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Tested-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24915 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Said BAGHERI <said.m.bagheri@stericsson.com> Tested-by: Said BAGHERI <said.m.bagheri@stericsson.com>
2011-09-19CG2900 FM radio: Add support for Tone Gen and De-emphasis.kumarp
FM radio driver now supports enabling, disabling, setting parameters for internal Tone Generator and configuring De-emphasis filter. ST-Ericsson ID: 281539 ST-Ericsson ID: 317074 Change-Id: I5b4aacee58e7955a2aea52aeda3a99663bad3082 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11412 Reviewed-by: Pradeep-mmc KUMAR <pradeep-mmc.kumar@stericsson.com> Tested-by: Pradeep-mmc KUMAR <pradeep-mmc.kumar@stericsson.com> Reviewed-by: Johan PALMAEUS <johan.xj.palmaeus@stericsson.com> Reviewed-by: Andreas GUSTAFSSON <andreas.a.gustafsson@stericsson.com> Reviewed-by: Hemant GUPTA <hemant.gupta@stericsson.com> Reviewed-by: QATEST Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24895 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: Said BAGHERI <said.m.bagheri@stericsson.com> Reviewed-by: Said BAGHERI <said.m.bagheri@stericsson.com>
2011-09-19HSI: hsi_char: Update ioctl-number.txtAndras Domokos
Added ioctl range for HSI char devices to the documentation Change-Id: I51836e3a2f7bc557b55f83aef8fb3065ccd55324 Signed-off-by: Andras Domokos <andras.domokos@nokia.com> Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20581 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19HSI: Add HSI API documentationCarlos Chinea
Add an entry for HSI in the device-drivers section of the kernel documentation. Change-Id: I5b5a25d0798ec50f8aad38f004b232ff2e0cde43 Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20580 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19Export SoC info through sysfsMaxime Coquelin
Common base to export System-on-Chip related informations through sysfs. Creation of a "socinfo" directory under /sys/. Creation of SoC information entries. Signed-off-by: Maxime COQUELIN <maxime.coquelin-nonst@stericsson.com> Change-Id: I8f9cbccbed07293d26974e9df3bf1102d42e561c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18178 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-09-19DocBook: Update tc_keypad doc for new filesRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19PRCMU: Add DocumentationPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2011-09-19keyboard: add tc35893 driverPhilippe Langlais
This patch is based on the following work: Keypad tc35893: Fix the Keypad Driver interrupt enable/disable ST-Ericsson ID: ER274519 Author: Ankur Vaish <ankur.vaish@stericsson.com> Keypad: Disable EV_REP to disable reporting repeated key events ST-Ericsson Id:ER 264416 Author: Jayeeta Banerjee <jayeeta.banerjee@stericsson.com> Add support for TC35893 Keypad Controller ST-Ericsson ID: AP261147 Author: Jayeeta Banerjee <jayeeta.banerjee@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-09-19add html doc for ux500 gpioMian Yousaf Kaukab
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-09-19STM: MIPI System Trace Module char driverPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19i2c: nomadic-i2c driver updates for clock and power, busy managementPhilippe Langlais
Moreover driver documentation is added in DocBook Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-09-19input: update bu21013 touchscreen controller staging: update Synaptics RMI4 ↵Robert Marklund
touchpad driver Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19mfd: stmpe: Recheck the status to avoid failure stmpe: add stmpe ↵Robert Marklund
documentation to DocBook Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19drivers: shrm: Add shared memory (shrm) driverRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19USB: gadget: OTG supplement revision 2.0 updatesSakethram Bommisetti
Introduce otg_version field in usb_gadget struct.UDC can advertise OTG spec version compatibility by setting otg_version field appropriately. Gadget drivers fill the bcdOTG field in OTG descriptor based on UDC's OTG version. Add sysfs file for host_request and UDC returns the same when HNP polling request arrives from the host. Signed-off-by: Pavankumar Kondeti <pkondeti@...> Change-Id: Ic5ea40369159c10e524a13a2d9b1722fb3ee6921 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13421 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Tested-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
2011-09-19spi: add stm msp driverRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-09-19misc: Add i2s driverRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-07-25Merge branch 'upstream/linaro-3.0' into linaro-android-3.0John Stultz
2011-07-21Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 ↵Nicolas Pitre
into linaro-3.0
2011-07-21Merge remote-tracking branch 'linus' into linaro-3.0Nicolas Pitre
2011-07-21Revert "Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0"Nicolas Pitre
This reverts commit c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef, reversing changes made to dfee09c8acf18e84fe197bb5d821d1e4e02d020f. John Stultz reports that Panda doesn't boot anymore and 'git bisect' indicated the merge commit itself as the culprit. The resulting kernel log is: [ 1.734802] OMAP DSS rev 4.0 [ 1.740417] omap_hwmod: dss_core: _wait_target_disable failed [ 1.746429] omap_device: omapdss_dss.-1: new worst case deactivate latency 01 [ 1.755035] omapdss DISPC error: can't get dss_clk [ 1.760101] omapdss_dispc: probe of omapdss_dispc failed with error -2 [ 1.767333] omapdss HDMI error: can't get hdmi_clk [ 1.772399] omapdss_hdmi: probe of omapdss_hdmi failed with error -2 [ 1.780273] ------------[ cut here ]------------ [ 1.785125] WARNING: at drivers/video/omap2/dss/dispc.c:553dispc_runtime_ge) [ 1.793640] Modules linked in: [ 1.796905] ---[ end trace 6fcb132ac310d004 ]--- [ 1.801757] Unable to handle kernel NULL pointer dereference at virtualaddr0 [...] Revert it so a later version of the arm-soc merge result can be used instead.
2011-07-21dt: Linux dt usage model documentationGrant Likely
v2: 2nd draft - Editorial cleanups from Randy Dunlap Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21spi/tegra: add devicetree supportGrant Likely
Allow the tegra spi driver to obtain populate the spi bus with devices from the device tree. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21gpio/tegra: add devicetree supportGrant Likely
Add support for decoding gpios from the device tree Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21gpio/dt: Refine GPIO device tree bindingGrant Likely
Allow for multiple named gpio properties Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for mx51 and mx53 boardsGrant Likely
This patch add support for the Genesi Efika MX Smarttop and Smartbook, the Freescale mx51 babbage board, and the Freescale mx53 loco board Signed-off-by: Jason Liu <jason.hui@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-21arm/dt: Add basic device tree support for smdkv310 boardThomas Abraham
Enable basic device tree support for Exynos4 smdkv310 board. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-07-20Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86. reboot: Make Dell Latitude E6320 use reboot=pci x86, doc only: Correct real-mode kernel header offset for init_size x86: Disable AMD_NUMA for 32bit for now
2011-07-20Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0Nicolas Pitre
2011-07-19Devicetree: Expand on ARM Primecell binding documentationGrant Likely
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 02:03:30 +0000