summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-06compiler-gcc: disable -ftracer for __noclone functionstoradex_imx_3.10.17_1.0.0_ga-nextPaolo Bonzini
commit 95272c29378ee7dc15f43fa2758cb28a5913a06d upstream. -ftracer can duplicate asm blocks causing compilation to fail in noclone functions. For example, KVM declares a global variable in an asm like asm("2: ... \n .pushsection data \n .global vmx_return \n vmx_return: .long 2b"); and -ftracer causes a double declaration. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Marek <mmarek@suse.cz> Cc: stable@vger.kernel.org Cc: kvm@vger.kernel.org Reported-by: Linda Walsh <lkml@tlinx.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Willy Tarreau <w@1wt.eu> (cherry picked from commit 5d814ad8d35e5e23e0c27fb0f0b80c1044ecefad)
2019-05-06compiler-gcc: integrate the various compiler-gcc[345].h filesJoe Perches
commit cb984d101b30eb7478d32df56a0023e4603cba7f upstream. As gcc major version numbers are going to advance rather rapidly in the future, there's no real value in separate files for each compiler version. Deduplicate some of the macros #defined in each file too. Neaten comments using normal kernel commenting style. Signed-off-by: Joe Perches <joe@perches.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Michal Marek <mmarek@suse.cz> Cc: Segher Boessenkool <segher@kernel.crashing.org> Cc: Sasha Levin <levinsasha928@gmail.com> Cc: Anton Blanchard <anton@samba.org> Cc: Alan Modra <amodra@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> [ philm: backport to 3.10-stable ] Signed-off-by: Philip Müller <philm@manjaro.org> Signed-off-by: Willy Tarreau <w@1wt.eu> (cherry picked from commit a4a4f1cd733fe5b345db4e8cc19bb8868d562a8a)
2019-05-06ASoC: sgtl5000: Add on/off control for HP/LINE outOleksandr Suvorov
- adding mute/unmute controls for headphone and lineout allows alsa-compatible sound players automatically unmute output port to play music. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Fix leading and trailing popsOleksandr Suvorov
- increase trailing delay after VAG power down to reduce trailing pop; - mute HP/LINE output before VAG power up. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Fix setting power registersOleksandr Suvorov
- set VDDD voltage ONLY if use internal ldo regulator; - assign manually the source of charge pump ONLY if automatic selection can't perform. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Fix enabling ZCD for HP and ADCOleksandr Suvorov
- change HP_ZCD_EN/ADC_ZCD_EN bits only in CHIP_ANA_CTRL register. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Fix control of SMALL_POPOleksandr Suvorov
- define the SMALL_POP as a 1-bit mask, not value; - properly set the SMALL_POP on device probing. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Fix possible dereference crashOleksandr Suvorov
- ldo_regulator_remove() doesn't reset sgtl5000->ldo so it is possible to dereference members of previously freed struct ldo. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Name mux control correctlyOleksandr Suvorov
- Name headphone mux related data objects correctly. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: Don't fallback to ldo regulatorOleksandr Suvorov
- the code to fallback to internal ldo regulator instead of external vddd is completely wrong. According to TDM and Errata of sgtl5000 chips revision < 0x11 strongly need to use external vddd due to ER1. For chips revision >= 0x11 there is no limitation to use either external vddd or internal ldo regulator. - fix logical error in cleanup sequence. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-06ASoC: sgtl5000: prevent playback to be muted when terminating concurrent captureLothar Waßmann
commit f091f3f07328f75d20a2a5970d1f8b58d95fc990 upstream When a sound capture/playback is terminated while a playback/capture is running, power_vag_event() will clear SGTL5000_CHIP_ANA_POWER in the SND_SOC_DAPM_PRE_PMD event, thus muting the respective other channel. Don't clear SGTL5000_CHIP_ANA_POWER when both DAC and ADC are active to prevent this. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2015-10-22imx6qdl-apalis.dtsi: use correct function for CAM_MCLKMax Krummenacher
2015-09-04net: phy: consolidate PHY reset in phy_init_hw()Florian Fainelli
There are quite a lot of drivers touching a PHY device MII_BMCR register to reset the PHY without taking care of: 1) ensuring that BMCR_RESET is cleared after a given timeout 2) the PHY state machine resuming to the proper state and re-applying potentially changed settings such as auto-negotiation Introduce phy_poll_reset() which will take care of polling the MII_BMCR for the BMCR_RESET bit to be cleared after a given timeout or return a timeout error code. In order to make sure the PHY is in a correct state, phy_init_hw() first issues a software reset through MII_BMCR and then applies any fixups. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Conflicts: drivers/net/phy/phy.c (cherry picked from commit 87aa9f9c61ad56d505641681812e92ad976f8608) Two Apalis iMX6 with a direct Ethernet connection (no hub/no switch) do not detect a link. This backport fixes this.
2015-09-04mxc_lcdif.c: fix commentMax Krummenacher
copy/paste error in pixelclock frequency (cherry picked from commit 01055e28e5af1d5e309c9eeea19cf012f324dbe8)
2015-08-07imx6qdl-apalis.dtsi: ldb: fix ipu/di assignmentMax Krummenacher
If one wants to use the ldb with to seperate channels the second channel must not be configured for the same display interface as the first.
2015-08-07Apalis iMX6: add device tree for the Ixora boardMax Krummenacher
The Ixora carrier board is mostly a subset off what is on the evaluation board. The commits adds a device tree with the following changes to the eval board one: - I2C EEPROM added - LEDs through led sysfs interface added - MMC 8bit interface disabled - Reset line to PCIe switch and PCIe switch removed - Video DAC to Analog RGB output disabled - spidev on SPI2 removed - mipi camera support disabled/removed
2015-07-29Apalis/Colibri iMX6: defconfig: remove RT_GROUP_SCHEDMax Krummenacher
RT_GROUP_SCHED prevents process to change to a realtime scheduling policy without explicitely assigning a realtime budget to their CGROUP.
2015-07-27colibri-imx6: use stopmode for poweroffMax Krummenacher
After the system has been shutdown with PMIC_ON_REQ and VCC_BATT is supplied from a battery it will never restart either by RESET or power cycle. So use the PMIC_STBY_REQ after shutdown to switch of power rails.
2015-07-27apalis/colibri imx6 dtb: enable pmic driverMax Krummenacher
Enable the pfuze100-regulator driver in the device tree. The driver will be used in a later commit to fix powerdown on Colibri iMX6.
2015-07-23rtc-snvs.c: conditionally set pm_power_offMax Krummenacher
There is a hack to use the global pm_power_off callback to switch of power with the i.MX 6 PMIC_ON_REQ signal. If one uses another power off driver the callback was already taken by the rtc-snvs driver.
2015-07-23mach-imx6q.c: handle RESET_MOCI when PCIe is disabledMax Krummenacher
2015-07-23apalis imx6: remove weim driverMax Krummenacher
The WEIM signals are not accessible so remove the driver from the config and set it to disabled in the device tree.
2015-07-14mxc_hdmi.c: remove compiler warningMax Krummenacher
include/linux/moduleparam.h:338:45: warning: return from incompatible pointer type
2015-07-14mxc_hdmi: fix detect disconnect caseMax Krummenacher
The keepalive module variable allows to not go into a disconnected state. Fix the case when keepalive is set to go to disconnect. Add a precompiler directive which allows to only evaluate the HPD signal for HDMI monitor detection. Default is to react on the status bits for HPD and the TMDS signal line detection to detect an attached monitor. While at it cleanup parameter documentation and whitespace.
2015-07-07apalis/colibri imx6 dtb: add brightness settings for Fusion 7Max Krummenacher
The backlight driver TPS61165 used on our adapter for the Fusion 7 display requires a PWM frequency of 10KHz to work with all duty cycles. This adds the required settings inside #if 0 #endif. While at it unify the brightness steps.
2015-06-23caamalg: retry on dev_get_drvdata failureTroy Kisky
2015-06-23caamhash: wait for driver data availableTroy Kisky
2015-06-08OmniVision ov5640 MIPI-CSI2 camera supportWojciech Bieganski
gst-inspect mfw_v4lsrc gst-launch mfw_v4lsrc capture-mode=5 device=/dev/video2 ! mfw_v4lsink
2015-06-02colibri_imx6_defconfig: enable CONFIG_CAN_MCP251XMax Krummenacher
This adds the driver for the CAN controller MCP251x to the kernel. Refer to http://developer.toradex.com/knowledge-base/can-%28linux%29 for the required device tree changes.
2015-06-01can: mcp251x: Add device tree supportAlexander Shiyan
This patch adds Device Tree support to the Microchip MCP251X driver. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 66606aafd8cd6cffbefa463b27e1f16e793e40a9)
2015-06-01can: mcp251x: Convert to devm-* APIAlexander Shiyan
Replace existing resource handling in the driver with managed device resource, this ensures more consistent error values and simplifies error paths. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 21629e1a118402566dce08f26edf19954fecef32)
2015-06-01can: Fix FSF address in file headersJeff Kirsher
Several files refer to an old address for the Free Software Foundation in the file header comment. Resolve by replacing the address with the URL <http://www.gnu.org/licenses/> so that we do not have to keep updating the header comments anytime the address changes. CC: Wolfgang Grandegger <wg@grandegger.com> CC: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 05780d9808f72dc28a5c3602e11a7c53aef972ad)
2015-06-01can: mcp251x: use dev_get_platdata()Jingoo Han
Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. This is a cosmetic change to make the code simpler and enhance the readability. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 369566ef13c70ba368e370cf3df42df7ebc51e66)
2015-06-01can: mcp251x: Allow tuning SPI mode and limit maximal SPI speedAlexander Shiyan
Patch allow to use different mode settings for SPI (MODE3 for example) and limit maximal speed according to IC datasheet. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit b1ef05a5a20afe50d4188a5b59579bd140758cf0)
2015-06-01can: mcp251x: Eliminate irq_flags from driver platform_dataAlexander Shiyan
Flags is not used by boards, so remove this field from the driver platform_data. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit ae5d589e5f9f3217656ada632869968178886ac6)
2015-06-01can: mcp251x: Replace power callbacks with regulator APIAlexander Shiyan
This patch replaces power callbacks to the regulator API. To improve the readability of the code, helper for the regulator enable/disable was added. Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 1ddff7da0faecffdcdeab3d981fb8241453cea44)
2015-05-13dtb, i2c-imx.txt: fix typosColibri_iMX6_LinuxImageV2.4Beta1_20150518Apalis_iMX6_LinuxImageV2.4Beta1_20150518toradex_imx_3.10.17_1.0.0_gaMax Krummenacher
2015-05-13imx6qdl-apalis.dtsi: cleanup commentsMax Krummenacher
2015-04-27apalis_imx6_defconfig add generic PCIe SATA/AHCI driverMax Krummenacher
CONFIG_SATA_AHCI=m This allows to use PCIe cards with a SATA interface.
2015-04-23ARM: imx6: clk: i.MX6 DualLite/Solo i2c4 clockIain Paton
Compared to i.MX6 Quad/Dual the CCM_CCGR1 register in the i.MX6 Solo/DualLite replaces the ecspi5 clock with the i2c4 clock. Handle this difference using cpu_is_imx6dl(). Signed-off-by: Iain Paton <ipaton0@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com> (cherry picked from commit ee3387f97bea00f99add9efe2d2b29374a49af41)
2015-04-21ARM: 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>
2015-04-21fbcon: 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.
2015-04-16colibri_imx6: add initial camera/ACM device treeMax Krummenacher
2015-04-07Apalis iMX6: devicetree: fix CAM MCLKMax Krummenacher
2015-04-02imx6qdl-apalis.dtsi: set all fb default depths to 16bitMax Krummenacher
2015-04-02Apalis/Colibri iMX6: defconfig: add CIFS filesystemMax Krummenacher
2015-04-02Apalis/Colibri iMX6: defconfig: include MAX9526Max Krummenacher
2015-04-02imx6qdl-apalis-eval: rework ACM i2c devicesMax Krummenacher
2015-04-02max9526: 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.
2015-04-02adv7180.c: initial working adv7180 settingsMax Krummenacher
The input channel is currently fixed to A_IN2_3 on the ACM's connector X5.