summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2015-05-21Merge branch 'android-omap-minnow-3.10-lollipop-wear-release' of ↵mattis_devmattis fjallstrom
https://android.googlesource.com/kernel/omap into mattis_dev Change-Id: I46165dd7747b9b6289eb44cb96cbef2de46c10ba
2015-02-26Increased size for tty buffermattis fjallstrom
Change-Id: I3041cd9b177d40d9f464ced49c29eb9000dccbc1
2015-02-13Increasing size of tty buffer (no harm, potentially fixes some issues). ↵mattis fjallstrom
Cleaning up regulator configuration in board file. Setting the default power governor to interactive. Increased the display brightness, and fade time Change-Id: I11e54676e5b0c03ac9ff06679ae35efb50a86efc
2014-11-29mtd: omap2: Cleanup header filesSachin Kamat
Commit 2203747c9771 ("ARM: omap: move platform_data definitions") moved the files to the current location but forgot to remove the pointer to its previous location. Clean it up. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
2014-11-29mtd: nand: omap: combine different flavours of 1-bit hamming ecc schemesPekon Gupta
OMAP NAND driver currently supports multiple flavours of 1-bit Hamming ecc-scheme, like: - OMAP_ECC_HAMMING_CODE_DEFAULT 1-bit hamming ecc code using software library - OMAP_ECC_HAMMING_CODE_HW 1-bit hamming ecc-code using GPMC h/w engine - OMAP_ECC_HAMMING_CODE_HW_ROMCODE 1-bit hamming ecc-code using GPMC h/w engin with ecc-layout compatible to ROM code. This patch combines above multiple ecc-schemes into single implementation: - OMAP_ECC_HAM1_CODE_HW 1-bit hamming ecc-code using GPMC h/w engine with ROM-code compatible ecc-layout. Signed-off-by: Pekon Gupta <pekon@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
2014-11-29ARM: OMAP2+: cleaned-up DT support of various ECC schemesPekon Gupta
OMAP NAND driver support multiple ECC scheme, which can used in different flavours, depending on in-build Hardware engines present on SoC. This patch updates following in DT bindings related to sectionion of ecc-schemes - ti,elm-id: replaces elm_id (maintains backward compatibility) - ti,nand-ecc-opts: selection of h/w or s/w implementation of an ecc-scheme depends on ti,elm-id. (supported values ham1, bch4, and bch8) - maintain backward compatibility to deprecated DT bindings (sw, hw, hw-romcode) Below table shows different flavours of ecc-schemes supported by OMAP devices +---------------------------------------+---------------+---------------+ | ECC scheme |ECC calculation|Error detection| +---------------------------------------+---------------+---------------+ |OMAP_ECC_HAM1_CODE_HW |H/W (GPMC) |S/W | +---------------------------------------+---------------+---------------+ |OMAP_ECC_BCH8_CODE_HW_DETECTION_SW |H/W (GPMC) |S/W | |(requires CONFIG_MTD_NAND_ECC_BCH) | | | +---------------------------------------+---------------+---------------+ |OMAP_ECC_BCH8_CODE_HW |H/W (GPMC) |H/W (ELM) | |(requires CONFIG_MTD_NAND_OMAP_BCH && | | | | ti,elm-id in DT) | | | +---------------------------------------+---------------+---------------+ To optimize footprint of omap2-nand driver, selection of some ECC schemes also require enabling following Kconfigs, in addition to setting appropriate DT bindings - Kconfig:CONFIG_MTD_NAND_ECC_BCH error detection done in software - Kconfig:CONFIG_MTD_NAND_OMAP_BCH error detection done by h/w engine Signed-off-by: Pekon Gupta <pekon@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
2014-11-28mtd: nand: remove NAND_BBT_SCANEMPTYBrian Norris
NAND_BBT_SCANEMPTY is a strange, badly-supported option with omap as its single remaining user. NAND_BBT_SCANEMPTY was likely used by accident in omap2[1]. And anyway, omap2 doesn't scan the chip for bad blocks (courtesy of NAND_SKIP_BBTSCAN), and so its use of this option is irrelevant. This patch drops the NAND_BBT_SCANEMPTY option. [1] http://lists.infradead.org/pipermail/linux-mtd/2012-July/042902.html Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Ivan Djelic <ivan.djelic@parrot.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2014-11-26Merge remote-tracking branch 'atmel-maxtouch/maxtouch-v3.10' into ↵Evan Wilson
android-3.10-bringup Change-Id: Iea94511ceb93f68a94a9e57d5651c1e01dfe6f71
2014-11-25inv_mpu: Adding invensense mpu driverEvan Wilson
Conflicts: arch/arm/configs/omap3_h1_defconfig arch/arm/mach-omap2/board-omap3h1.c drivers/staging/iio/imu/Kconfig drivers/staging/iio/imu/Makefile Change-Id: I0a3a8ae9259525702355ebe13a8c235d6004af14
2014-11-04IKXCLOCK-4107 Add Additional M4 Panic Restore LogicEric Tashakkor
Added user settings recovery to the pedometer driver. Created panic recovery for display and audio statuses. Change-Id: I9520d54d66a7711201d6d17f726afd592365d74a Signed-off-by: Eric Tashakkor <w36098@motorola.com>
2014-11-03IKXCLOCK-4153: M4 logger enhancementsViditha Hanumanthareddy
Change-Id: I8a3d2f5a7c367dbbe28b0422ff508a4921624249
2014-10-22IKXCLOCK-3670 power: max17042_battery: Init device when config version changesDmitriy Gruzman
Add versioning to the battery config data to perform init procedure every time version changes. Previously, init procedure was only performed after POR event. This functionality is not available on MAX17042 since register 0x20 that is used to store version number is not avaiable on that revison. Change-Id: I7f8d5ca587bb4b7da3ce0471a209e530eaf3e27f Signed-off-by: Dmitriy Gruzman <dgruzman@motorola.com>
2014-10-13IKXCLOCK-4181 Update Pedometer for No RMR CaloriesEric Tashakkor
Added new field for calorie calculations that do not include RMR. Change-Id: I749c2d21535cca2b64d7c15944f09ef164b22927 Signed-off-by: Eric Tashakkor <w36098@motorola.com>
2014-10-10IKXCLOCK-4163: Add Mets and Calories Fields that Exclude RMR to M4 Memory Mapandrewsl
Change-Id: Ie6bd00f65840f295fcf4534f530d682a7f0d94af
2014-10-07IKXCLOCK-4117: backlight on charger should dim out when not using ALSAmit Jain
Change-Id: Ie0f022537c8bd48305d451f88e80a29ef2a6cbc8
2014-10-06IKXCLOCK-4101: use ALS to control backlightAmit Jain
when watch is on charger
2014-10-04Revert "IKXCLOCK-4061: power key behavior change"Amit Jain
This reverts commit 58efe519a5477c70a184cdf376520122127f69f0. Change-Id: I8a80fcb5d7386ac8c74da99aa649ad549d64d3a1
2014-10-03IKXCLOCK-4061: power key behavior changeAmit Jain
2014-09-24IKXCLOCK-3835 : Support linear acceleration.fsd017
Bug: 17511334 Change-Id: Ife878bfc039829aef35d048a3d439e6a8c0f2137
2014-09-18IKXCLOCK-3536 : Implement Gravity Sensor on M4fsd017
Change-Id: I016607a49207319d92ed1050a802b00b729c11bb
2014-09-04net: ipv6: autoconf routes into per-device tablesLorenzo Colitti
Currently, IPv6 router discovery always puts routes into RT6_TABLE_MAIN. This causes problems for connection managers that want to support multiple simultaneous network connections and want control over which one is used by default (e.g., wifi and wired). To work around this connection managers typically take the routes they prefer and copy them to static routes with low metrics in the main table. This puts the burden on the connection manager to watch netlink to see if the routes have changed, delete the routes when their lifetime expires, etc. Instead, this patch adds a per-interface sysctl to have the kernel put autoconf routes into different tables. This allows each interface to have its own autoconf table, and choosing the default interface (or using different interfaces at the same time for different types of traffic) can be done using appropriate ip rules. The sysctl behaves as follows: - = 0: default. Put routes into RT6_TABLE_MAIN as before. - > 0: manual. Put routes into the specified table. - < 0: automatic. Add the absolute value of the sysctl to the device's ifindex, and use that table. The automatic mode is most useful in conjunction with net.ipv6.conf.default.accept_ra_rt_table. A connection manager or distribution could set it to, say, -100 on boot, and thereafter just use IP rules. Change-Id: I82d16e3737d9cdfa6489e649e247894d0d60cbb1 Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
2014-08-26IKXCLOCK-3659 ti-st: Hold wakelock when controller is awakeJim Wylder
Even with the RTS signaling, the bluetooth controller expects the host to be awake when the controller is awake. Bug: 17247373 Change-Id: I5f4beadea0611722a236b08ec3a9817f61b7f4df Signed-off-by: Jim Wylder <jwylder@motorola.com>
2014-08-10Revert "IKXCLOCK-3469"fsd017
This reverts commit af33de0af5b5803582d572f36a942b031c86540f. Jim was able to root cause the kernel panic introduced by polling sensors, so we don't need to revert Simon's change. This commit reverts the revert on Simon's commit for threaded irq. See note below on Jim's analysis of the issue: IKXCLOCK-3468 m4sensorhub: Use freezable workqueue The update of the sensorhub to use polling was based on the belief that the workqueue would be frozen before suspend and thawed afterwards. Unfortunately the system_wq used by schedule_delayed_work, is not freezable. Update the changes to use the system_freezable_wq. Change-Id: Ib759664a5bc61dad72207f59d2c8c672cd0f7c9
2014-08-10IKXCLOCK-3469fsd017
PT:xClock: Kernel Panic observed after full OTA to KGW38C.M219-919 Revert "mfd: sensorhub: convert to threaded IRQ handler" This reverts commit 767129434361fd64e64f975b5c559cf0e3a1d58f.
2014-08-07mfd: sensorhub: convert to threaded IRQ handlerSimon Wilson
Change-Id: Id1c895ffdae01b085b79adc3934c5a2438a12157 Signed-off-by: Simon Wilson <simonwilson@google.com>
2014-07-28IKXCLOCK-3293 PM: allow device_complete to call pm_runtime_put_noidleJim Wylder
In device_prepare pm_runtime_get_noresume is called to prevent pm_runtime_suspend during system suspend. The corresponding release in device_complete, calls pm_runtime_put, rather than pm_runtime_put_noidle(). This short-circuits any autosuspend timeouts and immediately suspends the device. Unfortunately, just directly calling pm_runtime_put_noidle() will leave some existing devices active indefinitely. Add a flag to identify devices that can safely call pm_runtime_put_noidle() and use this from device_complete. An alternate solution, would be to determine if there is a pending autosuspend timeout on the device and call the appropriate call based on this state. This check would have to be done atomically and would probably be more intrusive to the pm_runtime code. Change-Id: I9adbd3c1f1ab42565161d3c1b932e795408c72ae Signed-off-by: Jim Wylder <jwylder@motorola.com>
2014-07-26IKXCLOCK-3231 tty: omap: cancel wakelocks from ti-st driverJim Wylder
Bug: 16555224 Change-Id: I015a38bb296957c265eaa4827564fb791280614c Signed-off-by: Jim Wylder <jwylder@motorola.com>
2014-07-24IKXCLOCK-3209: Fix ALS logic for ambient modesAmit Jain
2014-07-23IKXCLOCK-3122 Smart Ambient: support ambient off gestureWengang Wu
Change-Id: I22622983c50f1d564f40314f92e49646279826f5
2014-07-23IKXCLOCK-3149: Smart Ambient with Three Gesturesandrewsl
Change-Id: Ie17757d1ef8b637ed55303e9b4bb962586eb9135
2014-07-21IKXCLOCK-3038 Add Sysfs to Mask Pedometer Data on a ChargerEric Tashakkor
Added a sysfs file to enable/disable pedometer features in M4. This change is intended as a workaround to steps being recorded on a charger. While it needs an M4 change to do something, this change does not require being merged with an M4 binary. Change-Id: Id2ac9d7327a9c42d878ac5e85db450ac5bb65e29 Signed-off-by: Eric Tashakkor <w36098@motorola.com>
2014-07-18IKXCLOCK-2896 Display: support ambient mode timeoutWengang Wu
Change-Id: I28422cfbfefb03671ad6868eb87a828481982a9c
2014-07-17IKXCLOCK-2861 uart: Allow UART to grab timed wakelocksDoug Zobel
In the case of asynchronous wakeups coming in from UART, the system may need to stay awake for a period in order to catch a retry reliably. By making a port specific platform data wakelock timeout parameter, a port can be configured to stay awake longer than the retry period. Change-Id: I46ab72bf19d9916c409cac9cdda51acc362fa1a9
2014-07-16IKXCLOCK-2951 Fix M4 Kernel Wakeup PrintsEric Tashakkor
Simplified M4 wakeup source printing to happen in the soft IRQ handler. Moved the wakeup event flag check to the hardware IRQ handler so that it is always called before resume. Removed an unused static variable in the M4 core. Change-Id: Ia1ff34cd06b51fc9bc5b6da5e87993c844414e93 Signed-off-by: Eric Tashakkor <w36098@motorola.com>
2014-07-11IKXCLOCK-2835 Fix M4 Panic RecoveryEric Tashakkor
Reduced the retry logic to only do a reboot and jump-to-user. Updated the panic handler to use the same call as m4sensorhub_initialize. Removed an unused static variable in the M4 core. Change-Id: I246e220540a4c02939c0ac435b670529d85c8f27 Signed-off-by: Eric Tashakkor <w36098@motorola.com>
2014-07-10IKXCLOCK-2570 power: max17042_battery: add support for malicious power suppliesMohsan Habibi
The max170xx is not able to tolerate some external power supplies such as those that are not used for charging. These power supplies sometimes provide voltages high enough to confuse the fuel gauge, and the only way to recover after this external supply is removed is to perform a soft POR and reinitialize the chip. This adds support to specify this type of "malicious" power supply in device tree. If the entry exists, it will perform a POR and reinitialize the chip after the malicious supply is removed. Unfortunately, there's not much we can do while the malicious supply is connected, so we leave the fuel gauge operating as it was before while its connected. Change-Id: Ib59f1b5ce7520cde3e0e36c4cf361549f8f189e4 Signed-off-by: Mohsan Habibi <mohsan@motorola.com>
2014-07-10IKXCLOCK-1435: early init of displayAmit Jain
Change-Id: I2996c32892066b5874e011c4fe7454d5ebae1aad
2014-07-04Input: atmel_mxt_ts - allow input name to be specified in platform dataNick Dyer
Android systems identify the input device and map to IDC file by using the input device name. To avoid unnecessary deltas to the driver file, allow this to be set from the platform data. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
2014-07-04Input: atmel_mxt_ts - handle cfg filename via pdata/sysfsNick Dyer
There may be multiple maXTouch chips on a single device which will require different configuration files. Add a platform data value for the configuration filename. Add sysfs entry to write configuration file if the platform data is not set. Split out the object initialisation code from mxt_initialize() into mxt_configure_objects() to allow this. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Yufeng Shen <miletus@chromium.org>
2014-07-04Input: atmel_mxt_ts - add regulator control supportNick Dyer
Allow the driver to optionally manage enabling/disable power to the touch controller itself. If the regulators are not present then use the deep sleep power mode instead. For a correct power on sequence, it is required that we have control over the RESET line. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org>
2014-07-04Input: atmel_mxt_ts - implement support for T15 Key ArrayNick Dyer
There is a key array object in many maXTouch chips which allows some X/Y lines to be used as a key array. This patch maps them to a series of keys which may be configured in a platform data array. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org>
2014-07-04Input: atmel_mxt_ts - read screen config from chipNick Dyer
By reading the touchscreen configuration from the settings that the maXTouch chip is actually using, we can remove some platform data. The matrix size is not used for anything, and results in some rather confusing code to re-read it because it may change when configuration is downloaded, so don't print it out. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: drivers/platform/chrome/chromeos_laptop.c
2014-07-04Input: atmel_mxt_ts - download device config using firmware loaderNick Dyer
The existing implementation which encodes the configuration as a binary blob in platform data is unsatisfactory since it requires a kernel recompile for the configuration to be changed, and it doesn't deal well with firmware changes that move values around on the chip. Atmel define an ASCII format for the configuration which can be exported from their tools. This patch implements a parser for that format which loads the configuration via the firmware loader and sends it to the MXT chip. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: drivers/platform/chrome/chromeos_laptop.c
2014-07-04Input: atmel_mxt_ts - implement CRC check for configuration dataNick Dyer
The configuration is stored in NVRAM on the maXTouch chip. When the device is reset it reports a CRC of the stored configuration values. Therefore it isn't necessary to send the configuration on each probe - we can check the CRC matches and avoid a timeconsuming backup/reset cycle. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-07-04Input: atmel_mxt_ts - improve T19 GPIO keys handlingNick Dyer
* The mapping of the GPIO numbers into the T19 status byte varies between different maXTouch chips. Some have up to 7 GPIOs. Allowing a keycode array of up to 8 items is simpler and more generic. So replace #define with configurable number of keys which also allows the removal of is_tp. * Rename platform data parameters to include "t19" to prevent confusion with T15 key array. * Probe aborts early on when pdata is NULL, so no need to check. * Move "int i" to beginning of function (mixed declarations and code) * Use API calls rather than __set_bit() * Remove unused dev variable. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Yufeng Shen <miletus@chromium.org> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: drivers/platform/chrome/chromeos_laptop.c
2014-07-04Input: atmel_mxt_ts - remove unnecessary platform dataNick Dyer
It is not necessary to download these values to the maXTouch chip on every probe, since they are stored in NVRAM. It makes life difficult when tuning the device to keep them in sync with the config array/file, and requires a new kernel build for minor tweaks. These parameters only represent a tiny subset of the available configuration options, tracking all of these options in platform data would be a endless task. In addition, different versions of maXTouch chips may have these values in different places or may not even have them at all. Having these values also makes life more complex for device tree and other platforms where having to define a static configuration isn't helpful. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Benson Leung <bleung@chromium.org> Acked-by: Yufeng Shen <miletus@chromium.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Conflicts: drivers/platform/chrome/chromeos_laptop.c
2014-07-02IKXCLOCK-2594: Restore pedometer data after m4 panicViditha Hanumanthareddy
When m4 panics and resets, the total stepcount start from 0, and if an app was registered for pedometer data it would start seeing stepcount restart from 0 when this happens. This fix is to avoid the app from seeing total steps go lower than the previously reported total steps. Change-Id: Ia1c803175e34e582fa132de7ca88e8762e335fe7
2014-07-02IKXCLOCK-2662: Remove still mode driverViditha Hanumanthareddy
Change-Id: If8646de956cd9f30ed6809f57a438a3ddd21a809
2014-06-30IKXCLOCK-2630 serial: Failed to hit offmode due to UART1 being non-idleVladimir Tsunaev
When c55 driver is changing pad configuration than PRCM detects wake event from pad and it happens after PRCM get suspended Evidence of this behavior is line: "omap34xx_do_sram_idle: OMAP3_PRM_IRQENABLE_MPU_OFFSET 0x00000000" and status bit in: PRM__CORE (48004a00) b0 => 0x00002000 0x00000000) As result event still pending and system can not get into requested low power state. UART1 is not wakeup-capable and to avoid this false wake ups the wakeup event has to be disabled in all levels (uart module and PRCM module). Change-Id: I9aba9503f91ddd15965d23755f3293c0f333adc2 Signed-off-by: Vladimir Tsunaev <vladimirt@motorola.com>
2014-06-17IKXCLOCK-2142 i2c: omap: convert I2C driver to PM QoS for latency constraintsMohsan Habibi
Convert the driver from the outdated omap_pm_set_max_mpu_wakeup_lat API to the new PM QoS API. Since the constraint is on the MPU subsystem, use the PM_QOS_CPU_DMA_LATENCY class of PM QoS. The resulting MPU constraints are used by cpuidle to decide the next power state of the MPU subsystem. The I2C device latency timing is derived from the FIFO size and the clock speed and so is applicable to all OMAP SoCs. Based on: 671d9f5 OMAP: convert I2C driver to PM QoS for latency constraints Change-Id: Iea5ac78d89019ed6e8888a0d6489057186748bfa Signed-off-by: Mohsan Habibi <mohsan@motorola.com>