summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-26ASoC: 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-12-26apalis/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-12-26input: 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-12-26input: 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-12-26Apalis/Colibri iMX6 dtbs: add routing for line-inMax Krummenacher
We do provide the line in jack, so add it in the routing.
2015-12-26mxc_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-12-26ipu_csi_enc.c: fix debug printMax Krummenacher
2015-12-26max9526.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-12-26adv7180.c: convert debug output to dev_dbgMax Krummenacher
2015-12-26Apalis/Colibri iMX6 dtbs: add status okay to the camerasMax Krummenacher
This allows for easier disabling of unused cameras.
2015-12-26dtb, i2c-imx.txt: fix typosMax Krummenacher
(cherry picked from commit 602505a35f2bf10963bb1f97adeaeb66e610de24)
2015-12-26apalis_imx6_defconfig: provide PCIe SATA/AHCI driver as a moduleMax Krummenacher
2015-12-26ARM: 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-12-26imx6qdl-apalis.dtsi: use correct function for CAM_MCLKMax Krummenacher
2015-12-26imx6qdl-colibri.dtsi: mux CAM MCLK pin only onceMax Krummenacher
2015-12-26Apalis/Colibri iMX6: defconfig: add CIFS filesystemMax Krummenacher
2015-12-26Apalis/Colibri iMX6: defconfig: include MAX9526Max Krummenacher
(cherry picked from commit 47c017b98ce9359f890363b4095c87235a6f81d6)
2015-12-26mxc_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-12-26max9526: 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-12-26adv7180.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-12-26mxc_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-12-26Apalis/Colibri dts: add Colibri cam, Apalis Ixora specific dtbsMax Krummenacher
2015-12-26Colibri dtbs: add fixes from 3.10.17Max Krummenacher
While at it cleanup node names.
2015-12-26ARM: 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-12-26imx6dl-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-12-26Apalis dts: cleanup whitespaceMax Krummenacher
2015-12-26pci-imx6: fix reboot bugTroy Kisky
2015-12-26mxc_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-12-26Apalis/Colibri iMX6 defconfigs: add HID_MULTITOUCHMax Krummenacher
2015-12-26fbcon: 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-12-26extcon: 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-12-26ARM: 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-12-26ARM: 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-12-26ARM: colibri_imx6: add extcon usb gpio support in defconfigMarcel Ziswiler
Enable extcon USB GPIO support in the default kernel configuration.
2015-12-26usb: 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-12-26extcon: 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-12-26extcon: 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-12-26leds: 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-12-26gpio: 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-12-26leds: 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)
2015-12-26leds: leds-gpio: Fix multiple instances registration without 'label' propertyFabio Estevam
Since commit a43f2cbbb009f96 ("leds: leds-gpio: Make use of device property API") it is no longer possible to register multiple gpio leds without passing the 'label' property. According to Documentation/devicetree/bindings/leds/common.txt: "Optional properties for child nodes: - label : The label for this LED. If omitted, the label is taken from the node name (excluding the unit address)." So retrieve the node name when the 'label' property is absent to keep the old behaviour and fix this regression. 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: Grant Likely <grant.likely@linaro.org> Acked-by: Bryan Wu <cooloney@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 29470ea8d828e4dec74e94f7f17b7479ff5ef276)
2015-12-26leds: leds-gpio: Fix legacy GPIO number caseGeert Uytterhoeven
In the legacy case, led_dat->gpiod is initialized correctly, but overwritten later by template->gpiod, which is NULL, causing leds-gpio to fail with: gpiod_direction_output: invalid GPIO leds-gpio: probe of leds-gpio failed with error -22 Move the initialization of led_dat->gpiod from template->gpiod up, and always use led_dat->gpiod later, to fix this. Fixes: 5c51277a9ababfa4 (leds: leds-gpio: Add support for GPIO descriptors) Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit ec98a4975e66a3aa366cd227edab027b01adea37)
2015-12-26of: Make device nodes kobjects so they show up in sysfsGrant Likely
Device tree nodes are already treated as objects, and we already want to expose them to userspace which is done using the /proc filesystem today. Right now the kernel has to do a lot of work to keep the /proc view in sync with the in-kernel representation. If device_nodes are switched to be kobjects then the device tree code can be a whole lot simpler. It also turns out that switching to using /sysfs from /proc results in smaller code and data size, and the userspace ABI won't change if /proc/device-tree symlinks to /sys/firmware/devicetree/base. v7: Add missing sysfs_bin_attr_init() v6: Add __of_add_property() early init fixes from Pantelis v5: Rename firmware/ofw to firmware/devicetree Fix updating property values in sysfs v4: Fixed build error on Powerpc Fixed handling of dynamic nodes on powerpc v3: Fixed handling of duplicate attribute and child node names v2: switch to using sysfs bin_attributes which solve the problem of reporting incorrect property size. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David S. Miller <davem@davemloft.net> Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> (cherry picked from commit 75b57ecf9d1d1e17d099ab13b8f48e6e038676be)
2015-12-26Driver core: Unified interface for firmware node propertiesRafael J. Wysocki
Add new generic routines are provided for retrieving properties from device description objects in the platform firmware in case there are no struct device objects for them (either those objects have not been created yet or they do not exist at all). The following functions are provided: fwnode_property_present() fwnode_property_read_u8() fwnode_property_read_u16() fwnode_property_read_u32() fwnode_property_read_u64() fwnode_property_read_string() fwnode_property_read_u8_array() fwnode_property_read_u16_array() fwnode_property_read_u32_array() fwnode_property_read_u64_array() fwnode_property_read_string_array() in analogy with the corresponding functions for struct device added previously. For all of them, the first argument is a pointer to struct fwnode_handle (new type) that allows a device description object (depending on what platform firmware interface is in use) to be obtained. Add a new macro device_for_each_child_node() for iterating over the children of the device description object associated with a given device and a new function device_get_child_node_count() returning the number of a given device's child nodes. The interface covers both ACPI and Device Trees. Suggested-by: Grant Likely <grant.likely@linaro.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 8a0662d9ed2968e1186208336a8e1fab3fdfea63)
2015-12-26Driver core: Unified device properties interface for platform firmwareRafael J. Wysocki
Add a uniform interface by which device drivers can request device properties from the platform firmware by providing a property name and the corresponding data type. The purpose of it is to help to write portable code that won't depend on any particular platform firmware interface. The following general helper functions are added: device_property_present() device_property_read_u8() device_property_read_u16() device_property_read_u32() device_property_read_u64() device_property_read_string() device_property_read_u8_array() device_property_read_u16_array() device_property_read_u32_array() device_property_read_u64_array() device_property_read_string_array() The first one allows the caller to check if the given property is present. The next 5 of them allow single-valued properties of various types to be retrieved in a uniform way. The remaining 5 are for reading properties with multiple values (arrays of either numbers or strings). The interface covers both ACPI and Device Trees. This change set includes material from Mika Westerberg and Aaron Lu. Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit b31384fa5de37a100507751dfb5c0a49d06cee67)
2015-12-26leds: leds-gpio: Convert gpio_blink_set() to use GPIO descriptorsMika Westerberg
Commit 21f2aae91e902aad ("leds: leds-gpio: Add support for GPIO descriptors") already converted most of the driver to use GPIO descriptors. What is still missing is the platform specific hook gpio_blink_set() and board files which pass legacy GPIO numbers to this driver in platform data. In this patch we handle the former and convert gpio_blink_set() to take GPIO descriptor instead. In order to do this we convert the existing four users to accept GPIO descriptor and translate it to legacy GPIO number in the platform code. This effectively "pushes" legacy GPIO number usage from the driver to platforms. Also add comment to the remaining block describing that it is legacy code path and we are getting rid of it eventually. Suggested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit c673a2b4008103525a3cf21bedf15ffac37bfef0)
2015-12-26gpio / ACPI: Add support for _DSD device propertiesMika Westerberg
With release of ACPI 5.1 and _DSD method we can finally name GPIOs (and other things as well) returned by _CRS. Previously we were only able to use integer index to find the corresponding GPIO, which is pretty error prone if the order changes. With _DSD we can now query GPIOs using name instead of an integer index, like the below example shows: // Bluetooth device with reset and shutdown GPIOs Device (BTH) { Name (_HID, ...) Name (_CRS, ResourceTemplate () { GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionInputOnly, "\\_SB.GPO0", 0, ResourceConsumer) {15} GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionInputOnly, "\\_SB.GPO0", 0, ResourceConsumer) {27, 31} }) Name (_DSD, Package () { ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () {"reset-gpio", Package() {^BTH, 1, 1, 0 }}, Package () {"shutdown-gpio", Package() {^BTH, 0, 0, 0 }}, } }) } The format of the supported GPIO property is: Package () { "name", Package () { ref, index, pin, active_low }} ref - The device that has _CRS containing GpioIo()/GpioInt() resources, typically this is the device itself (BTH in our case). index - Index of the GpioIo()/GpioInt() resource in _CRS starting from zero. pin - Pin in the GpioIo()/GpioInt() resource. Typically this is zero. active_low - If 1 the GPIO is marked as active_low. Since ACPI GpioIo() resource does not have field saying whether it is active low or high, the "active_low" argument can be used here. Setting it to 1 marks the GPIO as active low. In our Bluetooth example the "reset-gpio" refers to the second GpioIo() resource, second pin in that resource with the GPIO number of 31. This patch implements necessary support to gpiolib for extracting GPIOs using _DSD device properties. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 0d9a693cc8619b28f0eeb689a554647d42848fde)
2015-12-26leds: leds-gpio: Make use of device property APIRafael J. Wysocki
Make use of device property API in this driver so that both OF and ACPI based system can use the same driver. This change contains material from Max Eliaser and Mika Westerberg. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Bryan Wu <cooloney@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit a43f2cbbb009f96231bbbe24ad4f824215dedb81)
2015-12-26leds: leds-gpio: Add support for GPIO descriptorsMika Westerberg
GPIO descriptors are the preferred way over legacy GPIO numbers nowadays. Convert the driver to use GPIO descriptors internally but still allow passing legacy GPIO numbers from platform data to support existing platforms. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Bryan Wu <cooloney@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 5c51277a9ababfa44a7f944100bdc9fbda139905)
2015-12-26input: gpio_keys_polled: Make use of device property APIAaron Lu
Make use of device property API in this driver so that both OF based system and ACPI based system can use this driver. Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit b26d4e2283b6d9b65bfe14b99c9c3a560e390a00)