summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-09ARM: dts: add recovery for I2C for iMX7toradex_4.9-2.3.x-imx-rebasedOleksandr Suvorov
- add recovery mode for applicable i2c buses for Colibri iMX7 module. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-09ARM: dts: add recovery mode for all I2C busesOleksandr Suvorov
- fix the name of pinctrl set for i2c2 recovery mode; - add recovery mode for applicable i2c buses for Apalis/Colibri iMX6Q/D/DL modules. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Related to: #49059
2019-05-09ARM: dts: imx6q: correct SDMA script type for spi5Oleksandr Suvorov
Commit 41ec065fc5841 fixes ecspi sdma script type for spi1-4 only. Commit df07101e1c4a2 sets wrong type of sdma script for SPI5. The workaroud sdma script NOT work in SPBA bus, so return back the correct sdma script type for spi5. Related to: #48675 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2019-05-09ARM: dts: colibri_imx6: fix mcp2515 labelsMarcel Ziswiler
I don't know where that mcp258x came from but it really is a mcp2515. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09imx6qdl-colibri.dtsi: UHS-I support for v1.1a hwIgor Opaniuk
Provide proper configuration for VGEN3, to make sure it's is always powered which allows that rail to be automatically switched to 1.8 volts for proper UHS-I operation. By default it's disabled. With UHS-I enabled: [ 104.153898] mmc1: new ultra high speed SDR104 SDHC card at address 59b4 [ 104.166202] mmcblk1: mmc1:59b4 USD00 15.0 GiB [ 104.173923] mmcblk1: p1 root@colibri-imx6:~# hdparm -t /dev/mmcblk1 /dev/mmcblk1: Timing buffered disk reads: 226 MB in 3.01 seconds = 75.01 MB/sec Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2019-05-09ARM: dts: Add sleep state to the sd-card pinsPhilippe Schenker
This commit adds a sleep state to the ixora devicetree. This prevents backfeeding when sending the module to any sleep state. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09net: can: flexcan: Add pinmuxing in runtime_supsendPhilippe Schenker
Due to the nature of CAN Tx/Rx pins have to be high when they are idle. After boot, CAN is put into runtime_suspend state. When using xceiver-supply in DT the power to the transceiver is turned off in this state. The Tx/Rx pins are then causing backfeeding. This patch adds selection of the sleep-state pins during runtime_suspend, so someone is able to define another muxing in this sate. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09ARM: dts: Add Apalis iMX6 Ixora v1.2Philippe Schenker
Copied v1.1 devicetree and adopted it for v1.2 of the Ixora board. Added the devicetree in the Makefile Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09ARM: dts: imx6: Add sleep state to can interfacesPhilippe Schenker
This patch prepares the devicetree for the new Ixora V1.2 where we are able to turn off the supply of the can transceiver. This implies to use a sleep state on transmission pins in order to prevent backfeeding. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09fbcon: fix showing of logo for hdmiTroy Kisky
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> (cherry picked from commit fec124e94eb25b97772907c1cf863a66556c0e3f) Related to #47541 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09logo: add fb_logos_freedTroy Kisky
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> (cherry picked from commit 71b7811f043799d8a1e6c978c3ebe57d2ab66a34) Related to #47541 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09mxc_ipuv3_fb: clear frame buffer when line length changesTroy Kisky
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> (cherry picked from commit 8a2973e535e27e6f3404b23535f393ac1dd3a3ab) Related to #47541 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09ARM: dts: imx6qdl-colibri: add phy to fecPhilippe Schenker
If someone wants to add settings to the phy it is necessary to actually add the phy. This commit includes micrel,led-mode that is set to the default value, prepared for someone who wants to change this. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09imx_thermal.c: Use new temperature trip point valuesPhilippe Schenker
Use the max. junction temperature read from fusing for critical shutdown temperature. Passive temperature is set 10C lower. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09apalis/colibri imx6/7/ull: defconfig: Add nf_filterPhilippe Schenker
For iptables filtering to work we need the NF_FILTER kernel module. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09ARM: dts: imx6ull: let PHY clock muxed as clock during sleepPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09ARM: dts: imx6ull: Add phy-supply to fecPhilippe Schenker
This adds the proper phy-supply to the fec. This supply is actually switched by a clock that is now properly stated. This adds the advantage to add a delay for that particular regulator that is needed. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09Regulator: Core: Add clock-enable to fixed-regulatorPhilippe Schenker
This adds the possibility to enable a fixed-regulator with a clock. Signed-off-by: <philippe.schenker@toradex.com>
2019-05-09Revert "mmc: sdhci-esdhc-imx: make sure runtime PM is suspended in system ↵Philippe Schenker
suspend" This reverts commit 7696e076a3f7616003e440389c6e86f0bb56a0e4. In 4.9-2.3.x of NXP BSP this commit is no longer needed. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09imx6ull: usdhc1: Add sleep state to cd-pinPhilippe Schenker
Add sleep state to the card-detect-pin. This is reducing the V_Batt current on internal RTC if the module is sent to poweroff. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09imx_thermal.c: Use old trip point values from BSP 2.7Philippe Schenker
In kernel upgrade from 4.1 -> 4.9 trip point values have been changed by NXP. These new values caused a lot of modules to critical shut-down during validation and verification. This commit changes the new imx_thermal.c code to use the old, well verified values. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 308edefe57c5c96fad196b6e65fa159857e969f3)
2019-05-09ARM: dts: imx6: add missing uart transceiver enable pinmuxPhilippe Schenker
This adds the enable-pin to uart2 that controls the transceiver for uart2/4. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 07a8f35650e711666cf42f4962792d87b3b39b09)
2019-05-09ARM: dts: imx6ull: improve can templatesMax Krummenacher
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan modes to imx6ull-colibri-eval-v3.dtsi where they belong. Note that this commit does not enable flexcan functionality, but rather eases the effort needed to do so. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 1865142fd6a9dff221ace05fcbd704b5d86523df)
2019-05-09phy: micrel: do not use power down modeStefan Agner
Some Micrel KSZ8041NL PHY chips exhibit continous RX errors after using the power down mode bit (0.11). If the PHY is taken out of power down mode in a certain temperature range, the PHY enters a weird state which leads to continously reporting RX errors. In that state, the MAC is not able to receive or send any Ethernet frames and the activity LED is constantly blinking. Since Linux is using the suspend callback when the interface is taken down, ending up in that state can easily happen during a normal startup. Micrel confirmed the issue, caused by abnormal clock recovery when using power down mode. Even the latest revision (A4, Revision ID 0x1513) seems to suffer that problem. Remove the suspend/resume callback to avoid using the power down mode completely. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit a76182f34d2963ee5dca3bc026cbddb44b19be7c)
2019-05-09net: phy-micrel: check return code in flp center functionMax Uvarov
Fix obvious typo that first return value is set but not checked. Signed-off-by: Max Uvarov <muvarov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit a0da456bbf95d2a9294799bb05c61bfb24736bb7) Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 5f0a65495d895df2be2ddd681662f877f1a05b7f)
2019-05-09ARM: dts: imx6ull: add sleep mode to fecPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit fb97f0b4043af52820cb4c2ca40fe855f8746e90)
2019-05-09Input: atmel_mxt_ts - fix reset-gpio for level based irqsSebastian Reichel
The current reset-gpio support triggers an interrupt storm on platforms using the maxtouch with level based interrupt. The Motorola Droid 4, which I used for some of the tests is not affected, since it uses a edge based interrupt. This change avoids the interrupt storm by enabling the device while its interrupt is disabled. Afterwards we wait 100ms. This is important for two reasons: The device is unresponsive for some time (~22ms for mxt224E) and the CHG (interrupt) line is not working properly for 100ms. We don't need to wait for any following interrupts, since the following mxt_initialize() checks for bootloader mode anyways. This fixes a boot issue on GE PPD (watchdog kills device due to interrupt storm) and does not cause regression on Motorola Droid 4. Fixes: f657b00df22e ("Input: atmel_mxt_ts - add support for reset line") Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit ca1cd36cef00260db6b35b32d863e0c580c0488d) (cherry picked from commit 6d7ffbea51c1f314a4435065147b36159169571f)
2019-05-09Revert "MLK-16769-5: mtd: gpmi-nand runtime pm code change"Marcel Ziswiler
This reverts commit 6df9c073cb10a0f10d2fc2bea28f8133b5a89a66. This fixes gpmi-nand being defunct on i.MX 6ULL and i.MX 7S/D just hanging the ubifs background task during DMA. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09Revert "MLK-18724-3 clk: imx7d: remove IMX7D_NAND_USDHC_BUS_ROOT_CLK out ↵Marcel Ziswiler
from clks_init_on[]" This reverts commit 04b647fe39e7b1f2ccbcde2e9eccc596b5f2b9da. This fixes eMMC on sdhci3 being defunct just erroring out with -110. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09colibri_imx7: make sure module supplies are always onMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-05-09arm: dts: apalis imx6/colibri imx6ull/imx7: fix input includeMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09colibri-imx7: defconfig: enable psci supportMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09apalis/colibri_imx6_defconfig: re-order kernel configurationsMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09arm: imx: fix handling power stuff without psciMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09ASoC: fsl_esai, fsl_spdif: fix DMA workaroundMarcel Ziswiler
This fixes commit 7511009a7642 ("MLK-15937-4: ASoC: fsl_spdif: Use DMA workaround for SPDIF"). Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09ARM: dts: imx6ull: fix pwm clockMax Krummenacher
All PWM clock instances have their clock gate. Add these consistently. Fixes freezing the kernel when one of these instances is used with IMX6UL_CLK_DUMMY as its clock source. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit cd5d7ba49df7918732915a31bfc0f72827bebc2c)
2019-05-09ARM: dts: imx6ull: include all needed definitionsMax Krummenacher
The file uses linux,keycode = <KEY_POWER>;, so include the header which defines KEY_POWER. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 479e0bae1ddfe3ec527634c241fadae558966323)
2019-05-09ASoC: sgtl5000: Allow LRCLK pad drive strength to be changedFabio Estevam
Introduce the "lrclk-strength" property to allow LRCLK pad drive strength to be changed via device tree. When running a stress playback loop test on a mx6dl wandboard channel swap can be noticed on about 10% of the times. While debugging this issue I noticed that when probing the SGTL5000 LRCLK pin with the scope the swap did not happen. After removing the probe the swap started to happen again. After changing the LRCLK pad drive strength to the maximum value the issue is gone. Same fix works on a mx6dl Colibri board as well. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 91dca475d4368bef170fe9b20bb2005b241cc4bc)
2019-05-09video: fbdev: mxsfb: honor native-modeStefan Agner
Honor the native-mode property by adding only that mode to the mode list. With that we loose the list of modes, but we currently don't make use of it anyway. Also, the mode list lacks the pixel clock polarity information since struct fb_videomode does not store this information. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 3cb3771edb98e2ae79a887368fc042b89456da7e)
2019-05-09video: mxsfb: simplify parsingStefan Agner
Use the timing count from the parsed struct display_timings instead of looping through the device tree again. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 65be28e2a2b3761d088b20c43994be97d74c342f)
2019-05-09video: fbdev: mxsfb: fix pixelclock polarityStefan Agner
The PIXDATA flags of the display_flags enum are controller centric, e.g. NEGEDGE means the controller shall drive the data signals on pixelclocks negative edge. However, the drivers flag is display centric: Sample the data on negative (falling) edge. Therefore, change the if statement to check for the POSEDGE flag (which is typically not set): Drive on positive edge => sample on negative edge Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 5652dc1ad78303fb246f050ba23c563319d823cf)
2019-05-09chipidea: make usb charger optionalMax Krummenacher
The USB charger functionality depends on functions provided by CONFIG_POWER_SUPPLY but this dependency is not forced through Kconfig. Don't compile the functionality in when CONFIG_POWER_SUPPLY is not set. This fixes linker errors of not found symbols. power_supply_changed power_supply_register power_supply_unregister Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit e23e2335dbc3ad604f65886b9b1373a586406b53)
2019-05-09tty: serial: imx: fix merge inconsistencyMarcel Ziswiler
Missing commit 688f897ddd96 ("Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into toradex_4.9-1.0.x-imx-next"). Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-05-09ARM: dts: imx6ull-colibri: reduce v_batt current in power offMax Krummenacher
Reduce the current drawn from VCC_BATT when the main power on the 3V3 pins to the module are switched off. This switches off SoC internal pull resistors which are provided on the module for TAMPER7 and TAMPER9 SoC pin and switches on a pull down instead of a pullup for the USBC_DET module pin (TAMPER2). Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09ARM: dts: imx7-colibri: disable HS400Stefan Agner
Force HS200 by masking bit 63 of the SDHCI capability register. The i.MX ESDHC driver uses SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400. With that the stack checks bit 63 to descide whether HS400 is available. Using sdhci-caps-mask allows to mask bit 63. The stack then selects HS200 as operating mode. This prevents rare communication errors with minimal effect on performance: sdhci-esdhc-imx 30b60000.usdhc: warning! HS400 strobe DLL status REF not lock! Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09mmc: sdhci: dt: Add device tree properties sdhci-caps and sdhci-caps-maskZach Brown
On some systems the sdhci capabilty register is incorrect for one reason or another. The sdhci-caps-mask property specifies which bits in the register are incorrect and should be turned off before using sdhci-caps to turn on bits. The sdhci-caps property specifies which bits should be turned on. Signed-off-by: Zach Brown <zach.brown@ni.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> (cherry picked from commit 426ad975237e880c5ecdc1b74f0a4c34b93d3e14)
2019-05-09ARM: dts: imx6: remove 1.8V regulatorStefan Agner
There is no fixed 1.8V regulator. VDDD is connected to the PMIC. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09ARM: dts: imx6ull-colibri-aster: Add support for Aster with Colibri iMX6ULLMax Krummenacher
Add support for Aster Carrier Board with Colibri iMX6ULL. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09ARM: dts: imx7-colibri: unify settings for FlexCANMax Krummenacher
The current Colibri iMX7 device tree are prepared for flexcan1 and flexcan2. However their settings are different and the integration is done to a different degree. Unify that. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2019-05-09imx6ull-colibri.dtsi: change touch i2c parametersMax Krummenacher
Switch on 22 kOhm pull ups and lower the I2C frequency to around 40kHz to get a more reliable communication. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>