summaryrefslogtreecommitdiff
path: root/arch/arm/boot
AgeCommit message (Collapse)Author
2021-03-19ARM: dts: apalis/colibri-imx6: standby pmic on powerofftoradex_4.14-2.3.x-imxOleksandr Suvorov
There is a new property to work around the bug of PMIC PF0100. This property turns the pmic into the standby mode on power down the system, that leads to turn off all power rails. In this mode the power consumption is around 2 mA. Related-to: ELB-3580 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> (cherry-picked from commit 36c91bbb3ff44beccc48a6e833d2b61e89affeb5)
2020-09-18Merge remote-tracking branch 'remotes/codeaurora/imx_4.14.98_2.3.0' into ↵Marcel Ziswiler
toradex_4.14-2.3.x-imx
2020-07-12MLK-24390 ARM: dts: Add the missing wifi dts file for imx6ulz lite evkJacky Bai
The dts file for WIFI support on i.MX6ULZ Lite is missed, so add it. Signed-off-by: Jacky Bai <ping.bai@nxp.com> Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
2020-07-10MLK-24388: ARM: dts: Add more dts for imx6ulz liteJacky Bai
Add btwifi dts support for i.MX6ULZ Lite. Signed-off-by: Jacky Bai <ping.bai@nxp.com> Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
2020-07-01MLK-24359 ARM: dts: Add the i.MX6ULZ Lite EVK board supportJacky Bai
The i.MX6ULZ Lite is full compatible with i.MX6ULL/ULZ, and only support 9x9 package. Signed-off-by: Jacky Bai <ping.bai@nxp.com> Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
2020-06-18ARM: dts: imx6ull-colibri: add gpio-line-namesMax Krummenacher
Add GPIO line names on module level. Those are all GPIOs which a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board level device tree. Related-to: ELB-2794 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-05-28ARM: dts: imx6-apalis: add gpio-line-namesMax Krummenacher
Add GPIO line names on module level. Those are all GPIOs which a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board level device tree. Related-to: ELB-2525 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 5ca35c3842c88bed48fdbf79dbaa326c5c085af1)
2020-05-28ARM: dts: imx6-colibri: add gpio-line-namesOleksandr Suvorov
Add GPIO line names on module level. Those are all GPIOs which a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board level device tree. Related-to: ELB-2524 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> (cherry picked from commit d6133247f87fc07ca917df7dcf12bbd33f9bdafd) squashed fixup: (cherry picked from commit 0e0c71ae67dab11b0acdf19529420c65043c30b0) Conflicts: arch/arm/boot/dts/imx6qdl-colibri.dtsi
2020-05-07ARM: dts: imx7-colibri: add gpio-line-namesStefan Agner
Add Colibri SODIMM numbers as GPIO line names on module level. The GPIO lines with a name are all available on the SODIMM edge connector of the Colibri iMX7 module and therefore a customer might use it as a GPIO. The Toradex Evaluation Board has the SODIMM numbers printed on the silk- screen. This allows a customer to quickly control a GPIO on a pin-header by using the name printed next to it. Putting the GPIO line name on module level makes sure that a customer gets a reasonable default. If more meaningful names are available on a custom carrier board, the user can overwrite the line names in a carrier board level device tree. The eMMC based modules share all GPIO names except two GPIOs on bank 6 which are not available on the raw NAND devices. Hence overwrite GPIO line names of bank 6 in the eMMC specific device tree file. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> (cherry picked from commit 119c98f16e704e4c85522f6e22c9c819c21c4128) Related-to: ELB-2309 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-04-17ARM: dts: apalis-imx6qdl: disable hdmi audio on module levelMarcel Ziswiler
Implicitly disable HDMI audio on the module level as it is disabled by default in imx6qdl.dtsi. It can be enabled on the carrier board level (e.g. imx6q-apalis-eval.dts, imx6q-apalis-ixora.dts, imx6q-apalis-ixora-v1.1.dts or imx6q-apalis-ixora-v1.2.dts) if required. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-04-15ARM: dts: colibri-imx6ull: Use pull-down for adc pinsPhilippe Schenker
As suggested by the reference manual in a note in chapter 13.2 this commit disables the keeper and enables a 100k pull-down on the adc pins. Related-to: ELB-2690 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-04-02ARM: dts: imx6ull: enable async interrupts for sdioOleksandr Suvorov
The driver mwifiex_sdio stucks after the wifi firmware crash. Enabling asynchronous interrupts processing in sdio driver fixes this issue and allows the mwifiex_sdio driver to be reloaded and continue operates successfully. Works better with the driver from the backported-5.4 package. Related-to: ELB-2596 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-30ARM: dts: apalis-imx6qdl: use rgmii-id instead of rgmiiPhilippe Schenker
Until now a PHY-fixup in mach-imx set our rgmii timing correctly. For the PHY KSZ9131 there is no PHY-fixup in mach-imx. To support this PHY too, use rgmii-id. For the now used KSZ9031 nothing will change, as rgmii-id is only implemented and supported by the KSZ9131. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 1b68480b945e51ba879496d3f9ff5a5addd82007) We have a PHY-fixup in our downstream Linux. However this patch makes anyway sense to apply as it documents the rgmii mode properly and won't brake anything. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-23ARM: dts: colibri_imx6: fix analogue camera adapter detectionMarcel Ziswiler
Out-of-the-box the analogue camera adapter fails detecting with the following error: [ 6.503046] adv7280 2-0021: adv7280_probe:Analog Device adv7280 not detected -6! Unfortunately, the camera seems to be held in reset due to the BL_ON pin not being serviced. Fix this by hogging the camera_nreset aka BL_ON pin to output high. Related-to: ELB-2580 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-03-11ARM: 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> (cherry picked from commit 58e5313d36b969029d76b1ef45d3224c8557af75)
2020-03-09ARM: dts: imx7-colibri: Fix frequency for eMMCOleksandr Suvorov
eMMC, used in Colibri iMX7D eMMC modules, supports 200Mhz mode with vccq=1.8v. Remove the max-frequency limit, it increases the performance significantly: == before fix ==== root@colibri-imx7-emmc:~# hdparm -t /dev/mmcblk1 /dev/mmcblk1: Timing buffered disk reads: `^H252 MB in 3.02 seconds = 83.54 MB/sec ================== === after fix ==== root@colibri-imx7-emmc:~# hdparm -t /dev/mmcblk0 /dev/mmcblk0: Timing buffered disk reads: 408 MB in 3.00 seconds = 135.94 MB/sec ================== Related-to: ELB-1442 Fixes: f928a4a377e4 ("ARM: dts: imx7: add Toradex Colibri iMX7D 1GB (eMMC) support") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-09ARM: dts: imx6q-apalis: Fix pin nameOleksandr Suvorov
The interface of Apalis modules is MXM3, not SODIMM. Just fix the name of the reset touch pin. Fixes: 96458caa3562 ("ARM: dts: imx6: Add touchscreens used on Toradex eval boards") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-09Merge remote-tracking branch 'fslc/4.14-2.3.x-imx' into toradex_4.14-2.3.x-imxMarcel Ziswiler
Conflicts: arch/arm64/boot/dts/freescale/Makefile arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
2020-03-08Merge tag 'v4.14.170' into 4.14-2.3.x-imxMarcel Ziswiler
This is the 4.14.170 stable release Conflicts: drivers/net/phy/phy_device.c drivers/tty/serial/imx.c include/linux/platform_data/dma-imx-sdma.h net/wireless/util.c
2020-02-12ARM: dts: colibri-imx6ull: make use of new compatiblePhilippe Schenker
There is now a mainline variant for a regulator-fixed to be enabled by a clock. Make use of this newly cherry-picked mainline feature. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: colibri-imx6ull: pad_gpio1_io03: remove reserved bitsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: colibri-imx6ull: correct wrong pinmuxing and add commentsPhilippe Schenker
Some pinmuxings are obviously wrong, originating from a copy/paste error. This patch corrects that with the following strategy: - Set all reserved bits to zero - Leave drive strength and slew rate as is - Add sensible pull and hysteresis depending on the function of the pin - Not used pins are muxed to their reset-value defined by the SoC Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: rename vqmmc regulatorMax Krummenacher
Cosmetic change: Rename the reg_sd1_vmmc to reg_sd1_vqmmc as it is used for vqmmc. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: use mmc sleep state alwaysMax Krummenacher
The mmc pins sleep state has been added for the UHS1 speed case only, add it also to the regular case. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: fix vqmmc regulatorMax Krummenacher
The correct spelling for the property is gpios, otherwise the regulator will neither reserve nor control any gpio(s). Thus any SD/MMC card which can use UHS 1 modes will fail. Related-to: #46566 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6q: follow addition of sata_ext clkMax Krummenacher
Commit f014b5b3b3ab added an additional clock to ahci_imx.c used on i.MX8. Add a dummy clock to imx6q.dtsi so that i.MX6 which doesn't need the clock the driver keeps working. Fixes: [ 2.053942] ahci-imx 2200000.sata: can't get sata_ext clock. [ 2.053962] ahci-imx: probe of 2200000.sata failed with error -2 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-12ARM: dts: imx6ull-colibri: add group to iomuxc to suppress warningPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6-ixora: fix missing includesPhilippe Schenker
Fixes: commit: 5d2a26667010640e33ca0a52c73310f158179711 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: (apalis|colibri): unify backlight settingsPhilippe Schenker
This commit unifys the backlight settings. All displays sold by Toradex are now supporting 150Hz as a PWM backlight typical frequency. Use this value for all SoM's and put also some better default values for different brightness. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: toradex: fix i2c gpios flagsOleksandr Suvorov
According to manual of I2C bus, both signals sda/scl are "open drain". Fix flags for all affected Toradex boards. Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12arm: dts: colibri_imx7: fix flags for gpio signals of i2cOleksandr Suvorov
scl-gpios should be (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN) since commit d2d0ad2aec4a ("i2c: imx: use open drain for recovery GPIO") Fix on-boot warning: "enforced open drain please flag it properly in DT/ACPI DSDT/board file" Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-02-12ARM: dts: Add initial Iris devicetreesPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6qdl-colibri: Correct usdhc1Philippe Schenker
Usdhc1 had wrong stuff in it due to the merge request. Fix that Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts: imx6/7-colibri: switch dr_mode to otgPhilippe Schenker
In order for the otg ports, that these modules support, it is needed that dr_mode is on otg. Switch to use that feature. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-12ARM: dts (ds): sort iomuxc entries as downstream linux expectsPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-11arm: dts: colibri_imx7: fix gpio-keysMarcel Ziswiler
Avoid the following spew: [ 2.083946] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin MX7D_PAD_GPIO1_IO01 already requested by 302c0000.iomuxc-lpsr; cannot claim for gpio-keys [ 2.099682] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin-1 (gpio-keys) status -22 [ 2.108272] imx7d-pinctrl 302c0000.iomuxc-lpsr: could not request pin 1 (MX7D_PAD_GPIO1_IO01) from group gpiokeysgrp on device 302c0000.iomuxc-lpsr [ 2.124626] gpio-keys gpio-keys: Error applying setting, reverse things back [ 2.133420] gpio-keys: probe of gpio-keys failed with error -22 While at it also fix some missing new lines. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-09ARM: dts: apalis_imx6: further clean-upMarcel Ziswiler
Further clean-up Apalis iMX6 device trees. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri-aster: Follow pinctrl naming from mainlineMax Krummenacher
While at it, add the dtbs for Aster Carrier Board to the Makefile. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: dts: imx6ull-colibri: add missing #endifMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-02-09ARM: dts (ds): imx6ull*colibri*: Merge changes from 4.9-2.3.x-imx-nextPhilippe Schenker
In 4.14 devicetress are based on the mainline DT's and only necessary stuff for downstream is put into those devicetrees. This commit holds the changes for imx6ull*colibri* from 4.9. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts (ds): imx6: Merge changes from toradex_4.9-2.3.x-imx-nextPhilippe Schenker
In 4.14 devicetress are based on the mainline DT's and only necessary stuff for downstream is put into those devicetrees. This commit holds the changes for imx6*(colibri|apalis)* from 4.9. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: apalis-imx6: Add mipi_csi nodePhilippe Schenker
This commit adds the mipi_csi node to Toradex's evalboard as found on the mezzanine connector Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: apalis-imx6: Add some example I2C devicesPhilippe Schenker
Those devices are used in conjunction with Toradex's carrier boards. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval boardPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-09ARM: dts: imx6: Add touchscreens used on Toradex eval boardsPhilippe Schenker
This commit adds the touchscreens from Toradex so one can enable it. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-02-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 (cherry picked from commit 1501883b4682178e38afc3f08b221f9477fcd7ae)
2020-02-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> (cherry picked from commit c1016f5da0dbb8291575949e7f4a417c6306d70a)
2020-02-09ARM: dts: imx6qdl-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> (cherry-picked from 7ffa92d64cc7a6331faaae3e2507458461ab90f3)
2020-02-09ARM: dts: imx6qdl-colibri: add phy to fecPhilippe Schenker
Add the phy-node and mdio bus to the fec-node, represented as is on hardware. 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> (cherry-picked from 03ff3610434d89fc8e20b280e1219ce0ebb08935)
2020-02-09ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxcPhilippe Schenker
This adds the muxing for the optional pins usb-oc (overcurrent) and usb-id. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>