summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-20colibri_imx7_defconfig: Add the UBIFS driverVerdin-iMX8MM_Console-Image_3.0b4.254-20200421Colibri-iMX8X_Console-Image_3.0b4.254-20200421Colibri-iMX7_Console-Image_3.0b4.254-20200421Colibri-iMX7-eMMC_Console-Image_3.0b4.254-20200421Colibri-iMX6_Console-Image_3.0b4.254-20200421Colibri-iMX6ULL_Console-Image_3.0b4.254-20200421Apalis-iMX8_Console-Image_3.0b4.254-20200421Apalis-iMX8X_Console-Image_3.0b4.254-20200421Apalis-iMX6_Console-Image_3.0b4.254-20200421Philippe Schenker
Fixes: d4d419f1b24e apalis/colibri_imx6/-imx6ull/_imx7/-imx8/8x_defconfig: config refresh 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: apalis/colibri-imx6/7/6ull: enable options for backportsOleksandr Suvorov
Enable WIRELESS_EXT and WEXT_PRIV options for the backported rtl81288eu driver. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-15ARM: apalis/colibri-imx6/7/6ull: disable wireless driversOleksandr Suvorov
Disabling all wireless drivers and cfg80211 module makes able to completely avoid interferences with backported drivers. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-15arm64: defconfig: enable options required for backportsOleksandr Suvorov
Enable WIRELESS_EXT and WEXT_PRIV options as needed for the backported rtl81288eu driver. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-15arm64: defconfig: disable wireless driversOleksandr Suvorov
Disabling all wireless drivers and cfg80211 module makes able to completely avoid interferences with backported drivers. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-15wireless: make wireless_ext and wext_priv storableOleksandr Suvorov
The config option WIRELESS_EXT and WEXT_PRIV use to build external drivers, such as backports. Make these options storable in config file to be able to set them independently. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@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-14arm64: apalis/colibri: defconfig: remove backported driversOleksandr Suvorov
There are some unstable drivers in the kernel. The stable versions of these drivers present in backported-5.4 package. Remove duplicated mwifiex_sdio and mwifiex_usb. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-14ARM: apalis/colibri: defconfig: remove backported driversOleksandr Suvorov
There are some unstable drivers in the kernel. The stable versions of these drivers present in backported-5.4 package. Remove unstable rtl8188eu, mwifiex_sdio, mwifiex_usb. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-09ARM64: dts: apalis-imx8x: fix can numberingPhilippe Schenker
Related-to: ELB-2684 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-04-07Revert "MLK-22713-1 dmaengine: sdma: drop dma_pool_alloc for BDs"Philippe Schenker
This reverts commit dc1f576a8423568cb16eb077f7406c08affec9ec. This patch breaks dma for HDMI-Audio. So reverting it. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Conflicts: drivers/dma/imx-sdma.c
2020-04-06Bluetooth: Fix possible NULL pointer dereferenceOleksandr Suvorov
Backport of the upstreamed and not merged patch [1]. It fixes the crash like [2]. If we disconnect a device before completing the connection, connection will no longer be available in connection list, thus conn will be NULL. [1] https://www.spinics.net/lists/linux-bluetooth/msg70764.html [2] [ 4960.112410] Unable to handle kernel NULL pointer dereference at virtual address 0000001a [ 4961.120795] Mem abort info: [ 4961.128933] Exception class = DABT (current EL), IL = 32 bits [ 4961.140189] SET = 0, FnV = 0 [ 4961.148719] EA = 0, S1PTW = 0 [ 4961.157065] Data abort info: [ 4961.165047] ISV = 0, ISS = 0x00000004 [ 4961.173975] CM = 0, WnR = 0 [ 4961.181934] user pgtable: 4k pages, 48-bit VAs, pgd = ffff80084f467000 [ 4961.193579] [000000000000001a] *pgd=0000000000000000 [ 4961.201942] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 4961.210271] Modules linked in: veth xt_nat xt_tcpudp ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 xt_addrtype iptable_filter ip_tables xt_conntrack x_tables nf_nat nf_conntrack libcrc32c br_netfilter bridge stp overlay crc32_ce crct10dif_ce mwifiex_pcie mwifiex cdc_acm galcore(O) [ 4961.255701] Process kworker/u13:0 (pid: 12632, stack limit = 0xffff00002e5e8000) [ 4961.268662] CPU: 3 PID: 12632 Comm: kworker/u13:0 Tainted: G O 4.14.159-4.0.0-devel+git.fff496c2a1bd #1 [ 4961.284881] Hardware name: Toradex Apalis iMX8QM/QP on Apalis Evaluation Board (DT) [ 4961.298330] Workqueue: hci0 hci_rx_work [ 4961.307903] task: ffff80084faa8d80 task.stack: ffff00002e5e8000 [ 4961.319611] PC is at hci_connect_le_scan_cleanup+0x14/0x128 [ 4961.330986] LR is at create_le_conn_complete+0xec/0x108 Signed-off-by: Thomas Gagneret <tgagneret@xxxxxxxxxxx> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-03arm64: defconfig: further config clean-upMarcel Ziswiler
Further clean-up modularising it some more. BTW: Changing BT_MRVL, BT_MRVL_SDIO, CFG80211 and MAC80211 to modules will make it co-exist with our latest backports efforts. Related-to: ELB-2388 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-04-03arm64: dts: verdin-imx8mm: 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. Related-to: ELB-2596 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-04-02ARM64: dts: colibri-imx8x: enable csi camera module 5mp ov5640Marcel Ziswiler
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@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-04-02apalis/colibri_imx6/-imx6ull/_imx7/-imx8/8x_defconfig: config refreshMarcel Ziswiler
Refresh kernel configs adding some more USB as well as PCIe options where applicable plus synchronise some more accross all modules. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2020-04-01ARM64: dts: apalis-imx8qxp: remove comments from bringupPhilippe Schenker
Some comments made it through. SPI is tested that it works and those comments are no longer necessary- Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-30ARM64: dts: verdin-imx8mm: Cap usdhc2 clock to 100mhzPhilippe Schenker
There is a hardware issue with the clock lines. It barely works with 200MHz with SD-Cards but not with SDIO cards. Therefore put a safe value in there until the hardware issue is resolved Related-to: ELB-1974 Related-to: HAR-3252 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-30ARM64: verdin-imx8mm: use both rxc and txc delay on the phyPhilippe Schenker
use of rgmii-id instead of rgmii to denote use of rxc and txc delay on the phy. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@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-30net: phy: micrel.c: add rgmii interface delay possibility to ksz9131Philippe Schenker
The KSZ9131 provides DLL controlled delays on RXC and TXC lines. This patch makes use of those delays. The information which delays should be enabled or disabled comes from the interface names, documented in ethernet-controller.yaml: rgmii: Disable RXC and TXC delays rgmii-id: Enable RXC and TXC delays rgmii-txid: Enable only TXC delay, disable RXC delay rgmii-rxid: Enable onlx RXC delay, disable TXC delay Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit bd734a742d5533fb9190ecd8cf25befc1f759a5b) Replace phy_modify_mmd with phy_read_mmd and phy_write_mmd. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-30Revert "ARM64: dts: verdin-imx8mm: Add rxc txc dll 2ns delay"Philippe Schenker
This reverts commit 118d904a302114b323e3464bceab64bfc26868e2. There is now a mainline solution for that. Drop this solution in favor of the upstream one. We will use "rgmii-id" tag now to declare that delays. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-30Revert "dt-bindings: micrel-ksz90x1: Add rxc-dll and txc-dll properties"Philippe Schenker
This reverts commit 4bdc5d8f4f1e6ec472074a6a4fc2e2061cdb1c8d. There is now a mainline solution for that. Drop this solution in favor of the upstream one. We will use "rgmii-id" tag now to declare that delays. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-30Revert "net: phy: micrel: Add KSZ9131 rxdll txdll bypass dt properties"Philippe Schenker
This reverts commit f49da0d7dbf67030f7e12a94fd18a7f1a0b845e0. There is now a mainline solution for that. Drop this solution in favor of the upstream one. We will use "rgmii-id" tag now to declare that delays. Related-to: ELB-2581 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-26ARM64: boot: dts: verdin-imx8mm: support non-wifi moduleOleksandr Suvorov
Add support of non-wifi Toradex Verdin iMX8MM module on the Development board. Related-to: ELB-2322 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-26ARM64: boot: dts: verdin-imx8mm: rename wifi dev configurationOleksandr Suvorov
Add the mark of wi-fi version of Toradex Verdin iMX8MM module to a devicetree file name. Related-to: ELB-2322 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-26ARM64: boot: dts: verdin-imx8mm: add board layerOleksandr Suvorov
Split the common devicetree file to two layers: - Toradex Verdin iMX8MM WB; - Toradex Verdin Development board. Related-to: ELB-2322 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-26ARM64: boot: dts: verdin-imx8mm: add wifi layerOleksandr Suvorov
Move the on-module Wi-Fi part of a Toradex Verdin iMX8MM module to a separate file. Related-to: ELB-2322 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-26ARM64: boot: dts: verdin-imx8mm: fix code formattingOleksandr Suvorov
Fix the minor code formatting issue. Related-to: ELB-2322 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-25arm64: defconfig: enable building backports-5.4Oleksandr Suvorov
The mwifiex Wi-Fi driver in kernel-4.14-2.3.x-imx works unstable. The same driver in backports-5.4 works well. Backports-5.4 requires the undocumented build option CRYPTO_HASH_INFO. This option is selected by enabled ASYMMETRIC_PUBLIC_KEY_SUBTYPE. This makes able to build and use the Wi-Fi driver mwifiex_sdio, that works stable unlike the original driver in 4.14-2.3.x-imx. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-25colibri imx6ull: defconfig: enable building backports-5.4Oleksandr Suvorov
The mwifiex Wi-Fi driver in kernel-4.14-2.3.x-imx works unstable. The same driver in backports-5.4 works well. Backports-5.4 requires the undocumented build option CRYPTO_HASH_INFO. This option is selected by enabled ASYMMETRIC_PUBLIC_KEY_SUBTYPE. This makes able to build and use the Wi-Fi driver mwifiex_sdio, that works stable unlike the original driver in 4.14-2.3.x-imx. Related-to: ELB-2388 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
2020-03-23hwmon: (sht3x) add devicetree supportWojciech Slenska
Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Signed-off-by: Stefan Agner <stefan.agner@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-18ARM: dts: verdin-imx8mm: Change naming to contain WBPhilippe Schenker
Related-to: ELB-2316 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-16ARM64: dts: colibri-imx8x: enable dpu g2d also for lcdif dtbMax Krummenacher
The dprX_channelY, pixel-combiner and prgX nodes need to be enabled to use the g2d functionality. Thus move those nodes into the common fsl-imx8qxp-colibri-eval-v3.dtsi, so that fsl-imx8qxp-colibri-eval-v3.dts also gets them enabled. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-12ARM64: boot: dts: verdin-imx8mm: add ctrl_wake1_micoMax Krummenacher
Add CTRL_WAKE1_MICO# as a wakeup source. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2020-03-11rtc: ds1307: add OF and ACPI entries for Epson RX8130Bastian Stender
Make Epson RX8130 device tree and ACPI aware. Fixes: ee0981be7704 ("rtc: ds1307: Add support for Epson RX8130CE") Signed-off-by: Bastian Stender <bst@pengutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> (cherry picked from commit 47dd47292828a552d62d0e68b7cd6bdc99d9e0aa)
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-09ARM64: boot: dts: verdin-imx8mm: Remove unsupported rgmii dly from fecPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09ARM64: boot: dts: apalis-imx8qm: Correct comment from 3.3V to 1.8VPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09ARM64: dts: verdin-imx8mm: Add rxc txc dll 2ns delayPhilippe Schenker
This patch enables both RXC and TXC 2ns dll delay lines on the KSZ9131 PHY. Both are neede because the i.MX8MM SoC is RGMII v1.3 compliant. This means we need the TXC delay of the PHY. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09dt-bindings: micrel-ksz90x1: Add rxc-dll and txc-dll propertiesPhilippe Schenker
This commit adds two properties to control the RX DLL and TX DLL 2ns delay on RXC/TXC RGMII clock lines. This is especially needed if the MAC does not provide TXC delay by itself. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09net: phy: micrel: Add KSZ9131 rxdll txdll bypass dt propertiesPhilippe Schenker
With this patch one is able to control the rx dll and tx dll bypass bits, hence the 2ns delay on rxc and txc lines in devicetree. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09ARM64: dts: apalis-imx8qm-v1.1: Remove RXC delay in MACPhilippe Schenker
The RXC delay is provided in both PHYs used (KSZ9031 and KSZ9131) on the PHY itself so it is not needed on the MAC. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09ARM: mach-imx6q: add ksz9131rn_phy_fixupPhilippe Schenker
The MAC of the i.MX6 SoC is compliant with RGMII v1.3. The KSZ9131 PHY is like KSZ9031 adhering to RGMII v2.0 specification. This means the MAC should provide a delay to the TXC line. Because the i.MX6 MAC does not provide this delay this has to be done in the PHY. This patch adds by default ~1.4ns delay to the TXC line. This should be good for all boards that have all RGMII signals routed with the same length. The KSZ9131 has relatively high tolerances on skew registers from MMD 2.4 to MMD 2.8. Therefore the new DLL-based delay of 2ns is used and then as little as possibly subtracted from that so we get more accurate delay. This is actually needed because the i.MX6 SoC has an asyn skew on TXC from -100ps to 900ps. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09dt-bindings: net: add support for Microchip KSZ9131Yuiko Oshino
Add support for Microchip Technology KSZ9131 10/100/1000 Ethernet PHY Signed-off-by: Yuiko Oshino <yuiko.oshino@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit bff5b4b3737219195ca0caef4ff7884303cb5dc1) Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09net: phy: micrel: add Microchip KSZ9131 initial driverYuiko Oshino
Add support for Microchip Technology KSZ9131 10/100/1000 Ethernet PHY Signed-off-by: Yuiko Oshino <yuiko.oshino@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit bff5b4b3737219195ca0caef4ff7884303cb5dc1) Backport: Added the line: '.config_aneg = genphy_config_aneg,' to KSZ9131 data structure Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
2020-03-09perf: Make perf able to build with latest libbfdChangbin Du
libbfd has changed the bfd_section_* macros to inline functions bfd_section_<field> since 2019-09-18. See below two commits: o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html This fix make perf able to build with both old and new libbfd. Signed-off-by: Changbin Du <changbin.du@gmail.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> (cherry picked from commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015)