summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-09MLK-14771 dma: pxp-v3: add new added 2D features supportGuoniu.Zhou
The V3 version PXP has added below new 2D features: 1. Input fetch/store blocks to accept different formats input/output. 2. Add Rotation1 block to do rotation before alpha blending. 3. Add Composite1 block to accept source from input fetch. 4. AS and PS have increased supported pixel formats. Signed-off-by: Fancy Fang <chen.fang@nxp.com> Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com> (cherry picked from commit 4daef24b19890ca65135c48fc24018f64761444f)
2017-06-09MLK-14314-14 dma: pxp-v3: derive the shortest path table for 2D nodesFancy Fang
Based on the previously caculated adjacent list and mux config info, the shortest path table can be derived by distance calculation between two different 2D nodes. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit c8adf0f7089d5c5e286d7ae74c138a84bed5e280)
2017-06-09MLK-14314-13 dma: pxp-v3: construct graph structures to store pxp nodes.Fancy Fang
According to the PXP arch diagram, the V3 PXP can be abstracted to a graph structure. There are totally 16 2D nodes in PXP and 16 2D related mux nodes: 1. Using '16x16' adjacent array to record the 2D nodes relationship and '16' size array to record the input and output nodes for each muxe node. 2. Construct the adjacent list to store all the 2D nodes and also config the mux info used by each two nodes of one edge during pxp probing stage. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit e8087406df2e04982fd90b4070ac68fafa4ad3d5)
2017-06-09MLK-14314-12 dma: pxp-v3: refine pxp timer init in probe()Fancy Fang
Extract the timer initialization from pxp_probe() to a seperate function call to make probing process more clear. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit c8a127e506bca2e38fae02c03ceae4e6956d6ea3)
2017-06-09MLK-14314-11 dma: pxp-v3: refine attributes create in probe()Fancy Fang
Extract the attributes creation from the pxp_probe() to a seperate function call to make the probing process more clear. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 85ab5476bf59a407037b43419b920b681b58b52d)
2017-06-09MLK-14314-10 dma: pxp-v3: refine m4 init in probe()Fancy Fang
Extract the m4 related initialization code from pxp_probe() to make the probing function more clear. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit f1bd8146332f880b75f08eab64505070069018fb)
2017-06-09MLK-14314-9 dma: pxp-v3: refine pxp interrupt init codeFancy Fang
The PXP interrupt functions in V3 is relatively complex. So do the interrupt initalization in a sperate function to make the pxp_probe() more clear. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 2fa43d26f81cf0331820b41bc198adbb414c0c37)
2017-06-09MLK-14314-8 dma: pxp: remove meaningless assignments in probe()Fancy Fang
Remove some assignments which have no real effects for V2 and V3 PXP drivers, since using devm_kzalloc() to make the data to be zero. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit a6d6e4d2b6b21427c529a33a7d47ddc918b19eb7)
2017-06-09MLK-14314-7 dma: pxp: add some new pixel formats definition.Fancy Fang
Add several new pixel formats definition which are supported by PXP V3 ip. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 5195602ac0225902bd416647fb9cd0636fa11e89)
2017-06-09MLK-14314-6 dma: pxp: change some RGB formats definitionFancy Fang
Some RGB formats fourcc definition are not precise according to its original meaning. So make some changes for them. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit b0b4ad680e267bdf542d2c9a3202c0192bde9cb0)
2017-06-09MLK-14314-5 dma: pxp-v3: divide whole pxp into four partsFancy Fang
According to the pxp high level architecture diagram, it is better to divide the whole big pxp module into four sub-modules: 1. 2D operation module(legacy pxp and input fetch & store). 2. Dithering module. 3. WFE_A module. 4. WFE_B module. This division will simplify driver implementations and management. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 5e57840b41adb195515bd652d9624feaadf3448e)
2017-06-09MLK-14314-4 dma: pxp-v3: abstract ps and out fmts parse functionsFancy Fang
Abstract PS and OUT formats parsing jobs to seperate functions 'pxp_parse_ps_fmt()' and 'pxp_parse_out_fmt()' to make the code clean and easier to maintain. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 3e2cd1880fdf219c77f119fa5c9fb33e50e8654c)
2017-06-09MLK-14314-3 pxp-v3: add 'need_yuv_swap' fieldFancy Fang
Add 'need_yuv_swap' field to 'pxp_proc_data' structure to record the yuv formats which needs byte swap. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit 28ce43b27faad915e93f47b438d23f4ebfe020b5)
2017-06-09MLK-14314-2 dma: pxp: refine is_yuv().Fancy Fang
Use 'switch' statement to replace 'if' statement to make logic more clear and easier to maintain. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit ca1b4393b86054a81bb40ad856af9c4f166841ea)
2017-06-09MLK-14314-1 dma: pxp: remove unused multiple overlay layers supportFancy Fang
The multiple overlay layers are not used on pxp v2 and v3 module, so remove this. Signed-off-by: Fancy Fang <chen.fang@nxp.com> (cherry picked from commit c4fd8b36dbf9b53079d88d55ccfedde3a444ec29)
2017-06-09MLK-14766: bcmdhd: Fix compile issue when building MMC subsystem as moduleDong Aisheng
Re-apply Dong Aisheng's patch for MLK-13190, as the issue reappeared with bcmdhd update v1.141.100.6: BCMDHD_SDIO needs to be tristate for the correct dependency of MMC core subsystem. And the old driver buildin mode is static defined by DRIVER_TYPE. Fix it to depend on CONFIG_BCMDHD_SDIO. Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Tiberiu Breana <andrei-tiberiu.breana@nxp.com>
2017-06-09ASoC: fsl: add imx-pcm-dma v2 platform driverViorel Suman
which don't request the dma channel in the probe, but request dma channel when needed. for the dma channel of cpu dai in BE can be reused by the FE. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2017-06-09MLK-14805 Revert "MLK-14470 net: fec: let shared mii bus always be active"Fugang Duan
This reverts commit a87bb06a0bc7 that breaks busfreq test case. Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2017-06-09ASoC: fsl_sai: set specific fmt for I2S XTORViorel Suman
Set specific fmt for emulation build, for i2s xtor receiver is in slave mode and i2s xtor transmitter is in master mode. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2017-06-09ASoC: fsl_sai: handle slave mode per TX/RX directionViorel Suman
The SAI interface can be a clock supplier or consummer as function of stream direction, ie when interacting with I2S XTOR. Removed FSL_SAI_RFR define as it is now referred as FSL_SAI_RFR0. Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2017-06-09MLK-14470 net: fec: let shared mii bus always be activeFugang Duan
Many boards installed with i.MX chip only use two pins for mii bus in two NET MAC system to save two pins. Then one MAC need to share the mii bus with the other one. Since two net interface operation are parallel and separate, we should keep the shared mii bus always be active. So it should keep MAC clocks on. Signed-off-by: Fugang Duan <fugang.duan@nxp.com> (cherry picked from commit: d0f18f7633ed)
2017-06-09MLK-14780 ARM: dtsi: imx6qdl-sabresd: Set HDMI's DI from 1 back to 0Liu Ying
To keep backward compatibility of the default device tree settings, we should set HDMI's display interface to be DI0 of IPU0. This makes HDMI and MIPI DSI be able to work simultaneously on the i.MX6q/qp sabresd platform. Also, LVDS1 and HDMI on the i.MX6sdl sabresd platform. So, let's revert "MLK-14678: dts: Fix lcd display id" (commit 85073fc130e83a1cfba58f0f06d9d8cbbd8c88f4). Signed-off-by: Liu Ying <victor.liu@nxp.com>
2017-06-09MLK-14770 net: fec: revert the patch "net: fec: avoid mac re-inited after ↵Fugang Duan
system resume back" The patch commit:586fbe526860 introduce the issue that suspend/resume is failed on i.MX6SX sabreauto/sdb board. Now revert it. Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2017-06-09ASoC: fsl_sai: expand the channel_max to 32Shengjiu Wang
sai can support 32 channel in maximum. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2017-06-09MLK-14648: mxc: fix default modelistRobert Chiras
When EDID read fails, the mxc_hdmi driver creates a default modelist using a hard-coded list with CEA modes. Every time the HDMI cable is plugged-in, it will destroy the current modelist and recreate the list. The problem comes from fbcon, which holds reference to current mode used for each framebuffer console. When we destroy the modelist and send the new one, if the memory for the old mode is overwritten it will try to find another mode, close to the old one. Since the mode could be overwritten by something else there is a high chance that the new selected mode to be different from the old one. If the HDMI sink does not support the selected mode, IPU will fail to deliver frames. Since it's wrong to advertise as supported modes the modes from a hard-coded list, just use one mode, which comes from cmdline. Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
2017-06-09ASoC: fsl_(e)sai: introduce "shared-interrupt" DT flagViorel Suman
SAI & ESAI interfaces may share the same interrupt with EDMA, so that we need a flag to trigger proper shared interrupt handling. For compatibility the same DT flag, "shared-interrupt", is introduced as the one used in drivers/dma/fsl-edma-v3.c. Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2017-06-09MLK-14784: ASoC: fsl_esai: fix esai register setting issue in RIGHT_J modeShengjiu Wang
The ESAI_xCR_xWA is xCR's bit, not the xCCR's bit. driver set it to wrong register, correct it in this patch. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2017-06-09MLK-14761: ASoC: fsl_esai: fix esai sync mode can't workShengjiu Wang
In ESAI synchronous mode, the clock is generated by Tx, So we should always set registers of Tx which relate with the bit clock and frame clock generation (TCCR, TCR, ECR), even there is only Rx is working. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2017-06-09MLK-14781-2: ARM: dts: change audio pll frequency for ssi master modeShengjiu Wang
Original frequency 786.432MHz can't be divide to frequency 2.304MHz which is needed by 48kHz/24bit/2channel, So update the pll frequency for 24bit case. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2017-06-09MLK-14781-1: ASoC: fsl_ssi: fix noise issue for master and mono modeShengjiu Wang
The case is 32kHz/24bit/1channel bit stream, and ssi is in master mode. The driver will switch to normal mode for 1 channel, so the slot width is not fixed to 32 bit in this mode, and even in mono mode, the slot number is 2, but the bit clock calulation still use the bit width=32, and slot number=1, which cause the output frameclock is not correct. So there will be noise in output sound. This patch is to change the bit clock formula of mono mode, which is 2channels * params_width * sample rate. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2017-06-09MXSCM-293-2 arm: dts: add oob and modem reset support for SCM devicesJuan Gutierrez
- Add BT modem device reset node for SCM i.MX6 devices - Add Wifi OOB support for QWKS rev3 and EVB Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2017-06-09MXSCM-293-1 arm: dts: fixes for MX6 SCM devices on L4.9Juan Gutierrez
- replace legacy wakeup property with 'wakeup-source' - add "jedec,spi-nor" flash compatible binding - fix lcd display id - fixig typo for gpios - use external wdog_b reset instead of issuing a sw reset - add off-on-delay for usdhc vmmc-supply regulator on mx6sxscm - add missing sai1 and wdog1 configs for mx6sxscm - fix vgen6 regulator maximum microvolt for mx6dqscm - disable CAAM since cannot coexist with LCDIF for mx6sxscm - add the reg into the rpmsg node for mx6sxscm Signed-off-by: Juan Gutierrez <juan.gutierrez@nxp.com>
2017-06-09arm64: imx: Use dummy busfreq implementationViorel Suman
There are no busfreq methods implemented for ARM64, so use the dummy methods in this case. Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2017-06-09MLK-14611 Fix xcbc unkeyed registrationRadu Solea
AES is a keyed algorithm, XCBC-AES needs a key for operation, this patch prevents the registration of AES-based transforms as unkeyed operations. Signed-off-by: Radu Solea <radu.solea@nxp.com>
2017-06-09MLK-14612 media: capture: fix VIDIOC_DQBUF issuesLaurentiu Palcu
The following commit, in 4.9 kernel: commit 2d7007153f0c ("[media] media: videobuf2: Restructure vb2_buffer") added some changes to the v4l2 structures that were not properly included in the existing driver after the rebase from 4.1. Hence, when a new buffer was filled by the v4l2 core, the flags field in vb2_v4l2_buffer structure contained a pointer and, depending on the pointer value, the v4l2 core considered that the buffer was already dequeued, signaling the error to userspace. The issue appeared intermittently, after multiple reboots. This patch fixes it. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
2017-06-09ASoC: fsl: Add machine driver for i2s xtorViorel Suman
Add I2S XTOR machine driver. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2017-06-09MLK-14721 video: mxsfb: some random line display top after blank fb1 and ↵Guoniu.Zhou
then suspend/resume After suspend and resume, the value of LCDIFx_AS_NEXT_BUF register losed, so when we unblank fb1 again, the valule of LCDIFx_AS_NEXT_BUF is 0 and random lines dis- played on the top. Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com> Signed-off-by: Fancy Fang <chen.fang@nxp.com>
2017-06-09MLK-14688: bcmdhd: update to version 1.141.100.6xlin
Features: - support for CYW43455 (Murata 1HK) - support for simultaneous STA-AP operation - Hostapd ACS support - 4339 OOB enable based on DTS GPIO configuration - 43340 packet filter timeout event Bug Fixes: - 4339 high current after wake up - Vendor IE does not show up in SoftAP beacons - mfgtest driver crash when wpa_supplicant is running - Fix for PMF testcase 5.3.3.2 failing due to deauth packets not being sent Known Issues: Kernel panic upon rmmod after insmod failure Signed-off-by: xlin <xlin@murata.com> Signed-off-by: Tiberiu Breana <andrei-tiberiu.breana@nxp.com>
2017-06-09MLK-14536: ASoC: wm8960: Fix playback in CPU DAI master modeDaniel Baluta
With the current rates for MCLK is not possible to derive bitclk for all files in S20_3LE format and also for files with S24_LE sampled at 48000Hz. In order to fix this, we need to find a better MCLK value. We did this in two steps: 1) Use params_physical_width to get rid of S20_3LE burden. 2) Brute force into all available rates which can pass fsl_sai_set_bclk algorithm. Thus we found 36864000 to be the smallest acceptable rate for MCLK. Reviewed-by: Mihai Serban <mihai.serban@nxp.com> Suggested-by: Shengjiu Wang <shengjiu.wang@nxp.com> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
2017-06-09MLK-14548: video: fb: hdmi: Allow Sil902 init regardless of fb registration timeCristina Ciocan
When a new fb is registered, a FB_EVENT_FB_REGISTERED event is sent to any registered fb client. Upon event receipt, the Sil902 HDMI transmitter saves the fb info structure address for future use and schedules a cable state check in order to setup and power up/down the device. The current Sil902 driver registers as fb client at the end of the probe function, thus events from fb core will only be received after the probe() call. If a framebuffer is registered before Sil902's probe() is called, the HDMI transmitter will not have knowledge of the framebuffer. This patch moves the Sil902 fb client registration step into an __init function and saves the fb info in case any registration event is received prior to the probe() call. When the probe() is called, check for any registration event and act accordingly. Sil902's init function class is called after the frame buffer core's init function class. Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
2017-06-09MLK-14548: video: fb: hdmi: Allow reset pin deferralCristina Ciocan
The HDMI transmitter Sil902x driver displays a warning when it cannot reset the device before any other instruction, but carries on without exiting the probe() function. If the needed reset pin is not yet available because the pinctrl controllers are not set up and the reset fails with deferral error, try to acquire the pin later on in order to allow proper initialization of the Sil902 HDMI transmitter. Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
2017-06-09MLK-14548: video: dts: Remove unused regulatorCristina Ciocan
The reg_lcd_3v3 regulator is, theoretically, used by the display controller eLCDIF as lcd supply. When enabling the HDMI trasnmitter Sil902x, a gpio pin needed by the regulator is taken by the HDMI TX as reset pin, so the regulator probe fails and is never used. The imx6sx-sdb-lcdif1.dts file is used for HDMI functionality, thus enabling the HDMI transmitter invalidates any possible use of the reg_lcd_3v3 regulator. This patch removes the regulator enablement from the HDMI-specific dts. Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
2017-06-09MLK-14678: dts: Fix lcd display idRobert Chiras
The default display engine used by lcd in imx6qdl-sabresd.dtsi is IPU:0 DI:0, the same used for hdmi. This is a conflict, and every time the kernel boots, this error will be printed: mxc_sdc_fb fb@2: ipu0-di0 already in use mxc_sdc_fb: probe of fb@2 failed with error -16 And, of course, lcd cannot be used in parallel with hdmi. In order to fix this, move hdmi to IPU:0 DI:1. I left lcd to IPU:0 DI:0 because it works only with that IPU core. Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
2017-06-09MLK-14650 mxc vadc: Add set_fmt functionSandor Yu
Add set_fmt function to mxc vadc driver. Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2017-06-09MLK-14609-2 ASoC: fsl: consolidate substream lock_stop/unlock_startOctavian Purdila
Add common imx_stop_lock_pcm_streams and imx_start_unlock_pcm_streams functions to remove code duplication in fsl_asrc and fsl_esai. Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
2017-06-09MLK-14718 video: fbdev: mxc: mipi dsi: Check device tree node in probeLiu Ying
For the safe probing's sake, check valid device tree node in probe function. Signed-off-by: Liu Ying <victor.liu@nxp.com>
2017-06-09MLK-14665 video: fbdev: mxc: mipi dsi: Customize gpio reset functionLiu Ying
The mxc display driver framework doesn't support deferral probe. The following initialization process may cause the mipi dsi driver deferral probe, however. pinctrl-imx6 - arch_initcall gpio-mxc - subsys_initcall gpio-reset - arch_initcall This patch customizes gpio reset function so that we can remove the code to use the reset logic provided by the gpio-reset driver. Also, the gpio-reset driver is not in the upstreaming kernel, so it would be good not to use it if possible. Signed-off-by: Liu Ying <victor.liu@nxp.com>
2017-06-09MLK-14662 mmc: debugfs: add runtime pm when cat ios or clock file nodeHaibo Chen
MMC core code add 'MMC_CAP_RUNTIME_RESUME', postpone the real card resume operation from bus_resume to bus_runtime_resume. So after system resume, for non-removable-card, it still not really resume. At this point, if user cat the ios or clock node, only get zero data although the mmc/sd card is still present. This patch add mmc_get_card() to make sure card really resume back when user cat ios or clock debugfs file node, then user can get the correct information. Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2017-06-09ARM: imx_v7_defconfig: overwrite with savedefconfig outputMihai Serban
The automated CI system will check if the configuration files are generated by the 'make savedefconfig' command from now on. We have to create a correct starting point to pass the checks. Signed-off-by: Mihai Serban <mihai.serban@nxp.com> Reviewed-by: Octavian Purdila <octavian.purdila@nxp.com>
2017-06-09MLK-14284 Fix CAAM Errata err005766 handlingRadu Solea
Update ERA detection code to check 3 sources CCBVID, CAAMVID and the device tree. Fix bit handling of CAAMVID data to obtain correct results. Remove default device tree values. Update errata handling to target known affected platforms. Signed-off-by: Radu Solea <radu.solea@nxp.com>