summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2017-12-28colibri_imx6ull/imx7_defconfig: disable regulator debugColibri-iMX7_LXDE-Image_2.8b1.64-20171229Colibri-iMX6_LXDE-Image_2.8b1.64-20171229Colibri-iMX6ULL_LXDE-Image_2.8b1.64-20171229Apalis-iMX6_LXDE-Image_2.8b1.64-20171229Stefan Agner
Disable regulator framework debug messages by default again. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-22apalis/colibri_imx6/imx6ull/imx7_defconfig: add ecdh and leds_triggerDominik Sliwa
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21arm: dts: imx6dl/imx6ull/imx7-colibri-eval-v3: fix mcp251x commentMarcel Ziswiler
There is no such thing as mpc258x but it is rather called mcp251x. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-12-21colibri_imx6ull/imx7_defconfig: disable regulator debugStefan Agner
Disable regulator framework debug messages by default. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into ↵Stefan Agner
toradex_4.9-1.0.x-imx-next
2017-12-21Merge tag 'v4.9.67' into 4.9-1.0.x-imx-fixes-stable-mergeMarcel Ziswiler
This is the 4.9.67 stable release Resolved conflicts: arch/arm/boot/dts/imx6sx-sdb.dts drivers/dma/imx-sdma.c drivers/mmc/core/host.c drivers/usb/chipidea/otg.c sound/soc/fsl/fsl_ssi.c This merge also reverts commit 3a654a85932f ("dmaengine: imx-sdma - correct the dma transfer residue calculation"). The downstream kernel seems to use different structures and already use buf_ptail in its calculation.
2017-12-21Merge remote-tracking branch 'linux-fslc/4.9-1.0.x-imx' into ↵Marcel Ziswiler
toradex_4.9-1.0.x-imx-next
2017-12-21ARM: 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> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 4bc835895a461a17387b52a8229a4b7a4a52d982)
2017-12-21ARM: dts: imx7-colibri: fix MCP2515 node label and nameMax Krummenacher
Use common convention where label is using the device model number and the node name is using a generic device type. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: colibri-imx7: limit eMMC SDHC frequency to 100MHzStefan Agner
During temperature testing modules print the following error every now and then: [ 12.231006] mmc0: Timeout waiting for hardware interrupt. retries left=0 opcode=12 Often the SDHC controller/driver does not recover from the issue which leads to a Kernel panic (e.g. during boot the kernel can not mount the root fs). Lowering the frequency to 100MHz proves to be stable and affects effective bandwith by less than 5%. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 166fb4842e780f63c31622af706335e7dcd48c24)
2017-12-21ARM: dts: imx7-colibri: fix 1.8V/UHS supportStefan Agner
Add pinmuxing and do not specify voltage restrictions in the module level device tree. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: imx7-colibri: fix iomuxc definitionsMax Krummenacher
- don't group pingroups with an additional node inside iomuxc. - only mux BL_ON once. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21arm: dts: imx6: apalis: follow rename of ssi-controller to cpu-daiMax Krummenacher
With commit 1e6580d1714b6686766f105bf9125537443eeea7 the phandle referencing the digital audio interface has been renamed. Follow that. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: imx6: forward port downstream apalis / ixora combinationMax Krummenacher
Forward port the device tree sources for the Apalis iMX6 / Ixora module - carrier combination from the downstream toradex_4.1-2.0.x-imx branch. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: imx6qdl-apalis: Split pinctrl for usdhc1 to support 4 and 8 bitSanchayan Maity
Split the pinctrl property for usdhc1 into a 4bit SD interface and an extension to 8bit. This is required to support the 8 bit MMC interface on the Evaluation Board for usdhc1 and the 4 bit SD interface on Ixora V1.1 for usdhc1. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 42f45b7516eb2ce24f122382c49c2f63a6763292) Conflicts: arch/arm/boot/dts/imx6qdl-apalis.dtsi
2017-12-21ARM: dts: imx6: apalis: introduce defines for common pad ctrlsMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21arm: dts: imx6ull: add support for PWM polarity controlMax Krummenacher
Update #pwm-cells to 3 in order to support PWM signal polarity control. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 6863695b931ae31fe20171e75cf8a57c990873be)
2017-12-21arm: dts: apalis imx6: add 3rd pwms parameterMax Krummenacher
The imx pwm driver now support output inversion with a 3rd parameter. While at it move the backlight pwm settings into the carrier board file were it belongs. Period and polarity are carrier board / display dependent. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21arm: dts: apalis/colibri qdl: add 3rd pwm parameter to specify pos. neg. logicMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit d1c393ddcb6937b58fa3a9314c8b6f2382b346dc)
2017-12-21ARM: dts: imx6ull: improve clock accuracy for SD High SpeedStefan Agner
The High Speed SD interface requires a clock of 50MHz. Using a base clock of 198MHz allows for a more accurate clock than using 132MHz base clock. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21apalis/colibri_imx6/imx6ull/imx7_defconfig: enable user debugStefan Agner
Let the kernel print some debug messages when a user program crashes due to an exception. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: imx6: Apalis imx6, force PCIE GEN1 speedMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21colibri-imx6ull_defconfig: add Colibri iMX6ULL defconfigStefan Agner
Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21colibri_imx7_defconfig: add Colibri iMX7 defconfigStefan Agner
Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: imx: gpc: Fix undefined references when using GPCv2Stefan Agner
When compiling a kernel with only GPCv2 support (e.g. only for i.MX 7) linking fails with the following errors: arch/arm/mach-imx/built-in.o: In function `imx_anatop_pre_suspend': platform-imx-dma.c:(.text+0xf50): undefined reference to `imx_gpc_usb_wakeup_enabled' platform-imx-dma.c:(.text+0xf5c): undefined reference to `imx_gpc_enet_wakeup_enabled' arch/arm/mach-imx/built-in.o: In function `imx_anatop_post_resume': platform-imx-dma.c:(.text+0x10cc): undefined reference to `imx_gpc_usb_wakeup_enabled' platform-imx-dma.c:(.text+0x10d8): undefined reference to `imx_gpc_enet_wakeup_enabled' Make sure the function exist even if GPC(v1) is not compiled in. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21apalis_imx6_defconfig: add Apalis iMX6 defconfigStefan Agner
Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21colibri_imx6_defconfig: add Colibri iMX6 defconfigStefan Agner
Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21ARM: dts: imx7-colibri: add atmel mxt multitouch controllerBhuvanchandra DV
Add atmel mxt multitouch controller driver which is interfaced over I2C bus. This controller is used by the Logic Technologies, Capacitive Touch Display 7" Parallel (LT161010-2NHC). Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit f5f290716a30ec627a90227a2864b6745fa78150)
2017-12-21ARM: dts: colibri-imx7: add new gpio hog grpBhuvanchandra DV
Add new gpio hog group for atmel mxt ts GPIOs. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit e747c0e955869e5cb6d9ea4da9477895901dbc92)
2017-12-21ARM: dts: imx6ull: Add Colibri iMX6ULL device treesStefan Agner
Initial add of Colibri iMX6ULL device trees, copied and adopted from the Toradex toradex_4.1-2.0.x-imx branch. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21imx6ull.dtsi: 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> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit d96c255841fdb49adcb91ebc44a45a104cad7755)
2017-12-21imx: Fix 'Expose SoC unique ID' for newer i.MX6Max Krummenacher
i.MX6 SL/UL/ULL use a different node in the device tree for with ocotp. So change to the relevant compatible string for these SoCs. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 7b02a99744e495f630bdb5081c516d40e8112685)
2017-12-21ARM: dts: imx7-colibri: add Colibri iMX7 Dual 1GB (eMMC)Stefan Agner
Add support for the latest addition to the Colibri iMX7 familiy, Colibri iMX7 Dual 1GB with eMMC storage. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a2dcace21887235f2f0b397aca11c17c7762e22a)
2017-12-21ARM: dts: imx7-colibri-aster: Add support for Aster with Colibri iMX7Sanchayan Maity
Add support for Aster Carrier Board with Colibri iMX7. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 46713ddc870f77064b5a05f522fc7e1fdb635fc7)
2017-12-21ARM: dts: imx7-colibri: rename USB host regulatorStefan Agner
Some carrier boards use the USB VBUS regulator for both USB DR controllers. Hence the reference to the OTG2 instance is confusing. Rename the pinctrl and regulator to "usbh". Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21busfreq-imx: only use existing global variablesMax Krummenacher
The struct arm_reg and soc_reg are declared in by a extern statement in include/linux/busfreq-imx.h. However they are only declared when imx6-cpufreq.c is compiled and linked. Qualify the use of arm_reg and soc_reg with the relevant config option and change KConfig to switch that option on for the SoCs which use it. This fixes the following build issue when building for i.MX 7 with option ARM_IMX6Q_CPUFREQ not set: arch/arm/mach-imx/built-in.o: In function `imx6ull_lower_cpu_rate': platform-imx-dma.c:(.text+0x5514): undefined reference to `arm_reg' platform-imx-dma.c:(.text+0x551c): undefined reference to `arm_reg' platform-imx-dma.c:(.text+0x553c): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x5544): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x5598): undefined reference to `arm_reg' platform-imx-dma.c:(.text+0x55a0): undefined reference to `arm_reg' platform-imx-dma.c:(.text+0x55ac): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x55b4): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x55c8): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x55d0): undefined reference to `soc_reg' platform-imx-dma.c:(.text+0x55f0): undefined reference to `arm_reg' platform-imx-dma.c:(.text+0x55f8): undefined reference to `arm_reg' Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> (cherry picked from commit 3f68dc7c600c0354f5df7f06b931661319addafb)
2017-12-21ARM: imx: spare the first 16KiB of OCRAM_S for Cortex-M4Stefan Agner
The Cortex-M4 boot vector table is located in the OCRAM_S. When building a firmware with a complete vector table at 0x00000000 Linux overwrites the vector table with suspend information. Use the higher 16KiB for suspend related information so that we can use the lower 16KiB for the Cortex-M4 core. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a8e0d437843393309b6db46c0e19f9da0b5d213b)
2017-12-21apalis-imx6: use stopmode for poweroffMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 051ee1a1c24058db62f10a177b1271daebbd2ebe)
2017-12-21pm-imx6.c: fix power off by stop modeMax Krummenacher
With the 3.14.28 release of the kernel imx6_stop_mode_poweroff() does not enter stop mode. Thus the function does not switch of power but returns. This seems to be caused by the second processor which has been stopped. Set the WFI event mask for the stopped processor works around the issue. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry-picked from commit 2acff0eaece38533e85e08431e7ae9f3027c677a) (cherry picked from commit 894914718e9e563eb601e0090e1ae2ddadf426a9)
2017-12-21colibri-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 off power rails. Conflicts: arch/arm/mach-imx/pm-imx6.c drivers/regulator/pfuze100-regulator.c (cherry-picked from commit c8b186404065c4502b485820ad4a51515924795c) (cherry-picked from commit ee4c5c4da3b32f65528a2d523ca4bce574dee3c5) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 29ff2389ecf7cb4e30924c80b8d42165cf306936)
2017-12-21ARM: imx: mu: let Cortex-M4 know about A7 stateStefan Agner
Introduce two new messages to let the Cortex-M4 know in what state the Linux system is in. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit a86db1f7117a62019106e343ff894c6bd4da053d)
2017-12-21ARM: imx: busfreq: do not force high frequency during suspendStefan Agner
If the M4 core is running and in a low frequency mode, the A7 core should make sure that the AXI bus is left in a low frequency mode when entering suspend. So far the code unconditionally increased the high frequency variable which essentially forced the AXI bus to run in high frequency mode when entering suspend. With this change we leave the system in the state it was last in and also make sure that the last state change is actually applied before going to sleep. Typically high_bus_count ends up to be 0 because all devices requiring a high bus frequency release the bus during suspend, allowing the AXI bus to switch to 24MHz only. If the M4 is not running we don't want to artificially slow down the suspend process, hence let the bus run at full speed (it will get disabled anyway by hardware mechanism). Similar, when the M4 is running at high speed we likely need the bus capacity. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 9e05354060550645ad21a0455468e142c7fdb201)
2017-12-21ARM: imx: busfreq: initialize M4 frequency depending boot stateStefan Agner
Set low frequency state in case M4 start with 24MHz. This makes sure that Linux is aware of the M4 state and makes sure the bus frequency is not accidentally increased during suspend (bus_freq_pm_notify). Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 70f901b01c4ac4dfe741f91b76967a433674a37d)
2017-12-21imx: Expose SoC unique IDBhuvanchandra DV
Expose SoC unique ID read from OCOTP registers. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 9090b5b90ccc350611a769230eab3fbc20c9d302)
2017-12-21arm: dts: imx7: specify keypad port clockStefan Agner
To access the keypad port registers the IPG clocks need to be on, specify the clock accordingly. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 36df4e26b4257eaaa194fb39c9b43d30efe9f9d0)
2017-12-21imx6qdl-apalis.dtsi: mmc settingsMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 8262ee2e7e5866c8a1e22dff90ac96cc272b1103)
2017-12-21process.c: if power off fails, do at least a haltMax Krummenacher
Otherwise power_machine_power_off() returns and e.g. unexpected interrupts create stack traces. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 8d35764ee16976d81ac7dd0b75b3c0b11f977ad1) (cherry picked from commit e00c5466cc726653fa07a6fd42b39759a5a45bd3)
2017-12-21ARM: dts: imx6-colibri: Specify cable detect as ID and VBUS pinStefan Agner
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. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
2017-12-21mach-imx6q.c: handle RESET_MOCI when PCIe is disabledMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 02110528b45ae331d89f7e7bb6a29b5494ec0be1) (cherry picked from commit 8d07763eb1d6a2a11e9b237ac94b8de43183b02e) Conflicts: arch/arm/mach-imx/mach-imx6q.c (cherry picked from commit bea05755680df306e93e5a13f730fd1db203f947)
2017-12-21OmniVision ov5640 MIPI-CSI2 camera supportWojciech Bieganski
gst-inspect mfw_v4lsrc gst-launch mfw_v4lsrc capture-mode=5 device=/dev/video2 ! mfw_v4lsink Signed-off-by: Wojciech Bieganski <wbieganski@antmicro.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 4f4528cf031a4c6585bfcefd66607780de064de8) (cherry picked from commit b34325c7f99d3f323214e8b0f121711330769646)
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-12 21:44:47 +0000