MLK-17473-7 drm/imx: dec400d: avoid shadow trigger when bypass dec400d
Do not really do shadow regiters trigger in'dcss_dec400d_shadow_trig()'
when dec400d is bypassed, since in 'dcss_dec400d_bypass()', the shadow
registers have already been triggerd.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit aa7dc185500f533d4a73eebc7cdf17d4b2ba8cee)
MLK-17480: hdp: Change dp_vic to int variable
Change dp_vic to int variable.
sync data type with the return variable of function imx_get_vic_index.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
MLK-17473-6 drm/imx: dcss: remove 'allow_fb_modifiers' assignment
Since the 'allow_fb_modifiers' has been assigned to be true in
imx drm core driver in bind(), it is not necessary to set this
flag again here.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 048353ac400fb6cee8f6571cca7750d87d5dbe69)
MLK-17473-5 drm/imx: core: allow fb modifiers for DCSS
Set the 'allow_fb_modifiers' flag to be true when DCSS
exists to make the format modifiers blob data can be
created correctly during the plane initialization.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 6bb6e9125fa4b48c648908e3b521230ff3a75022)
MLK-17473-4 drm/imx: dcss: handle tiled and compressed layout for primary plane
Add handling code to support tiled and compressed pixel source
layout. The tiled only layout will bypass DEC400D and be resolved
by DPR, since DEC400D is only responsible for decompression.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit c050596e49630b30c846f3d728cf6a52a9581754)
MLK-17473-3 drm/imx: dcss: remove 'dcss_plane_mod_supported()'
The 'dcss_plane_mod_supported()' function is duplicated with
another function 'dcss_plane_format_mod_supported()'. So remove
it and use 'dcss_plane_format_mod_supported()' to replace its
calling.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 2bf0f8b8bcbb8e7d50adb815bb29e895fd31c45f)
MLK-17473-2 drm/imx: dcss: add modifiers support for primary plane
Add four possible modifiers 'linear', 'tiled', 'super tiled'
and 'compressed super tiled' for the primary plane which can
be de-compressed by DEC400D and de-tiled by DPR. And also
change the 'dcss_plane_format_mod_supported()' to handle these
modifiers.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit abb353ef91cdfa7135113b3eb823f5bb87a226de)
MLK-17473-1 drm/fourcc: add modifier for vivante compressed tiled layout
Add a new fb modifier for Vivante compressed and tiled
pixle layout which can be decompressed by DEC400D module
in DCSS.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit af5ae3dd0df306d4ee9869aefe9c8154a67fca42)
MLK-15033-1: ASoC: fsl: Change rate constraints in TDM mode for AK4458
When in TDM mode, change constraints for rate and allow only
rates in [8KHz, 96KHz] due to the limitations of SAI master
clock. If rate is higher than 96KHz, the TX rate cannot be
obtained using only a 49MHz SAI clock.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
(cherry picked from commit 3b3a58df8bc6f019ca48acc5e4405e9e71871a6c)
MGS-3255: gpu-viv: enable command commit worker for 6.2.4.p1
This feature is initialy created and enabled for 6.2.4 GPU driver,
Need re-enable GPU command commit worker for 6.2.4.p1 driver version.
i.MX8QM dual GPU SW workaround since no command sharing HW fix in B0,
optimized driver to improve GPU benchmark with better performance.
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit 2b20dff2514aa7f8f18a6c42451e43b637425e40)
MLK-17455: ARM64: dts: correct the pinctrl setting for audio peripheral
According to the Reference manual, the bit 1-4 of PAD setting is reserved.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 908cdceaa0dbf01569f373d63016cdd428e9178b)
MLK-15071: ASoC: imx-ak5558: Add support for 384KHz and 768KHz
In normal mode we need to test SAI capability of supporting
higher rates so adjust constraints list to allow 384KHz
and 768KHz.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 8ac0d9d8a46d4fff946b5c622722af4aefb960b3)
MLK-15033: ASoC: fsl: Change constraints for AK4458
Add 384KHz and 768KHz as supported rates and add
different constraints for number of channels when
in tdm mode.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 5d73af7139d5353ef708306269b6425a34ca8c95)
MLK-17462-4: ARM64: dts : support TDM mode for audio board.
Use a separate dts for tdm mode for ak4458.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit de6344dc975a5d7842d0e8138e5abe3557fa09d6)
MLK-15033: ASoC: fsl: Add TDM support in machine driver for AK4458
TDM mode is enabled when "fsl,tdm" property is added in machine
driver dts node. When using TDM mode, SND_SOC_DAIFMT_DSP_B format
is used and the tdm slot_width is set to 32.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 6bc3fe5047d7d0296d7311f3113a68d47f2b6b91)
MLK-15033: ASoC: codecs: Add TDM support for AK4458
Based on slot_width and params_width, we will set
the format and TDM mode as specified in AK4458
datasheet.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 0cd91cf3b6ae0d0cb2f9369d816eb1e4091f33a2)
MGS-3627 [#imx-911] "Could not open egl display" when run monkey test case for long time.
The root cause is that each time an application runs, the gpu driver will map reserved memory 128M to
the application virtual memory space, which means it need the system have at least 128M physical memory available,
otherwise the shmem_zero_setup will fail. Add MAP_NORESERVE flag to fix this problem.
Date: Jan 30, 2017
Signed-off-by: Yuchou Gan yuchou.gan@nxp.com
MLK-17472: ASoC: imx-wm8962: fix build warning
sound/soc/fsl/imx-wm8962.c: In function ‘imx_wm8962_probe’:
sound/soc/fsl/imx-wm8962.c:810:2: warning: ‘cpu_np’ may be used uninitialized in this function [-Wmaybe-uninitialized]
of_node_put(cpu_np);
^~~~~~~~~~~~~~~~~~~
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 9a4ff64a23430c65f69a7e9a7aa23bec9146edfa)
MLK-17108-4 staging: typec: tcpci: correct read data msg length
Per tcpci spec, the TCPC_RX_BYTE_CNT is the number of bytes in the
RX_BUFFER_DATA_OBJECTS plus three (for the RX_BUF_FRAME_TYPE and
RX_BUF_HEADER), so after read out the header, we should only read
TCPC_RX_BYTE_CNT-3 bytes for data if this is a data message.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit 73766b76d97bc86d126fcbde9e3837a8f47ffbb6)
MLK-17108-3 staging: typec: tcpci: don't do force discharge if enable vbus sink
We use vbus force discharge to have a quick vbus off for power role swap,
which works like this: enable vbus force discharge and wait the vbus fall
below vbus low threshold, when reaches, an alarm generated and tcpm can go
forward. but current code do vbus force discharge in any disable source
vbus case, in enable vbus charge case, we firstly disable source vbus and
then turn on vbus sink, in between, vbus force ...
MLK-17108-2 staging: typec: support dead battery charging
If the vbus is aready on and remote cc state is Rp while typec init, we
think it's a dead battery case, this needs the PD session already setup
by bootloader, so kernel can negotiate a new power session by soft reset,
this patch use the exsiting flag vbus_never_low as boot from dead battery
flag, but update the condition of setting it: not only check vbus, also
the cc status to make sure remote is a power source, if yes, bypass the
v...
MLK-17108-1 ARM64: dts: imx8mq-evk: increase i2c1 clock to be 400K
As the typec port controller interface(TCPCI) spec requires the i2c clock
at least to be 400K, so here increase it to be 400K to meet timing
requirement.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit 2857b6e5a605e40a65b3961e15b8949604433de9)
MLK-16224-6: ASoC: fsl_sai: fix DSD suspend/resume
With the existing implementation the SAI pinctrl state is restored to
default after resume - this breaks DSD playback after resume.
Restore DSD pinctrl state in snd_soc_dai_driver resume callback.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit dceed1331e8eed49850c903531a2dfe4f30843d9)
MLK-17462-4: ARM64: dts : support TDM mode for audio board.
Use a separate dts for tdm mode for ak5558.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit b46544a60ea3a4f64e11485fd5d45981210d93e6)
MLK-17462-3: ASoC: imx-ak5558: support TDM mode
add fsl,tdm property, in tdm mode, the slot_width is fixed to
32 bit.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 2f3c51267ffb4dfa065054aba22857d023aa328e)
MLK-17462-2: ASoC: ak5558: support SND_SOC_DAIFMT_DSP_B format for TDM
Add set_tdm_slot function for TDM mode, and support
SND_SOC_DAIFMT_DSP_B format
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit c5c19fbd7b63cdc0c2c36c8ae735c5d61d30b15d)
MLK-17462-1: ASoC: AK5558: revert the fix for 8k and 16kHz.
Revert commit 38078b6549c7 ("MLK-17428-4: ASoC: AK5558: fix
issue for 8k and 16kHz")
With this patch, there will be issue with PDM mode, cause the codec can't
work sometimes, the phenomenon is the register read failed.
So we revert this patch, and we will enable the pm_runtime function, which
should also fix the 8k and 16khz can't work issue in normal mode.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from ...
MLK-17470: ASoC: ak4497: automatically select dsdsel in driver
automatically select dsdsel in driver according to the frequency
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 69201427e188fa561f3457d71e4d6ec3cf8adddf)
MLK-17467: ASoC: fsl_sai: fix typo for fsl_sai
Fix build warning
sound/soc/fsl/fsl_sai.c: In function ‘fsl_sai_trigger’:
sound/soc/fsl/fsl_sai.c:736:3: warning: this ‘while’ clause does not guard... [-Wmisleading-indentation]
while (tx && i < channels)
^~~~~
sound/soc/fsl/fsl_sai.c:742:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘while’
j++;
^
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 56b...
MLK-17445: ASoC: ak4497: let codec start/stop properly
Let the codec start/stop properly before syncing
regmap with codec registers.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 55adc8bdb707fbe9e4b6214f854a71ccf2927c0a)
MLK-17463: ASoC: codecs: ak5558: Add runtime PM support
Based on latest power management design in MLK-17074,
every driver need to enter runtime suspend state before
entering system suspend, so the driver should call the
pm_runtime_force_suspend in suspend.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
(cherry picked from commit 61418bf8ce108d7509e73ace1a6070f5e94d3e40)
MGS-3622 [#imx-905] fix gpu gc_hal_kernel_platform_imx.c license error
The GPU kernel driver file gc_hal_kernel_platform_imx.c license is incorrect,
Need fix it with GPL and MIT license statement.
Date: Jan 29, 2017
Signed-off-by: Yuchou Gan yuchou.gan@nxp.com
MGS-3617 [#ccc] Disable the depth compression for imx8 board
This is the requirement for MGS-2914, but will cause cts failure and be reverted later.
New gpu driver 6.2.4.p1.pre2 has fixed the cts failure issue so we disable it again.
Date: Jan 26, 2017
Signed-off-by: Yuchou Gan yuchou.gan@nxp.com
MGS-3616 [#ccc] Integrate 6.2.4.p1.pre2 hal driver to linux kernel
Update the gpu kernel to 6.2.4.p1.pre2
Date: Jan 26, 2017
Signed-off-by: Yuchou Gan yuchou.gan@nxp.com
MLK-17461-3: hdp: Remove pixel clock root setting
HDMI pixel clock reparent function have implemented in dts,
remove clock root set function from hdp driver.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit 48f20bd545bd026b2139a9f1e4498def50d7bb5e)
MLK-15033: ASoC: ak4458: add pm_runtime support
Add pm_runtime support for AK4458 codec. Based on latest power
management design in MLK-17074, every driver need to enter
runtime suspend state before entering system suspend, so the
driver should call the pm_runtime_force_suspend in suspend.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
MLK-17445: ASoC: ak4497: add pm_runtime support
Add pm_runtime support fo AK4497 codec. Based on latest power
management design in MLK-17074, every driver need to enter
runtime suspend state before entering system suspend, so the
driver should call the pm_runtime_force_suspend in suspend.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
MLK-17456-1: hdp: Enable EDID read function for imx8mq hdmi
-Enable EDID read function for imx8mq hdmi.
-Add video mode check.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
MLK-17457: arm64: dts: enable usb otg for imx8mq ddr4 arm2
enable the usb otg for mfgtool download on imx8mq ddr4 arm2 board.
Signed-off-by: Han Xu <han.xu@nxp.com>
MLK-15071: ASoC: codecs: AK5558: Remove unsuported rates and channels
Support only even number of channels greater than 2 and
rates multiple of 8000.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
MLK-17453 arm64: dts: increase i2c pad drive strength
Too many i2c slaves are conencted to imx8qm i2c0 and
imx8qxp lpi2c1. So i2c pad drive strength should be
increased. Otherwise, there will be i2c probe error.
Reported-by: Andy Tian <yang.tian@nxp.com>
Tested-by: Andy Tian <yang.tian@nxp.com>
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
MLK-17452 clk: imx: imx7ulp: update nic1_divbus clock for B0
On i.MX7ULP B0 chip, nic1_divbus's parent is changed to
from nic0_div directly, update it accordingly.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
MLK-17450 - [i.MX8MQ/Hantro]: Support voltage adjustment
Update vpu voltage to 1.0v for 600M+ clock
Otherwise, keep 0.9v voltage
Signed-off-by: Zhou Peng-B04994 <eagle.zhou@nxp.com>
MLK-17447 drivers: soc: imx: Fix busfreq mutex unlock twice on imx8mq
A 'return' statement is missed before, So the mutex will be unlocked
twice, in some corner case, one core will unlock the mutex that locked
by anohter core wrongly. Then lead to concurrent access to the DVFS
at the same time.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16224-8: ARM64: dts: support DSD for ak4497
For most DSD sample rate is mulitply of 44k, so specify PLL2
for DSD usage. for pinmux is different for DSD mode compare with
PCM mode, define a new pinmux group for DSD.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
