summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-19Revert "ARM: dts: colibri-imx7: limit eMMC SDHC frequency to 100MHz"toradex_4.1-2.0.x-imxStefan Agner
Several modules have issues with HS400 at 100MHz at room temperature but they seem to work fine at HS400 at 200MHz. Do not restrict frequency for now. This reverts commit 166fb4842e780f63c31622af706335e7dcd48c24. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2018-06-19arm: Invalidate BTB on prefetch abort outside of user mapping on Cortex A8, ↵Marc Zyngier
A9, A12 and A17 In order to prevent aliasing attacks on the branch predictor, invalidate the BTB on CPUs that are known to be affected when taking a prefetch abort on a address that is outside of a user task limit. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit a07373c8c365746583f25f49fee41b1bc0ff94b2) [jason: adapted to 4.1] Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
2018-06-19arm: Add BTB invalidation on switch_mm for Cortex-A9, A12 and A17Marc Zyngier
In order to avoid aliasing attacks against the branch predictor, some implementations require to invalidate the BTB when switching from one user context to another. For this, we reuse the existing implementation for Cortex-A8, and apply it to A9, A12 and A17. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked commit from efcd0e857a656bbd1c1da15ff984ad6402332c61) [jason: adapted to 4.1] Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
2018-06-19ARM: 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) Tested playback and record on pulseaudio with 44.1kHz samples. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2018-04-03rpmsg: imx: Disable character echoing by defaultAndri Schmidt
Signed-off-by: Andri Schmidt <a.schmidt@scewo.ch> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
2018-03-23mmc: sdhci: Always allow tuning to fall back to fixed samplingAdrian Hunter
SDHCI falls back to fixed sampling if there is an error during tuning. However it also reports an error unless there is periodic re-tuning. That is not the best option because: a) there is a reasonable chance that fixed sampling will work, especially at room temperature. b) re-tuning will be done again anyway if there are CRC errors. Change to return no error always when falling back to fixed sampling. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> (cherry picked from commit 0760c355525c08dd598e86edb2a310688ac8af4c)
2017-12-14usb: gadget: configfs: use hexadecimal values and new lineStefan Agner
Other unsigned properties return hexadecimal values, follow this convention when printing b_vendor_code too. Also add newlines to the OS Descriptor support related properties, like other sysfs files use. Reviewed-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> (cherry picked from commit e800e8cbdf42c73602b90258f82a2cfe86ec53a7)
2017-12-14usb: gadget: configfs: make qw_sign attribute symmetricStefan Agner
Currently qw_sign requires UTF-8 character to set, but returns UTF-16 when read. This isn't obvious when simply using cat since the null characters are not visible, but hexdump unveils the true string: # echo MSFT100 > os_desc/qw_sign # hexdump -C os_desc/qw_sign 00000000 4d 00 53 00 46 00 54 00 31 00 30 00 30 00 |M.S.F.T.1.0.0.| Make qw_sign symmetric by returning an UTF-8 string too. Also follow common convention and add a new line at the end. Reviewed-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> (cherry picked from commit 76180d716f91f035d9c8639497cf5459b44e1a51)
2017-11-27arm: dts: imx6ull-colibri: enable pwmColibri-iMX6ULL_LXDE-Image_2.7b5-20171201Max Krummenacher
Now that the PWM work enable them. While at it move the backlight pwm settings into the carrier board file were it belongs. Periode and polarity are carrier board / display dependent. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-11-27arm: 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>
2017-11-27arm: 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>
2017-11-27colibri_imx6ull: add dtb for wifi variantMax Krummenacher
Add a device tree for the Colibri iMX6ULL 512MB Wi-Fi / BT. This is done by splitting out common nodes / properties into common *dtsi files and keep only the differences in a separate files. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-11-27ARM: 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>
2017-11-27mx6ull-colibri.dtsi: remove wrong bmode pin muxingMax Krummenacher
There are macros specifying the bmode pins for i.MX 6UL and ULL. Don't use the UL macros. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-11-27MLK-14409-02 ARM: dts: imx: Add 900MHz setpoint on i.mx6ullBai Ping
Add 900MHz/1.25V setpoint according the latest datasheet(Rev.1,2/2017), we add a 25mV voltage margin to cover the IR frop and board tolerance. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 9c31f7bf938adb9a808ea7bf637ccecf53f6e7be) (cherry picked from commit c27010d99a3d91703ea2d1a3f9630a9dedc3f86f)
2017-11-27MLK-14409-01 ARM: imx: Add speed grading fuse check for 900MHz on i.mx6ullBai Ping
According to the latest datasheet(Rev.1,02/2017), when the internal LDO is enabled, the ARM core can run at 900MHz. We need to check the speed grading fuse to determine the max ARM core frequency. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit cc0edd14c5fc3b5590302572687b08f80563c683) (cherry picked from commit c0821bb630b5a993a7cb8405f228f8bbd9e0bef7)
2017-11-27MLK-16134 ARM: dts: imx6ull: update imx6ull header file with the latest ↵Fugang Duan
imx6ull RDP Update imx6ull header file with the latest imx6ull RDP. - add new pin function definitions. - update pin function changes. Signed-off-by: Fugang Duan <fugang.duan@nxp.com> Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com> (cherry picked from commit 2c32aec9f6b910e03c7d422ad524352663547f52)
2017-11-27imx6ull-colibri.dtsi: remove wrong cpu operating-pointsMax Krummenacher
imx6ull.dtsi contains the values for 800/900MHz i.MX 6ULL. Don't override the values here with wrong cpu voltages. This fixes the i.MX6ULL 512MB boot freeze and it fixes the SoC temperature sensor. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-31imx6ull-colibri.dtsi: alias ethernet macsMax Krummenacher
We use the second ethernet MAC for the on module ethernet. Use an alias so that U-Boot fixes up the device tree to assign the MAC address corresponding to the serial number to the second MAC and uses the (serial# + 0x100000) one for the first MAC. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-31imx6ull-colibri.dtsi: make adc1 providing 10 channelsMax Krummenacher
By default one can only use channels 0 and 1. The AD channels on the SODIMM are connected as follows: AD0 channel 0 AD1 channel 1 AD2 channel 8 AD3 channel 9 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-31imx6ull-colibri.dtsi: cleanupMax Krummenacher
Move all entries for node cpu0 together. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02colibri-imx6ull_defconfig: synchronize with colibri_imx7Colibri-iMX7_LXDE-Image_2.7b4-20171005Colibri-iMX6_LXDE-Image_2.7b4-20171005Apalis-iMX6_LXDE-Image_2.7b4-20171005Max Krummenacher
This brings in the configuration changes needed for backports. Also remove drivers not used in a Colibri iMX6ULL. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02toradex defconfigs: synchronize with defconfigs in oeMax Krummenacher
Synchronize the defconfigs with changes done in meta-toradex-nxp. Normalize the defconfigs by make ..._defconfig make savedevconig cp defconfig arch/arm/configs/..._defconfig Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02colibri-imx6ull_defconfig: add atmel-mxt-ts as a moduleMax Krummenacher
Enable atmel mxt multi-touch controller driver to be built as a module. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02ARM: dts: imx6ull-colibri: add atmel mxt multitouch controllerMax Krummenacher
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: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02colibri_imx7_defconfig: add atmel-mxt-ts as a moduleBhuvanchandra DV
Enable atmel mxt multi-touch controller driver to be built as a module. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02ARM: 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>
2017-10-02ARM: 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>
2017-10-02colibri_imx6_defconfig: add atmel-mxt-ts as a moduleBhuvanchandra DV
Enable atmel mxt multi-touch controller driver to be built as a module. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02ARM: dts: imx6dl-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>
2017-10-02apalis_imx6_defconfig: add atmel-mxt-ts as a moduleBhuvanchandra DV
Enable atmel mxt multi-touch controller driver to be built as a module. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02ARM: dts: imx6qdl-apalis: 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>
2017-10-02imx6ull-colibri dtb: disable all pwmMax Krummenacher
They currently don't work. Activating them from the sysfs does freeze the kernel. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02ARM: imx: clk: enable OCOTP clock by defaultStefan Agner
For some reason USDHC and USB access crashes the kernel if the OCOTP clock is not enabled. It seems not to be software related since there is no direct access from the USDHC/Chipidea USB driver to the OCOTP IP. It might be that the hardware checks the fuses to determine if the particular SoC is supposed to let user access a certain peripheral... Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02colibri imx6ull: add initial device treeMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02colibri-imx6ull_defconfig: add a defconfigMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02imx6ull.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>
2017-10-02mtd: gpmi: fsl,legacy-bch-geometry independent of nand-on-flash-bbtMax Krummenacher
The device tree property fsl,legacy-bch-geometry was only evaluated when nand-on-flash-bbt was also defined. This looks wrong. In mainline (as of 4.12) fsl,legacy-bch-geometry doesn't exist, its functionality seems to be taken over by the fsl,use-minimum-ecc property and it is used independent of nand-on-flash-bbt. The move of code gets also rid of the following compiler warning: drivers/mtd/nand/gpmi-nand/gpmi-nand.c:2274:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (of_property_read_bool(this->dev->of_node, ^~ drivers/mtd/nand/gpmi-nand/gpmi-nand.c:2278:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' if (of_property_read_bool(this->dev->of_node, ^~ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02imx: 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>
2017-10-02imx6dl-colibri-eval-v3: fix weim nodeMax Krummenacher
With the move from the 3.14.52 to the 4.1 kernel the way the weim node defines chipselects changed. A phandle to the gpr node is needed. Only the following 4 configuration can be specified in the ranges property: CS0(128M), CS1 (0M), CS2(0M), CS3(0M) CS0(64M), CS1(64M), CS2(0M), CS3(0M) CS0(64M), CS1(32M), CS2(32M), CS3(0M) CS0(32M), CS1(32M), CS2(32M), CS3(32M) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02regulator: pfuze100: Apalis iMX6: Fix poweroff does not release ↵Sanchayan Maity
POWER_ENABLE_MOCI Poweroff failed powering off the carrier board side of things and did not deassert POWER_ENABLE_MOCI on poweroff. Fix this. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02ARM: 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>
2017-10-02apalis_imx6: update defconfig for wifiDominik Sliwa
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
2017-10-02ip6_offload: fix compiler warningMax Krummenacher
Backports introduced the following compiler warning: net/ipv6/ip6_offload.c:264:25: warning: 'sit_gro_receive' defined but not used [-Wunused-function] Remove the static function definition. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02of: fdt: fix compiler warningMax Krummenacher
Backport 78de28c67 introduced the following compiler warning. The later function prototype was changed to return a void* while in 4.1 the function does not return a value. drivers/of/fdt.c: In function '__unflatten_device_tree': include/linux/stddef.h:8:14: warning: 'return' with a value, in function returning void #define NULL ((void *)0) ^ drivers/of/fdt.c:416:10: note: in expansion of macro 'NULL' return NULL; ^~~~ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02mtd: blkdevs: fix switch-bool compilation warningTomer Barletz
With gcc 5.1 I get: warning: switch condition has boolean value [-Wswitch-bool] Signed-off-by: Tomer Barletz <barletz@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> (cherry picked from commit cc7fce80229067890365c1ee196be5d304d36dea)
2017-10-02mtd: fsl-quadspi: fix macro collision problems with READ/WRITE"Max Krummenacher
Mainline commit 9386aae907d9ee79d54640f09d70909393e0ddeb addresses macro collisions, however the mainline and downstream kernel driver do not match. Fix the issue addressed in mainline in the downstream codebase. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-02Revert "mtd: fsl-quadspi: fix macro collision problems with READ/WRITE"Max Krummenacher
This reverts commit 9386aae907d9ee79d54640f09d70909393e0ddeb. The fsl-quadspi from mainline is implemented differently, so do not use it from the mainline backport. Required to also revert merge conflict resolution. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
2017-09-27Merge remote-tracking branch 'fslc/4.1-2.0.x-imx' into toradex_4.1-2.0.x-imxMax Krummenacher
2017-09-22Merge tag 'v4.1.44' into 4.1-2.0.x-imxOtavio Salvador
Linux 4.1.44 * tag 'v4.1.44': (180 commits) Linux 4.1.44 mtd: fsl-quadspi: fix macro collision problems with READ/WRITE pinctrl: samsung: Remove bogus irq_[un]mask from resource management pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver pnfs/blocklayout: require 64-bit sector_t iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter USB: Check for dropped connection before switching to full speed uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069 iio: light: tsl2563: use correct event code staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read USB: hcd: Mark secondary HCD as dead if the primary one died USB: serial: pl2303: add new ATEN device id USB: serial: cp210x: add support for Qivicon USB ZigBee dongle USB: serial: option: add D-Link DWM-222 device ID nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays fuse: initialize the flock flag in fuse_file on allocation iscsi-target: Fix iscsi_np reset hung task during parallel delete iscsi-target: fix memory leak in iscsit_setup_text_cmd() ... Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>