summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-23MLK-11685-2 sdhci-esdhc-imx: use bus freq in runtime pmDong Aisheng
Request BUS_FREQ_HIGH when bus is busy and then release BUS_FREQ_HIGH when bus becomes idle. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 64994f7115573c9ede53b51536b2c15f7cf0112a) Signed-off-by: Haibo Chen <haibo.chen@freescale.com> Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c
2017-02-23MLK-11685-1 mmc: add delay after CMD6 befoer sending CMD13 for sandiskRyan QIAN
- Some sandisk emmc cards need certain delay befor sending cmd13 after cmd6. Original CR: ENGR174296 (commit: fd031f9) Acked-by: Aisheng Dong <b29396@freescale.com> Signed-off-by: Ryan QIAN <b32804@freescale.com> (cherry picked from commit f942bf1db36355d46f38792601594949f3f2c71b) Signed-off-by: Haibo Chen <haibo.chen@freescale.com> Conflicts: drivers/mmc/core/mmc_ops.c
2017-02-23MLK-11676 ARM: imx_v7_defconfig: disable CONFIG_SWP_EMULATEShengjiu Wang
According to the help text in the config SWP_EMULATE in arch/arm/mm/Kconfig: "In some older versions of glibc [<=2.8] SWP is used during futex trylock() operations with the assumption that the code will not be preempted. This invalid assumption may be more likely to fail with SWP emulation enabled, leading to deadlock of the user application." The audio codec toolchain version is gcc-4.1.1-glibc-2.4, we need turn off the CONFIG_SWP_EMULATE in the imx_v7_defconfig. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-02-23MLK-10629-6 dts: imx7d-sdb: do not enable wlreg_on alwaysDong Aisheng
Broadcom WiFi requires reset by operating wlreg_on regulator when doing insmod/rmmod. Keep wlreg_on will cause card state wrong and unable to re-insmod. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit d65683e1d0717fa039ebd4c55562e6ee745354b7) Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
2017-02-23MLK-10629-5 dts: imx7d-sdb: remove non-removable property of wifi hostDong Aisheng
The card detect of Broadcom WiFi on uSDHC2 port can not function well with a non-removalbe card. Because MMC core only enumerate one time for non-removable card which is not work for Broadcom WiFI. So remove it. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit ed4c1c749c755839775ff4ad2078e659fec18650) Signed-off-by: Haibo Chen <haibo.chen@freescale.com> Conflicts: arch/arm/boot/dts/imx7d-sdb.dts
2017-02-23MLK-10629-3 dts: imx7d-sdb: add wifi-host property for usdhc2Dong Aisheng
There's a Broadcom WiFi on usdhc2. Add this property due to Broadcom WiFi driver needs call wifi_card_detect function. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 72015985537b5bd14ac7b0c97860ab26309ad1a1) Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
2017-02-23MLK-10629-2 mmc: sdhci-esdhc-imx: implement wifi_card_detect functionDong Aisheng
WiFi driver could call wifi_card_detect function to re-detect card, this is required by some special WiFi cards like broadcom WiFi. To use this function, a new property is introduced to indicate a wifi host. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 74e71dd0aebb9e931f02aefa3dd1990cbe642ae4) Signed-off-by: Haibo Chen <haibo.chen@freescale.com> Conflicts: Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
2017-02-23MLK-10629-1 dts: imx7d-sdb: add the integrated Broadcom WiFi chip supportDong Aisheng
Add Broadcom WiFi chip BCM4339 on board support. Need adds a bcmdhd_wlan@0 node for WiFi driver to probe properly. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 24b44a415df9a27036b843284a179448dcc5fe20) Signed-off-by: Haibo Chen <haibo.chen@freescale.com> Conflicts: arch/arm/boot/dts/imx7d-sdb.dts
2017-02-23MLK-11316-4 video: mxc ipuv3 fb: Change on-the-fly switch mechanism for PRE ↵Liu Ying
workaround In order to workaround the PRE SoC bug recorded by errata ERR009624, the software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode. Instead of setting the PRE_CTRL register any time we want to do on-the-fly switch(PRE keeps working before and after the switch), we change to set the register in the on-the-fly configuration interrupt(EOF) handler. This way, we may avoid encountering the problematic PRE automatic writing cycle for sure. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 6218cbcf34f5fb7910a824a8d31cc58819d0bd00)
2017-02-23MLK-11316-3 video: mxc ipuv3 fb: Change pan display mechanism for PRE workaroundLiu Ying
In order to workaround the PRE SoC bug recorded by errata ERR009624, the software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode. The software mechanism to set the PRE_CTRL register is different for PRE Y resolution higher than 9 lines and lower than or equal to 9 lines. For cases in which Y resolution is higher than 9 lines, before we update PRE shadow, we just need to wait until the PRE store engine status runs out of the problematic PRE automatic writing window. While for cases in which Y resolutin is lower than or equal to 9 lines, we have to update PRE shadow in the buffer flip interrupt handler. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit bd9c14e24aaf67926dfd31bd819ab0c87129fe4b)
2017-02-23MLK-11316-2 mxc IPUv3: PRE: Define small Y resolutionLiu Ying
In order to workaround the PRE SoC bug recorded by errata ERR009624, the software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode. The software mechanism to set the PRE_CTRL register is different for PRE Y resolution higher than 9 lines and lower than or equal to 9 lines. So, this patch defines the small Y resolution and adds a helper to check the Y resolution. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit cf7df46e3b1d2142ff354498982194247bf07fea)
2017-02-23MLK-11316-1 mxc IPUv3: PRE: Export a function to set PRE_CTRL registerLiu Ying
In order to workaround the PRE SoC bug recorded by errata ERR009624, the software cannot write the PRE_CTRL register when the PRE writes the PRE_CTRL register automatically to set the ENABLE bit(bit0) to 1 in the PRE repeat mode. This patch exports a function to set the PRE_CTRL register so that it could be used by the software when the PRE automatic writing doesn't happen for sure. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit e64bbcd9243a17f9eba9cb3abb6f2c1939eae110)
2017-02-23MLK-11536 video: mxc ipuv3 fb: Fix pan-disp frame drop issue when PRE is enabledLiu Ying
There could be frame drop issue when we do pan display if we update PRE next buffer address before waiting for the flip completion, because we may hold the flip completion already and then two continuous pan display operations may happen quickly within one active period of frame scanning - the first PRE next buffer address is overriden. To fix this issue, this patch updates the buffer address after the flip completion. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit d0126e42f46f6dad9ae8c6aa390b0e1bea76492e)
2017-02-23MLK-11679: IPU: Fix ldb0 can not work issueSandor Yu
LVDS0 can not work on imx6q auto and SDB board, it is caused by ldb0 clock setting is missed in ipu driver. Signed-off-by: Sandor Yu <R01008@freescale.com>
2017-02-23MLK-11503-2 ARM: dts: imx7d-12x12-lpddr3-arm2: enable usdhc in lpsr modeHaibo Chen
Add pinctrl sleep mode support for usdhc, and enable usdhc in lpsr mode. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit 75b33d1a578abaed44b11a05187c19dedb25aad2) Conflicts: arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
2017-02-23MLK-11503-1 mmc: sdhci-pltfm: add pinctrl sleep mode supportHaibo Chen
For LPSR mode, usdhc iomux settings will be lost after resume, so add pinctrl sleep mode support. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit 983a7a174ed20d34a170a6aba70ff9d5bb2c9973)
2017-02-23MLK-11397 mmc: sdhci-esdhc-imx: move the setting of watermark level out of probeHaibo Chen
Currently, we config the watermark_level register only in probe. This will cause the mmc write operation timeout issue after system resume back in LPSR mode. Because in LPSR mode, after system resume back, the watermark_level register(0x44) changes to 0x08000880, which set the write watermark level as 0, and set the read watermark level as 128. This value is incorrect. This patch move the setting of watermark level register out of probe, so after system resume back, mmc driver will set back this watermark level register back to 0x10401040. Signed-off-by: Haibo Chen <haibo.chen@freescale.com> (cherry picked from commit 05f72329a3c288e15c2f187305a21815d6bffc6d) Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c
2017-02-23MLK-10837 dts: imx_v7_defconfig: remove CONFIG_BT_HCIBTSDIO supportDong Aisheng
We don't need btsdio driver support and enable it will cause Broadcom WiFi driver suspend/resume unwork due to it does not implement suspend/resume callback. Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit ebd90ea123d493935b559c05db0cd5b5db9d3c73)
2017-02-23mmc: Allow setting slot index via devicetree aliasSascha Hauer
As with gpio, uart and others, allow specifying the name_idx via the aliases-node in the devicetree. On embedded devices, there is often a combination of removable (e.g. SD card) and non-removable mmc devices (e.g. eMMC). Therefore the name_idx might change depending on - host of removable device - removable card present or not This makes it difficult to hard code the root device, if it is on the non-removable device. E.g. if SD card is present eMMC will be mmcblk1, if SD card is not present at boot, eMMC will be mmcblk0. If the aliases-node is not found, the driver will act as before. The original patch is from here: https://www.mail-archive.com/linux-mmc@vger.kernel.org/msg26472.html The patch requires additional alias_id fix or it won't work. Because according to function definition the max_idx parameter of idx_alloc is exclusive, so need add 1 or it will be unable to find the proper idx within an invalid range. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Dong Aisheng <b29396@freescale.com> (cherry picked from commit 35928d6c6a76a24a16edfa636f4c08293614a1e0)
2017-02-23of: Add helper for getting the maximum alias index for a stemSascha Hauer
of_alias_max_index will return the maximum number for which an alias of a given stem exists. This is useful for frameworks whishing to reserve a number of device slots from dynamic allocation. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> (cherry picked from commit 5ce2ad39b36fd48b9f77249198655da7cbcc7ee5) Conflicts: include/linux/of.h
2017-02-23MLK-11620 ARM: imx: single SOC config/compile supportBai Ping
Currently, all i.MX6 config (CONFIG_SOC_IMX6XXX) are enabled, so build and function are OK for every i.MX6 SOC, however, when only one SOC config is selected in menu config, for example, users only needs i.MX6SL, they might deselect all reset SOC configs, then the build will fail, this is unacceptable. Signed-off-by: Anson Huang <b20788@freescale.com> Signed-off-by: Bai Ping <b51503@freescale.com>
2017-02-23MLK-11566-6 mlb: add i.mx6sx supportAnson Huang
i.MX6SX has MLB150, add support for it. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 99d374da7d49d45800821b28d55e032387f1cc67)
2017-02-23MLK-11566-5 drvier: imx_sema4: add dummy functionAnson Huang
When CONFIG_IMX_SEMA4 is NOT set, some modules may still call SEMA4 APIs, need to add dummy function to make sure build pass. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 5a2537095621da25c8967a0ccdbb8b0029e14c94)
2017-02-23MLK-11566-4 mxc: gpu: enable gpu for all i.mx6 SOCAnson Huang
GPU is NOT just depending on i.MX6Q, enable it for all i.MX6 SOCs. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 06b8da5c28dc2fec0160bc60cc846d4910a05b41)
2017-02-23MLK-11566-3 input: keyboard: add i.mx6ul support for snvs power keyAnson Huang
i.MX6UL has SNVS power key, add support for it. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 095c876a12e27220cb91cb9dc376a20b6bf259e4)
2017-02-23MLK-11566-2 mxc: mipi: make mipi csi2 common for SOC_IMX6 and SOC_IMX7Anson Huang
MIPI_CSI2 is necessary for modules build, enable it for all i.MX6 and i.MX7 SOC. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 2e2025df741a79620be9b96fa6fb0f2e2e40fdea)
2017-02-23MLK-11566-1 dma: add MXS_DMA for all i.mx6 SOCAnson Huang
Enable MSX_DMA for all i.MX6 SOCs. Signed-off-by: Anson Huang <b20788@freescale.com> (cherry picked from commit 70e7d05ca89fff0d4c8515cd3933b23082bb2eaf)
2017-02-23MLK-11661: ipuv3: Fix build warningSandor Yu
Fix buiulding warning: drivers/mxc/ipu3/ipu_disp.c:435:29: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers] {{DP_COM_CONF_CSC_DEF_BOTH, &rgb2ycbcr_coeff}, {0, 0}, {0, 0}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff}, {DP_COM_CONF_CSC_DEF_BG, &rgb2ycbcr_coeff} }, Signed-off-by: Sandor Yu <R01008@freescale.com>
2017-02-23MLK-11657: IPU: check ldb clock with clk nameSandor Yu
4.1 kernel apply the followed patch: commit 73e0e496afdac9a5190eb3b9c51fdfebcc14ebd4 clkdev: Always allocate a struct clk and call __clk_get() w/ CCF clock_get will return a new struct clk, so we can't use the pointer of clk struct to compare clk whether is equal, replace with clk name. Signed-off-by: Sandor Yu <R01008@freescale.com>
2017-02-23MLK-11556-9 clock: correct the parent clock for EPDC pix clockRobby Cai
Correct the parent clock for EPDC pixel clock to get desired clock rate. Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-8 ARM: dts: imx6sl-evk: add epdc supportRobby Cai
Add epdc support on i.MX6SoloLite EVK board. Add 'compatible', 'clocks' property in common imx6sl.dtsi enable pxp, pmic, epdc in imx6sl-evk.dts Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-7 ARM: dts: imx6dl-sabresd: add epdc supportRobby Cai
Add epdc support on i.MX6DL SabreSD board. Add 'compatible', 'clocks' property in common imx6dl.dtsi enable pxp, pmic, epdc in imx6dl-sabresd.dts Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-6 ARM: dts: imx7d-sdb: add epdc supportRobby Cai
Add epdc support on i.MX7D SDB board Since EPDC has pin conflict with ENET1/2, a new DTS file is added. And EPDC has pin conflict with SIM, so disable SIM by default. Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-5 ARM: dts: imx7d-12x12-arm2: add epdc supportRobby Cai
Add epdc support on i.MX7D 12x12 LPDDR3 ARM2 board Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-4 defconfig: enable epdc driverRobby Cai
Enable epdc driver of both version Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-3 epdc: add EPDC driverRobby Cai
mxc_epdc_fb.c for i.MX6SoloLite, and i.MX6DualLite (and i.MX50 as well), mxc_epdc_v2_fb.c for i.MX7D. Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-2 defconfig: enable pmic max17135 hwmon, mfd, regulator functionRobby Cai
Enable hwmon, mfd, regulator function Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11556-1 pmic: max17135: add hwmon, mfd and regulator drivers for this pmicRobby Cai
Add PMIC 'MAX17135' module drivers to 4.1.y kernel. These are necessary to supply power for E-ink panel display functions. Signed-off-by: Robby Cai <r63905@freescale.com>
2017-02-23MLK-11623 ASoC: imx-cs42888: add 32k and 64k sample rate supportZidan Wang
When codec sysclk is 24576000, the sample rate ratio can be 128, 192, 256, 384, 512, 768, 1024. So 32k, 48k, 64k, 96k, 192k can be support. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> (cherry picked from commit b436254cd55dc0d2ebb6d2ca7ce5f58520ea5dbc)
2017-02-23MLK-11628 ASoC: fsl_sai: add initial value for is_slave_modeZidan Wang
After playback audio with sai<->wm8960 sound card, is_slave_mode will be set, but it will not be cleared. So playback audio with sai<->sii902x sound card will have no voice. Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2017-02-23MLK-11629 ARM: dts: imx7d-sdb: add sai<->sii902x sound card supportZidan Wang
add sai<->sii902x sound card support for imx7d-sdb board Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
2017-02-23MLK-10713-2 ASoC: imx-sii902x: Add 96k and 192k sample rate supportZidan Wang
Add 96k and 192k sample rate support for hdmi audio. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> (cherry picked from commit fa94b89ab94ce78800d112d0a013d0c0901d9b78)
2017-02-23MLK-10611-2 ASoC: imx-sii902x: forbid using SAI when SAI is being used by ↵Zidan Wang
other device imx7d-sdb board using one SAI for wm8960 and sii902x hdmi audio, wm8960 using SAI as slave mode and sii902x hdmi audio using SAI as master mode, so SAI can't be used at the same time. Forbid palyback(capture) when SAI is being used capture(playback) by other device. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> (cherry picked from commit bac15c28c3b8a57fbe04ea80b8fb5eb47a0211f1)
2017-02-23MLK-10518-1 ASoC: imx-sii902x: add machine driver for sii902x hdmi audioZidan Wang
Add machine driver for sii902x hdmi audio. Restricting by SAI master clock, the hdmi audio just support 16bit 24bit sample width and 32k 48k sample rate. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> (cherry picked from commit 8dc359b46c81105efcd13007325d9cadc9a6214d)
2017-02-23MLK-11387-3 ARM: imx: update ddr freq scale setting on imx7dAnson Huang
To pass stress test in high temperature environment, according to design team's suggestion, need to adjust ddr phy setting for LPDDR3. Signed-off-by: Anson Huang <b20788@freescale.com>
2017-02-23MLK-11387-2 ARM: imx: add imx7d lpddr2 supportAnson Huang
i.MX7D LPDDR2 board has same flow of suspend/resume and busfreq with LPDDR3, the only difference is the DRAM init script which is done in u-boot. This patch adds suspend/resume and busfreq support for i.MX7D LPDDR2, tested on i.MX7D 19x19 LPDDR2 board. Signed-off-by: Anson Huang <b20788@freescale.com> Conflicts: arch/arm/mach-imx/busfreq_ddr3.c arch/arm/mach-imx/pm-imx7.c
2017-02-23MLK-11387-1 ARM: dts: add imx7d 19x19 lpddr2 board supportAnson Huang
Add i.MX7D 19x19 LPDDR2 board dtb. Signed-off-by: Anson Huang <b20788@freescale.com> Conflicts: arch/arm/boot/dts/Makefile
2017-02-23MLK-11371-3 imx_v7_defconfig enable OTP driverPeng Fan
Default enable OTP driver. File generated using 'make savedefconfig'. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
2017-02-23MLK-11371-2 imx: fix ocotp dts nodePeng Fan
Fix imx6/7 ocotp dts node. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
2017-02-23MLK-11371-1 char: add fsl_otp device driverPeng Fan
This is porting of fsl_otp driver from imx_3.14.y to imx_4.1.y. This patch mainly from the following: commit:292eff6d2c9064ecf15ed457140c1d743c2ead67 "ENGR00269945: char: add fsl_otp deivce driver" This is a porting of fsl_otp driver from 3.0.35 kernel to 3.10. It cleans up the driver a little bit and adds device tree probe support. shawn.guo: cherry-pick commit 850237dccde7 from imx_3.10.y. commit:057a50039fac872fd19fe6c129a94face4231ae8 "MLK-10979-4 imx: ocotp add i.MX7D support and fix hole" 1. Add i.MX7D support 2. Fix hole addressing. There is a hole in shadow registers address map of size 0x100 between bank 5 and bank 6 on iMX6QP, iMX6DQ, iMX6SDL, iMX6SX and iMX6UL. Bank 5 ends at 0x6F0 and Bank 6 starts at 0x800. When reading the fuses, should account for this hole in address space. Similar hole exists between bank 14 and bank 15 of size 0x80 on iMX6QP, iMX6DQ, iMX6SDL and iMX6SX. Note: iMX6SL has only 0-7 banks and there is no hole. Note: iMX6UL doesn't have this one. When reading, the hole need to be considered to calculated the physical address offset. When writing, since only word index for i.MX6 and bank index for i.MX7, there is no need to take the hole into consideration, still use the bank/word index from fuse map. 3. Add i.MX6SL i.MX6UL fuse map table. 4. Tested read/write on mx6ul-14x14-ddr3-arm2 and mx7d-12x12-lpddr3-arm2 board. Tested read on mx6sxsabresd board. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-06 14:08:16 +0000