summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2019-03-28ARM: 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-03-20imx6qdl-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-03-12ARM: 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-03-12ARM: 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-03-11ARM: 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-02-19ARM: 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-01-29apalis/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-01-17ARM: dts: imx6ull: let PHY clock muxed as clock during sleepPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2019-01-17ARM: 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-01-10imx6ull: 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>
2018-12-27ARM: 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)
2018-12-27ARM: 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)
2018-12-27ARM: 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)
2018-12-27colibri_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>
2018-12-24arm: 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>
2018-12-24colibri-imx7: defconfig: enable psci supportMarcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24apalis/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>
2018-12-24arm: 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>
2018-12-24ARM: 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)
2018-12-24ARM: 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)
2018-12-24ARM: 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>
2018-12-24ARM: 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>
2018-12-24ARM: 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>
2018-12-24ARM: 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>
2018-12-24ARM: 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>
2018-12-24imx6ull-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>
2018-12-24imx6qdl-apalis.dtsi: card detect pins: use pull up and hysteresisMax Krummenacher
The apalis has a 8 and 4 bit SD/MMC interface. Switch on a 100k pull up on the card detect pins for carrier boards which leave the pin floating. Switch on hysteresis in case the signal has slow rise or fall times. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24arm: dts: correct VDDA in SGTL5000 for imx6 modules.Gerard Salvatella
On imx6 the SGTL5000 audio codec supply voltage is 3.3V and not 2.5V as might have been copied over from other modules. Output is slightly overamplified if the value is not corrected, which may lead to signal clipping. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24ARM: dts: Coibri iMX6ULL: use wdog HW signal for resetMax Krummenacher
The i.MX6 ULL's watchdog is used to reset the SoC on reboot. The watchdog is configured to use the SoC's internal reset signal which does not generate a reset pulse on nRESET_OUT. Change the watchdog configuration to use a SoC external HW signal. This will additionally change the 'Reset cause' message from U-Boot from WDOG to POR. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24ARM: dts: imx6: mux SD/MMC CD and SPI CS explicitlyStefan Agner
Use a pinmux configuration for SD/MMC card detect and SPI chip select instead of relying on reset/boot settings. There have been no adverse effects observed, but it seems sensible to mux the pads explicitly. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24colibri-imx7: defconfig: enable sound simple card driverMax Krummenacher
The device tree got changed to use the simple card driver, so enable it in the defconfig. While at it remove the IMX_SGTL5000 driver now replaced by the simple card driver. While at it remove the unused ESAI driver. While at it remove the unused CS42XX8_I2C codec driver. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2018-12-24dts: imx: colibri eval/iris: change pins to capacitive touch adapterMax Krummenacher
The Capacitive Touch Adapter is an interface board designed to easily connect the Capacitive Touch Display 7" Parallel to the Colibri Carrier boards which do not have PCAP connector yet available on board. Change the pins for interrupt and reset to those defined in the Capacitive Touch Adapter's datasheet. While at it remove the '#ifdef PCAP' in favour of disabled nodes. That way one can fixup the device tree in U-Boot to disable the pwm nodes and enable the connected touch controller. e.g. for a Colibri iMX6S/DL: Colibri iMX6 # setenv fdt_fixup 'fdt addr ${fdt_addr_r} && fdt resize && fdt set /soc/aips-bus@02100000/i2c@021a8000/atmel_mxt_ts@4a status okay; fdt set /soc/aips-bus@02000000/pwm@02080000 status disabled; fdt set /soc/aips-bus@02000000/pwm@0208c000 status disabled' Colibri iMX6 # saveenv Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24dts: imx: fix M41T0 RTC compatible stringGerard Salvatella
Toradex Carrier boards use the ST M41T0 RTC (not M41T00). The RTC is almost the same, but the M41T0 needs some special handling in case the oscillator fails. Now that support for this difference is available, using the new compatible string to make use of it. Sync with commit 10e718b1c60c4e490e6972cfa58e97fcf5260685 Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24dts: add can-spi controllerGerard Salvatella
Synced with 558d378d522189ad68fcb00aff05fd134bf20924 Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24dts: update/add atmel mxtGerard Salvatella
Add mxt nodes to dts and gpio-reset functionality. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24dts: enable hdmi also on asterGerard Salvatella
Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24dts: synchronize snvs node pathGerard Salvatella
Synchronize with commit fcfdb9c32075501e64751cc6a79fd91d15933692 Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: dts: imx7-colibri: prepare module device tree for FlexCANStefan Agner
Prepare FlexCAN use on SODIMM 55/63. Those SODIMM pins are compatible for CAN bus use with several modules from the Colibri family. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: dts: imx6qdl: Fix SPDIF regressionFabio Estevam
Commit 833f2cbf7091 ("ARM: dts: imx6: change the core clock of spdif") changed many more clocks than only the SPDIF core clock as stated in the commit message. The MLB clock has been added and this causes SPDIF regression as reported by Xavi Drudis Ferran and also in this forum post: https://forum.digikey.com/thread/34240 The MX6Q Reference Manual does not mention that MLB is a clock related to SPDIF, so change it back to a dummy clock to restore SPDIF functionality. Thanks to Ambika for providing the fix at: https://community.nxp.com/thread/387131 Fixes: 833f2cbf7091 ("ARM: dts: imx6: change the core clock of spdif") Cc: <stable@vger.kernel.org> # 4.4.x Reported-by: Xavi Drudis Ferran <xdrudis@tinet.cat> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Xavi Drudis Ferran <xdrudis@tinet.cat> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit f065e9e4addd75c21bb976bb2558648bf4f61de6) This fix was correct, but overwritten by commit 833f2cbf7091099baee28136dc68678e974c0ac5. MLB (Media Local Bus) Clock is in fact not related to SPDIF according to the MX6Q Reference Manual. Tested playback and record on pulseaudio with 44.1kHz samples. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24arm: imx: gpc: do not poweroff M/F mix in suspendMax Krummenacher
The Colibri iMX6ULL 256MB crashes in resume if the M/F mix domain is powered down when suspending. With this workaround this does not happen. Crash looks as follows: root@colibri-imx6ull:~# echo +3 > /sys/class/rtc/rtc1/wakealarm; echo mem > /sys/power/state [ 52.800741] PM: Syncing filesystems ... done. [ 52.856715] Freezing user space processes ... (elapsed 0.001 seconds) done. [ 52.865669] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done. [ 52.875024] Suspending console(s) (use no_console_suspend to debug) [ 52.950638] PM: suspend of devices complete after 68.211 msecs [ 52.952506] PM: late suspend of devices complete after 1.835 msecs [ 52.954292] PM: noirq suspend of devices complete after 1.757 msecs [ 52.954300] Disabling non-boot CPUs ... [ 52.954307] Turn off M/F mix! [ 52.955663] PM: noirq resume of devices complete after 1.222 msecs [ 52.956767] imx-sdma 20ec000.sdma: loaded firmware 3.3 [ 52.957669] PM: early resume of devices complete after 1.411 msecs [ 52.959140] gpmi-nand 1806000.gpmi-nand: use legacy bch geometry [ 53.005653] Suspended for 2.907 seconds [ 53.012207] PM: resume of devices complete after 54.507 msecs [ 53.073751] Restarting tasks ... done. root@colibri-imx6ull:~# [ 55.049753] gpmi-nand 1806000.gpmi-nand: DMA timeout, last DMA :2 [ 55.056377] gpmi-nand 1806000.gpmi-nand: Show GPMI registers : [ 55.062835] gpmi-nand 1806000.gpmi-nand: offset 0x000 : 0x00000000 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24ARM: dts: imx: fix PCI bus dtc warningsRob Herring
dtc recently added PCI bus checks. Fix these warnings. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 3e1b857786f0d46a92b3a4d7878767883ed90bdc)
2018-12-24ARM: dts: imx6: add required RS-485 propertiesStefan Agner
To operate RS-485 on Toradex Carrier Boards a low active RTS signal is required. Furthermore, a low active RTS signal requires the receiver to be active (this seems to be a hardware limitation of the i.MX UART). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: dts: imx6ull-colibri-eval-v3: remove duplicate nodesStefan Agner
Remove duplicate nodes introduced with the move to L4.9.11 release. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24arm: dts: apalis imx6: fix mipi-csi2 gpio assignmentMax Krummenacher
The new Apalis iMX6 Mezzanine board allows access to the MIPI-CSI2 interface from the evaluation board. The current device tree has different GPIO pin assignments for the camera reset and power pins. Change the pin assignment to use Apalis GPIO1 for reset and Apalis GPIO2 for power down. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24arm: dts: apalis imx6: add timings for new 10 inch lvdsMax Krummenacher
Add timings for LTTD1280800101-L4WH-CT1 panel used in the new Capacitive Touch 10.1" LVDS display. Note that the color mapping is to be set as follows: fsl,data-mapping = "spwg"; fsl,data-width = <24>; Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24arm: dts: apalis imx6: add reset controller for atmel mxt multitouchMax Krummenacher
The Atmel maXTouch multitouch controller driver does not control the reset line connected to the chip. Use a GPIO reset controller node to release the reset line and make the controller work. Note that both the reset controller's and the mxt mutitouch controller's node are set to disabled. Either change this in the dtsi source or fix this from U-Boot if you use an Atmel maXTouch multitouch controller. setenv fdt_fixup 'fdt addr ${fdt_addr_r} && fdt set /soc/aips-bus@02100000/i2c@021a0000/atmel_mxt_ts@4a status okay && fdt set /mxt-reset status okay' Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2018-12-24ARM: imx: mach-imx7d: configure clock source per FEC instanceStefan Agner
Configure Ethernet clock source for each FEC instance individually. This allows to use different clock source setting for the two FEC controllers. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: imx: mach-imx7d: put external ethernet clock in error caseStefan Agner
Exit early in case General-Purpose Registers are missing. This makes sure that clock is always freed properly (clk_put). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: dts: imx7: add alias for Ethernet controllersStefan Agner
Add alias for Ethernet controllers. This allows code to determine id of controllers using of_alias_get_id. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-12-24ARM: dts: imx7-colibri: Specify cable detect as ID and VBUS pinMax Krummenacher
Commit 95c163471135 ("usb: chipidea: use of extcon framework to work for non OTG case") requires both pins to be specified (ID and VBUS pin) to work correctly. Fix the remaining dts. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>