summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-15pm-imx6.c: fix power off by stop modeColibri_iMX6_LinuxImageV2.5Beta3_20151215Apalis_iMX6_LinuxImageV2.5Beta3_20151215Max Krummenacher
With the 3.14.28 release of the kernel imx6_stop_mode_poweroff() does not enter stop mode. Thus the function does not switch of power but returns. This seems to be caused by the second processor which has been stopped. Set the WFI event mask for the stopped processor works around the issue. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2015-12-15process.c: if power off fails, do at least a haltMax Krummenacher
Otherwise power_machine_power_off() returns and e.g. unexpected interrupts create stack traces. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2015-12-15gpio: generic: clamp retured value to [0,1]Linus Walleij
The generic GPIO would return 0 for low generic GPIO, and something != 0 for high GPIO. Let's make this sane by clamping the returned value to [0,1]. Reported-by: Evgeny Boger <boger@contactless.ru> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-12-02apalis/colibri_imx6: Enable RTL8192CU driverBhuvanchandra DV
Enable RTL8192CU driver to support LM006 USB WiFi adapter. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
2015-12-02ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.hBehan Webster
With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). "static inline" is the correct choice instead. Author: Behan Webster <behanw@converseincode.com> Signed-off-by: Behan Webster <behanw@converseincode.com> Reviewed-by: Mark Charlebois <charlebm@gmail.com> (cherry picked from commit 76ae03828756bac2c1fa2c7eff7485e5f815dbdb) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2015-12-02Input: sentelic - use "static inline" instead of "inline"Khem Raj
gcc-5 defaults to gnu11 which used c99 inline semantics in c99 'inline' is not externally visible unlike gnu89, therefore we use 'static inline' which has same semantics between gnu89 and c99 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2015-12-02ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.hBehan Webster
With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). In this case using static inline and removing the NULL version of return_address in return_address.c does the right thing. Signed-off-by: Behan Webster <behanw@converseincode.com> Reviewed-by: Mark Charlebois <charlebm@gmail.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> (cherry picked from commit aeea3592a13bf12861943e44fc48f1f270941f8d) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2015-12-02Input: lifebook - use "static inline" instead of "inline" in lifebook.hChen Gang
For functions defined in header files we should use static inline rather than inline, which breaks under the latest upstream gcc (which is really gcc issue, but static inline is better suited regardless). The related error (with allmodconfig under tile): MODPOST 4002 modules ERROR: "lifebook_detect" [drivers/input/mouse/psmouse.ko] undefined! Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit bd447b61c49fc26f0299587db3e6d66da49dc529) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2015-12-02imx6qdl-apalis.dtsi: adapt to changed ldb driver (LVDS)Max Krummenacher
The ldb driver which controls the LVDS output got heavily overhauled and its configuration from the cmdline seem no longer working. This adds a configuration to the device tree which can be activated from the cmdline with: video=mxcfb0:dev=ldb Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2015-11-04ARM: apalis/colibri_imx6: add namespace support in defconfigColibri_iMX6_LinuxImageV2.5Beta2_20151106Apalis_iMX6_LinuxImageV2.5Beta2_20151106Stefan Agner
Newer systemd variants need network namespace support for various services such as systemd-hostnamed or systemd-localed. (cherry picked from commit 4bb3acd58f8d2074cd8e7a6ddb914a0954d0906a)
2015-11-04ASoC: sgtl5000: Fix the cache handlingFabio Estevam
Since commit e5d80e82e32e (ASoC: sgtl5000: Convert to use regmap directly) a kernel oops is observed after a suspend/resume sequence. The kernel oops happens inside sgtl5000_restore_regs() as codec->reg_cache is no longer a valid pointer. Add the remaining register entries into sgtl5000_reg_defaults[] and remove sgtl5000_restore_regs() completely, which allows suspend/resume to work fine and make the code simpler. Tested on a im53-qsb board. Reported-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org> (cherry picked from commit 29aa37cddfb9b721013ff28608200d73a9426368)
2015-11-03apalis/colibri_imx6: remove duplicate stmpe adc from defconfigMarcel Ziswiler
Remove duplicate CONFIG_STMPE_ADC from both defconfigs. While at it also remove obsolete commented out CONFIG_NET_VENDOR_ATHEROS being not set on Colibri iMX6.
2015-11-03input: touchscreen: fusion: implement multitouch with slot handlingStefan Agner
According to multi-touch-protocol.txt the kernel knows two type of devices: - Type A: devices which provide anonymous contacts - Type B: devices which are capable of tracking individual contacts The Fusion touch screen is a Type B device: The Touch ID field allows to differentiate between 2 different fingers. This updates the driver to properly allocate a slot for each identified contact and use the helper functions available from the input core system. (cherry picked from commit 7deb092bd1f3ff2111fbde52afd35e2ea2933740)
2015-11-02input: touchscreen: fusion: use level triggered interruptStefan Agner
Use level triggered interrupt which makes sure that even we miss a rising edge (due to latencies in the kernel), the interrupt still will be handled later, and doesn't freeze the input device. (cherry picked from commit ef25b8a9f9c0ca7cc0f0f955d89d112c3e19f75b)
2015-10-29Apalis/Colibri iMX6 dtbs: add routing for line-inMax Krummenacher
We do provide the line in jack, so add it in the routing.
2015-10-29mxc_v4l2_capture.c: make error messages uniqueMax Krummenacher
"ERROR: v4l2 capture: slave not found!" is used for many ioctl. Add the ioctl to the string to ease debugging.
2015-10-29ipu_csi_enc.c: fix debug printMax Krummenacher
2015-10-29max9526.c: move pinctrl after i2c detectMax Krummenacher
This removes a bunch of error messages during probe because both the adv7180 and the max9526 use try to reserve the same pins. While at it convert debug output to dev_dbg
2015-10-29adv7180.c: convert debug output to dev_dbgMax Krummenacher
2015-10-29Apalis/Colibri iMX6 dtbs: add status okay to the camerasMax Krummenacher
This allows for easier disabling of unused cameras.
2015-10-22dtb, i2c-imx.txt: fix typosMax Krummenacher
(cherry picked from commit 602505a35f2bf10963bb1f97adeaeb66e610de24)
2015-10-22apalis_imx6_defconfig: provide PCIe SATA/AHCI driver as a moduleMax Krummenacher
2015-10-22ARM: imxqdl-colibri: Increase speed field of DSIP0 padsBhuvanChandra.DV
Increase SPEED field from 50MHz to 100MHz the avoid pixel flickering on RGB666 at Full HD resolutions. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> (cherry picked from commit a700491ac9cc18d27ddfadee3a7787039485ed40) Conflicts: arch/arm/boot/dts/imx6qdl-colibri.dtsi commit 5202ebd189bac35987bf79335fe4568aabbf2b0e: The capacitive touch 10" display does react badly react badly to the current pad control settings. E.g. only the upper half of the display was somewhat readable with the lower half being whitish.
2015-10-22imx6qdl-apalis.dtsi: use correct function for CAM_MCLKMax Krummenacher
2015-10-22imx6qdl-colibri.dtsi: mux CAM MCLK pin only onceMax Krummenacher
2015-10-22Apalis/Colibri iMX6: defconfig: add CIFS filesystemMax Krummenacher
2015-10-22Apalis/Colibri iMX6: defconfig: include MAX9526Max Krummenacher
(cherry picked from commit 47c017b98ce9359f890363b4095c87235a6f81d6)
2015-10-22mxc_v4l2_capture: match ipu/csi/mipi instead of only ipu/csiTroy Kisky
(cherry picked from commit f3ce4f51a39f0eb6727166cbdba3e92b37f237e8) Conflicts: drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
2015-10-22max9526: add initial MXC camera sensor codeMax Krummenacher
Add initial support for Maxim Integrated MAX9526 video decoder for use with an Freescale i.MX 6. PAL works, NTSC does not lock on VSYNC. (cherry picked from commit 6763d5ab9496099ec2b74d3a7c2034e87a7cb70e) Conflicts: drivers/media/platform/mxc/capture/Makefile Conflicts with 3.14 headers: Change different location for include v4l2-int-device.h While at it remove unused auto variables which causes compile time warnings.
2015-10-22adv7180.c: initial working adv7180 settingsMax Krummenacher
The input channel is currently fixed to A_IN2_3 on the ACM's connector X5. (cherry picked from commit 568747f8c0984b027ca9feb1a3326fd96c4e4373)
2015-10-22mxc_v4l2_capture: let the camera driver set mipi/parallelMax Krummenacher
The camera driver knows if it uses mipi or parallel, and in case a camera can do both it makes sense that this is in the device tree node for the camera and not the generic mxc_v4l2_capture. (cherry picked from commit 09d5f1a3ad615b96d9f01bca0622d41f20c3011b)
2015-10-15Apalis/Colibri dts: add Colibri cam, Apalis Ixora specific dtbsMax Krummenacher
2015-10-15Colibri dtbs: add fixes from 3.10.17Max Krummenacher
While at it cleanup node names.
2015-10-15ARM: dts: Apalis/Colibri dts: use input dt-bindingsMax Krummenacher
Use commit e11011a0578101b2f0f9a066d13beeb2c2da5fcc on all device-trees: Rather than defining our own KEY_WAKEUP include the official input dt-bindings. While at it update copyright date range as well.
2015-10-15imx6dl-colibri-eval-v3.dts: prepare for fusion_F07/10AMax Krummenacher
Prepare for the needed changes to use the capacitive touch controller on Fusion F07, Fusion F10A displays. In order to use it uncomment the define PCAP and recompile and deploy the device tree Forward port of 3.10.17, commit e5925f53b4c6021d03a7a694d0512712036e83e6
2015-10-15Apalis dts: cleanup whitespaceMax Krummenacher
2015-10-15pci-imx6: fix reboot bugTroy Kisky
2015-10-15mxc_hdmi.c: fix boot hangMax Krummenacher
Without this the kernel hangs during boot when HDMI is attached. It looks like we get an overflow IRQ storm. overflow is related to HDMI audio.
2015-09-24Apalis/Colibri iMX6 defconfigs: add HID_MULTITOUCHMax Krummenacher
2015-09-24fbcon: logo: allow easy integration of a custom Linux boot logoMarcel Ziswiler
This patch allows for easy integration of a custom Linux boot logo to replace the Tux' being shown by default. Use gimp or the like to create a raw PPM in your desired resolution. Reduce the number of colours in the image to 224: user@host:~$ ppmquant 224 Toradex-640x480.ppm > \ Toradex-640x480-224.ppm ppmquant: making histogram... ppmquant: 370 colors found ppmquant: choosing 224 colors... ppmquant: mapping image to new colors... Convert it from raw PPM to ASCII format: user@host:~$ pnmnoraw Toradex-640x480-224.ppm > \ Toradex-640x480-ascii-224.ppm Copy it into the Linux sources: cp Toradex-640x480-ascii-224.ppm linux-toradex/drivers/video/logo/\ logo_custom_clut224.ppm Activate exclusively custom Linux logo in the kernel configuration: Device Drivers -> Graphics support -> Bootup logo -> Custom 224-color Linux logo And re-compile the kernel. (cherry picked from commit fa2371bff9ac03581881849d8f95678ef3992719) (cherry picked from commit 481ced9057f340a80bf23775a55a9b657c49201f)
2015-09-24extcon: usb-gpio: increase debounce timeMarcel Ziswiler
Testing on Colibri Evaluation board V3.x has shown even 50 ms not being enough to avoid unloading and immediately reloading the EHCI USB host controller driver upon OTG cable removal which is of course suboptimal. This patch increases it to 100 ms which should leave enough safety margin.
2015-09-24ARM: dts: imx6dl-colibri: usb device/host switch using extcon gpioMarcel Ziswiler
Use USBC_DET feature of Standard Colibri SODIMM pin 137 for USB device/host switching using the generic extcon USB GPIO implementation.
2015-09-24ARM: dts: imx6dl-colibri: use input dt-bindingsMarcel Ziswiler
Rather than defining our own KEY_WAKEUP include the official input dt-bindings. While at it update copyright date range as well.
2015-09-24ARM: colibri_imx6: add extcon usb gpio support in defconfigMarcel Ziswiler
Enable extcon USB GPIO support in the default kernel configuration.
2015-09-24usb: chipidea: use extcon framework for ID and VBUS detectionMarcel Ziswiler
Rather than relying on special USB/PHY pins/registers use the generic extcon framework with its extcon-usb-gpio implementation to detect ID and VBUS changes. (cherry picked from commit a257098741b441e6e84ffe97b7793c580642d502)
2015-09-18extcon: Add resource-managed extcon register functionSangjung Woo
Add resource-managed extcon device register function for convenience. For example, if a extcon device is attached with new devm_extcon_dev_register(), that extcon device is automatically unregistered on driver detach. Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com> [Fix bug about devm_extcon_dev_match/release() and code clean by Chanwoo Choi] Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> (cherry picked from commit 1111244ff4493448c0ee66e814e20c6e81d3b93d)
2015-09-18extcon: usb-gpio: Introduce gpio usb extcon driverRoger Quadros
This driver observes the USB ID pin connected over a GPIO and updates the USB cable extcon states accordingly. The existing GPIO extcon driver is not suitable for this purpose as it needs to be taught to understand USB cable states and it can't handle more than one cable per instance. For the USB case we need to handle 2 cable states. 1) USB (attach/detach) 2) USB-HOST (attach/detach) This driver can be easily updated in the future to handle VBUS events in case it happens to be available on GPIO for any platform. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> (cherry picked from commit e52817faae359ce95c93c2b6eb88b16d4b430181)
2015-09-18leds: leds-gpio: Pass on error codes unmodifiedSoren Brinkmann
Instead of overriding error codes, pass them on unmodified. This way a EPROBE_DEFER is correctly passed to the driver core. This results in the LED driver correctly requesting probe deferral in cases the GPIO controller is not yet available. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Reported-and-tested-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Bryan Wu <cooloney@gmail.com> (cherry picked from commit c6e71f813f7208d80bfe0f435d627fad1b204558)
2015-09-18gpio: add parameter to allow the use named gpiosOlliver Schinagl
The gpio binding document says that new code should always use named gpios. Patch 40b73183 added support to parse a list of gpios from child nodes, but does not make it possible to use named gpios. This patch adds the con_id property and implements it is done in gpiolib.c, where the old-style of using unnamed gpios still works. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Bryan Wu <cooloney@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> (cherry picked from commit 1feb57a245a4910b03202a814ffc51a900bd4aca)
2015-09-18leds: leds-gpio: Fix the "default-state" property checkFabio Estevam
Commit a43f2cbbb009f9 ("leds: leds-gpio: Make use of device property API") caused a regression by reading the incorrect string for the "default-state" property. Fix the property string check to restore the original behaviour. Fixes: a43f2cbbb009 (leds: leds-gpio: Make use of device property API) Reported-by: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Bryan Wu <cooloney@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit d735d25e60fffeffc256fa5d59551dc92dc07e36)