summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2012-03-15ENGR00177017: Improve the mpr121 capacitive button responsiveness on iMX53 SMDimx-android-r14-alphaNitin Garg
The capacitive buttons on iMX53 SMD sometimes misses the touch events. Improve the sentivity by reducing touch threshold and enabling baseline tracking in ECR. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
2012-03-10ENGR00175622: Android Kernel alignment for ICS CameraJeff Kudrick
Alignment to latest changes in Linux 3.0 kernel to Linux 2.6.38 support for iMX53 ICS. Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
2012-02-15ENGR00174591: Fix the max17085 battery sensorNitin Garg
This commit fixes the max17085 3-cell battery sensor and some code cleanup in SDHC, AMD-GPU, Regulators, RTC. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
2012-02-05ENGR00171216: Add suspend/resume, battery, accelerometer support.Nitin Garg
Add suspend/resume, battery, accelerometer support and fix some compilation warnings. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
2011-12-15USB: gadget: f_mtp: Add support for sending MTP header during file transferMike Lockwood
MTP_SEND_FILE_WITH_HEADER ioctl allows sending a file with the 12 byte header prepended at the beginning. This is to allow MTP to use a single packet for the data phase instead of two. Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-12-15USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at bootMike Lockwood
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-12-13Merge remote-tracking branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_arm2.c arch/arm/mach-mx6/board-mx6q_sabrelite.c
2011-12-08ENGR00169661:Remove the discharge for VBUS and DPTony LIU
header file - remove the definition of discharge dp Signed-off-by: Tony LIU <junjie.liu@freescale.com>
2011-12-06ENGR00163669-1 mxc fb: remove FB_EVENT_PREMODE_CHANGE for mxc fb driversWayne Zou
remove FB_EVENT_PREMODE_CHANGE for mxc ldb/tve drivers add dispdrv setup interface for ldb/tve drivers re-structure the dispdrv framework for display devices Signed-off-by: Wayne Zou <b36644@freescale.com>
2011-12-06Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/system.c drivers/media/video/mxc/capture/mxc_v4l2_capture.c
2011-11-30ENGR00163497-1 Add a "io_init" function to fsl camera platform dataEven Xu
Add a new member named "io_init" to fsl camera platform data, this Function can initialize IO of camera sensor before it works. Signed-off-by: Even Xu <b21019@freescale.com>
2011-11-22nf: xt_socket: export the fancy sock finder codeJP Abgrall
(Backport from android-3.0 d8cfaaaf6817a0279f0faef8ee5ddd52de12839a) The socket matching function has some nifty logic to get the struct sock from the skb or from the connection tracker. We export this so other xt_* can use it, similarly to ho how xt_socket uses nf_tproxy_get_sock. Change-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd Signed-off-by: JP Abgrall <jpa@google.com>
2011-11-22netfilter: adding the original quota2 from xtables-addonsJP Abgrall
(Backport from common 3.0: Change I19d49858) The original xt_quota in the kernel is plain broken: - counts quota at a per CPU level (was written back when ubiquitous SMP was just a dream) - provides no way to count across IPV4/IPV6. This patch is the original unaltered code from: http://sourceforge.net/projects/xtables-addons at commit e84391ce665cef046967f796dd91026851d6bbf3 Change-Id: I19d49858840effee9ecf6cff03c23b45a97efdeb Signed-off-by: JP Abgrall <jpa@google.com>
2011-11-22netfilter: xt_qtaguid: add uid permission checks during ctrl/stats accessJP Abgrall
(backport from 3.0: I83990862d52a9b0922aca103a0f61375cddeb7c4) * uid handling - Limit UID impersonation to processes with a gid in AID_NET_BW_ACCT. This affects socket tagging, and data removal. - Limit stats lookup to own uid or the process gid is in AID_NET_BW_STATS. This affects stats lookup. * allow pacifying the module Setting passive to Y/y will make the module return immediately on external stimulus. No more stats and silent success on ctrl writes. Mainly used when one suspects this module of misbehaving. Change-Id: I83990862d52a9b0922aca103a0f61375cddeb7c4 Signed-off-by: JP Abgrall <jpa@google.com>
2011-11-22netfilter: add xt_qtaguid matching moduleJP Abgrall
(Backport from android-3.0 934abcf52a9831d35fb578048b737313e5a9e717) This module allows tracking stats at the socket level for given UIDs. It replaces xt_owner. If the --uid-owner is not specified, it will just count stats based on who the skb belongs to. This will even happen on incoming skbs as it looks into the skb via xt_socket magic to see who owns it. If an skb is lost, it will be assigned to uid=0. To control what sockets of what UIDs are tagged by what, one uses: echo t $sock_fd $accounting_tag $the_billed_uid \ > /proc/net/xt_qtaguid/ctrl So whenever an skb belongs to a sock_fd, it will be accounted against $the_billed_uid and matching stats will show up under the uid with the given $accounting_tag. Because the number of allocations for the stats structs is not that big: ~500 apps * 32 per app we'll just do it atomic. This avoids walking lists many times, and the fancy worker thread handling. Slabs will grow when needed later. It use netdevice and inetaddr notifications instead of hooks in the core dev code to track when a device comes and goes. This removes the need for exposed iface_stat.h. Put procfs dirs in /proc/net/xt_qtaguid/ ctrl stats iface_stat/<iface>/... The uid stats are obtainable in ./stats. Change-Id: I01af4fd91c8de651668d3decb76d9bdc1e343919 Signed-off-by: JP Abgrall <jpa@google.com>
2011-11-22USB: gadget: f_mtp: Add PTP variant of MTP USB functionMike Lockwood
This is the same as MTP but with PTP interface descriptor. Also removed obsolete ioctl for switching between MTP and PTP mode Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-22usb: gadget: android: Update android gadget driverBenoit Goby
* Functions and the device descriptor are configured from user space: echo 0 > /sys/class/android_usb/android0/enable echo adb,acm > /sys/class/android_usb/android0/functions echo 2 > /sys/class/android_usb/android0/f_acm/instances echo 1 > /sys/class/android_usb/android0/enable * Driver does not require platform data anymore * Moved function initialization to android.c instead of each function file * Replaced switches by uevents Signed-off-by: Benoit Goby <benoit@android.com> Signed-off-by: Mike Lockwood <lockwood@android.com> Change-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6 Conflicts: drivers/usb/gadget/android.c drivers/usb/gadget/composite.c drivers/usb/gadget/f_mtp.c
2011-11-22USB: gadget: f_accessory: New gadget driver for android USB accesoriesMike Lockwood
Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Misc improvements and cleanup: - Add URI string - Replace type string with a description string - Add a control call to retrieve accessory protocol version (currently 1) - Driver read() and write() calls now fail after USB disconnect until driver file is closed and reopened. - Misc cleanup work Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Clear accessory strings when USB is disconnected Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Clear previous strings on ACCESSORY_GET_PROTOCOL Clearing strings on disconnect does not work since we may receive a disconnect on some devices when transitioning into accessory mode. We require an accessory to send ACCESSORY_GET_PROTOCOL before sending any strings, so any strings from a previous session will be cleared. Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Clear disconnected flag when driver file is opened Fixes a race condition that can occur when entering accessory mode. Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Add string for accessory's unique serial number Signed-off-by: Mike Lockwood <lockwood@android.com> USB: gadget: f_accessory: Set bNumEndpoints to correct value of 2 Change-Id: I24f4e36f196d45436e0573301500c3b93215953d Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-22USB: gadget: android: Support switching vendor ID when configuration changesMike Lockwood
Based on the list of enabled USB functions, we can now switch the vendor ID as well as the product ID. Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-22usb: gadget: composite: Add usb_remove_configBenoit Goby
This allows composite drivers to dynamically change their configuration. For example, a driver might remove a configuration and register a new one with a different set of functions. User should prevent the host from enumerating the device while changing the configuration: usb_gadget_disconnect(cdev->gadget); usb_remove_config(cdev, old_config); usb_add_config(cdev, new_config, new_conf_bind); usb_gadget_connect(cdev->gadget); Change-Id: Icbfb4ce41685fde9bf63d5d58fca1ad242aa69f9 Signed-off-by: Benoit Goby <benoit@android.com>
2011-11-22usb: gadget: composite: Allow function drivers to pause control transfersRoger Quadros
Some USB function drivers (e.g. f_mass_storage.c) need to delay or defer the data/status stages of standard control requests like SET_CONFIGURATION or SET_INTERFACE till they are done with their bookkeeping and are actually ready for accepting new commands to their interface. They can now achieve this functionality by returning USB_GADGET_DELAYED_STATUS in their setup handlers (e.g. set_alt()). The composite framework will then defer completion of the control transfer by not completing the data/status stages. This ensures that the host does not send new packets to the interface till the function driver is ready to take them. When the function driver that requested for USB_GADGET_DELAYED_STATUS is done with its bookkeeping, it should signal the composite framework to continue with the data/status stages of the control transfer. It can do so by invoking the new API usb_composite_setup_continue(). This is where the control transfer's data/status stages are completed and host can initiate new transfers. The DELAYED_STATUS mechanism is currently only supported if the expected data phase is 0 bytes (i.e. w_length == 0). Since SET_CONFIGURATION and SET_INTERFACE are the only cases that will use this mechanism, this is not a limitation. Signed-off-by: Roger Quadros <roger.quadros@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-11-21ENGR00161951-1 [mx6q]performance monitor driverTony Lin
add plt_init & plt_exit functions to structure, so that the driver would have chance to do platform specific init and exit Signed-off-by: Tony Lin <tony.lin@freescale.com>
2011-11-21ENGR00162583-3 usb header: avoid class driver access register after usb is offPeter Chen
- An well-behavior class driver should disable their endpoints after being notified disconnect with host, we use all endpoints are stopped (ep->stopped) to indicates the class driver will not visit device driver any more. the ep-stopped will be initialized as 1 for non-control endpoint it will be 0 after fsl_ep_enable, and be 1 after fsl_ep_disable. Where is a non-sleep wait routine at disconnect event for waiting all endpoints are stopped - Some controller's (like i.mx6q) DP will change from J to SE0 slowly after the cable disconnects with host, in that case there will be a wakeup interrupt after driver enables the wakeup interrupt. For i.mx6q, there is a discharge routine for DP after the disconnection. - Should not wait vbus to low during first otg switch, as the wait will be timeout when the usb cable is connecting to host. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2011-11-18Merge commit 'rel_imx_2.6.38_11.11.00_RC1' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_sabrelite.c
2011-11-14ENGR00162010-2 [Thermal]Add calibration to thermalAnson Huang
1. Read calibration from fuse to adjust formula for thermal driver; 2. For the parts that didn't contain valid calibration data, cooling device will be disabled; Signed-off-by: Anson Huang <b20788@freescale.com>
2011-11-11ENGR00143921-1 - EPDC/MAX17135: Add controls for V3P3 regulatorDanny Nold
- Added V3P3 regulator to max17135 - Added calls to enable/disable V3P3 regulator from EPDC driver - Improved Kconfig detail for max17135 MFD and HWMON entries Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-11-04ENGR00161444 V4L2: Fix v4l2 capture build errorFrank Li
Fix v4l2 build error. revert mxc_v4l2.h to 01c98ebc63d Signed-off-by: Frank Li <Frank.Li@freescale.com>
2011-11-04ENGR00159982 - FEC: low power mode when FEC is no use.Fugang Duan
- Set phy AR8031 to save power mode when no cable connect. - Close enet clock gate when FEC is no use. Signed-off-by: Fugang Duan <B38611@freescale.com>
2011-11-04Merge branch 'imx_2.6.38' into imx_2.6.38_androidZhang Jiejing
Conflicts: arch/arm/mach-mx6/board-mx6q_sabreauto.c arch/arm/mach-mx6/cpu_op-mx6.c arch/arm/plat-mxc/dvfs_core.c drivers/cpufreq/cpufreq_stats.c
2011-11-04ENGR00160878-1 mxc v4l2 output: new mxc v4l2 output driver based on videobufJason Chen
This new v4l2 output driver is based on videobuf, using dma contig alloc method. It creates video dev node for each display framebuffer begin from /dev/video16 by default. If need post-processing, this driver will do it by ipu pp driver which support: - resizing - CSC - rotate - deinterlacing If no need post-processing, the IPU IC will be bypassed as old driver, the buf will be set to fb buffer directly by crack fb smem_start. The user should do setting before streamon like below: 1. set output crop 2. set ctrl like rotate/vflip/hflip/deinterlacing motion 3. set fmt 4. reqbuf The new features compare to old driver: - support multi-instance - support user point buffer - runtime suspend/resume For suspend/resume, still has chance to meet issue on mx6q, will fix later. This patch for head file. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-11-04ENGR00160875-1 ipuv3 dev: low performance if enable rotationJason Chen
1. no dma alloc for rot buf every time which will cost time. 2. fix split mode condition. 3. export some functions. This patch for common head file. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-11-04ENGR00161314-3 mx6q usb-host: add hsic supportPeter Chen
Header file Signed-off-by: Peter Chen <peter.chen@freescale.com>
2011-11-02ENGR00161014 ASoC: don't clobber platform DMA driver opsAlan Tull
Previously, only one static struct for ops existed for all platform DMA drivers to share. Half of the ops are shared functions which don't have stubs in the ALSA core. The other half are initialized to point directly to ops in the platform driver. This creates problems where each time soc_new_pcm is called, the new platform driver's ops would overwrite a subset of the ops. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-28ENGR00160797-2 Add Anatop regulator driverNancy Chen
Add Anatop regulator driver. Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
2011-10-28ENGR00160860-2 hdmi audio driverAlan Tull
Audio driver for i.Mx built-in HDMI Transmitter. * Uses HDMI Transmitter's built-in DMA. * Adds IEC958-style digital audio header info to the raw audio. * Gets pixel clock from the IPU driver and calculates clock regenerator values (cts and N). * Move ipu_id, and disp_id from the HDMI's platform data to the HDMI mfd's platform data. Saves them in the hdmi mfd. * Add mfd functionality to update the clock regenerator values when the hdmi changes the pixel clock rate or when requested from the audio driver with a new audio sample rate. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-27ENGR00159530-1 mc34708: add new pmic core driver based on MFDRobin Gong
add new mc34708's core driver based on MFD Signed-off-by: Robin Gong <B38343@freescale.com>
2011-10-27ENGR00160709-1 Move board specific code out of FEC driverMahesh Mahadevan
Move the board specific code out of the FEC driver to the platform layer Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
2011-10-25ENGR00139265-2 mxc alsa soc spdif driverAlan Tull
* Add spdif block clock divider settings and spdif_clk_set_rate function to mxc_spdif_platform_data. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-18ENGR00160061 - MXC HDMI: Optimize HDMI clock managementDanny Nold
- Ensure HDMI clocks are disabled when leaving HDMI core probe function. - Create HDMI core api to allow HDMI sub-drivers to init, enable, and disable the HDMI IRQ. Required to optimally manage HDMI clocks, allow IAHB to be disabled, and still have video and audio sub-drivers able to receive interrupts. - Update code to adjust for decoupled ISFR and IAHB clocks. - Disable IAHB clocks whenever HDMI not plugged in. Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-10-11Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
2011-09-29ENGR00158456-1 ipuv3 dev: return error for split mode with rotationJason Chen
Currently we do not support split mode with rotation. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-09-26ENGR00156976 - PxP: fix imx-lib build breakDanny Nold
Change from u8 declaration in pxp_dma.h to __u8 Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-09-26ENGR00156420 - EPDC/PxP: Add support for color mapDanny Nold
- Add support for 8-bit grayscale colormaps to be used during EPDC update processing - Add support in PxP for programming of colormaps Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-09-15Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into 2.6.38-merge-testZhang Jiejing
Conflicts: drivers/misc/Kconfig drivers/misc/Makefile drivers/net/wireless/Makefile include/linux/mmc/mmc.h kernel/power/main.c
2011-09-14ENGR00156673-1 ipuv3: move mach related definition to mach dirJason Chen
for include/linux/ipu.h. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-09-08ENGR00155135-1 ipuv3 dev: add processing driver supportJason Chen
IPU's IC/IRT/VDI modules provide resizing/CSC/combination/de-interlacing support, this patch make all these features into one processing driver. A struct ipu_task is the interface between user and this driver, user just need fill his task struct and queue it through ioctl, then wait ipu hardware finish its job (now only support BLOCKING operation, not support NO_BLOCK operation). Pls refer to inlcude/linux/ipu.h for structure information and unit test for usage. This patch is for header file change. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-09-02ENGR00154436-2 - MXC HDMI: Support complete feature setDanny Nold
- Cleaned up video mode configuration in HDMI driver - Add support for configurable ipu-to-hdmi mappings - Add hotplug support. - Adapt interrupt handling to account for sharing interrupt with HDMI audio - Remove audio configuration - Change code to only use CEA HDMI modes - Add support for AVI InfoFrame - Add aspect ratio to EDID mode data - Add rounding support to IPU pix clk setup - Add powerdown/powerup flow - Support FB notifications - Remove build warnings Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-09-01ENGR00155845-1 mfd for hdmiAlan Tull
This is a mfd for the internal HDMI Transmitter on i.Mx. It handles resources that are shared by the seperate video and audio drivers. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-09-01ENGR00155627-1 [MX6]Add thermal cooling devieAnson Huang
1.Common code of thermal_sys has some bug,could not set the mode via sysfs using echo enable/disabled command; 2.Since the anatop thermal formula still not accurate, in order to help test and adjust the trip point of anatop thermal zone, we add the set trip point temp value into the sysfs interface. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-26ENGR00153895 [MX6Q]SD: SD3 clock is not off, when no SD card is in useTony Lin
the patch brings in clock management, not only card removal will gate off corresponding SD clock, but also a timeout after last request will gate off the SD clock. Signed-off-by: Tony Lin <tony.lin@freescale.com>