MLK-22205-3: media: ov5640: Fix the first some black frames issue

The first some frames will be black or have transparent green
layer on the image. It caused by sensor not stable after releasing
power down. So driver need to delay some time for different resolution
to wait sensor stable.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22205-2: media: ov5640: Gate clock lane when no packet to transmit

If clock lane is free running, we met MIPI CSI clock lane will enter
stop state even though sensor is transmitting data to it. In MLK-22108,
We fix the issue by calling ov5640_stop() which can force sensor lane
to LP11. We can refine the solution by setting 0x4800[5] in initialization
stage.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22205-1: media: ov5640: remove HW reset for ov5640

Remove hardware reset pin for ov5640. Because the level of ov5640
reset pin will be low when system suspend and will be high when
system resume. The action will lead to reset ov5640 to default.
In order to fix the issue, driver load firmware before streaming
on every time, the expense is taking more time.

According to OV5640 datasheet, a reset can also be initiated through
the SCCB interface by setting register 0x3008[7] to high. So driver
can remove the hard reset and saving time of loading firmware.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22109-3: media: Replace dispmix gpr with gasket node for imx8mn

Add gasket node for imx8mn and replace dispmix GPR with it. And remove
dispmix node since it's not needed any more.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22109-2: media: replace dispmix reset flow for ISI and MIPI CSI

After the dispmix reset driver development, the reset flow
is better to be replaced by using this driver to hide the
reset details for all the dispmix submodules, and whose
driver code for reset can become platform independent.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22109-1: arm64: dts: Define resets for ISI and CSI

The dispmix-reset device can be used to control the ISI and
CSIS bus reset and clock enable. So define 'resets' property
for both ISI and CSIS for this purpose which will be used to
replace 'dispmix_gpr' usage.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22130: media: ISI: Return error when the output width more than 2048

Because ISI of imx815 only have one channel, so the line buffer
chain function can not be used. The maximum supported line width
is 2048.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22115: media: Fix system hang issue

System will hang when disable ISI and CSI clock in ATF by dispmix GPR.
The value of dispmix GPR will be cleared when its power domain off/on
although driver set it in probe. So driver need to reset its value in
runtime resume callback.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22113: arm64: dts: add power domain for MIPI CSI of imx815

Add power domain for MIPI CSI of IMX8MN

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22110: arm64: dts: Remove redundant ISI node in dts for imx815

Because IMX8MN only support one ISI channel, so we need to remove
the others which planned to support before.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22108: media: sensor: Fix camera hang issue when do stress test

Camera will hang when do stress test. The state of MIPI DPHY
clock lane will enter stop state. Driver need to set clock
lane into LP11 mode when stream off.

Remove some unnecessary delay to improve performance.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-21886-4: media: ov5640: add sensor driver support for imx815

Add sensor driver support for imx815

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-21886-2: media: imx: Add imx815 platform support

Add imx815 platform support in camera media device framework
of imx8qxp/qm.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-21886-1: media: imx: add driver for mipi csi2 controller of SAMSUNG

Add driver for mipi csi2 controller of SAMSUNG

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>

MLK-22402 arm64: dts: imx8dxl-phantom-mek: enable M.2 WIFI/BT

Enable M.2 interface on the phantom-mek board.
- Support WiFi with PCIe interface
- Support Bluetooth with HCI UART

Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

MLK-22379: ARM64: dts: imx8dxl: Enable SAI/WM8960/ASRC

Correct the pinmux for SAI1
Remove AUDMIX/ESAI for they are not supported in imx8dxl
Configure fsl,sai-synchronous-rx for SAI1 according to pinmux
Enable ASRC p2p for SAI1

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22395 arm64: dts: imx8dxl-phantom-mek: correct the enet pin group

ENET1 pad ring register for compensation cell and voltage reference
is controlled by pin:
SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHB_PAD

- move the pin to enet pin group
- format the pin define as alignment
- move out below two pins to hoggrp
SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB0_PAD
SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB1_PAD

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

MLK-22364 brcmfmac: double check the D3 ACK state when wait event timeout

When system suspend, pcie bus write BRCMF_H2D_HOST_D3_INFORM cmd
into tcm32 mem to let host enter D3 mode, and wait the D3 ACK
interrupt. But sometime, the interrupt is comming lately then
cause wait event timeout, so double check the D3 ACK state.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

MLK-22394 clk: imx: correct the earlycon port index check

Correct the earlycon port index check.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Acked-by: Richard Zhu <hongxing.zhu@nxp.com>

MLK-20716 PCI: add quirk for cyw4356 to disable D3 mode

Add quirk for cyw4356 to disable D3 mode because current firmware
still doesn't support D3 mode.

After stress test, cyw4356 D3 mode still has timeout issue, so
cherry pick back the commit.

Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Shrikant Bobade <Shrikant_Bobade@mentor.com>
(cherry picked from commit 22212c60d7fb067e28a2fed16914515e3d6d3950)

MLK-22025-3 usb: chipidea: enter lpm when imx7d host suspend

This is the only platform we found has this remote wakeup issue,
so enable CI_HDRC_HOST_SUSP_PHY_LPM for it.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22025-2 doc: dt-binding: ci-hdrc-usb2: add compatible for imx8mm

imx8mm has 2 chipidea usb2 cores, add its compatible.

Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22025-1 usb: chipidea: phy enter low power mode when host suspend

On some imx host, if USB PHY is active when bus suspended, host may
have problem on taking over resume signal of remote wakeup from usb
device, resolve this by making PHY enter low power mode right after
bus suspended.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22356 arm64: dts: imx8mn: Correct typec node

Use the correct typec node properties according to typec driver
update.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22383 arm64: dts: enable rpmsg on imx8dxl mek board

Enable rpmsg on imx8dxl mek board.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>

MLK-22360 soc: imx8qm/imx8qxp: Fix power state of parent power domains

Fix power state of parent power domains that have no device
associated with them.

Current power domain driver does not work well in two cases:
1. A device is controlled by multiple power domains
2. Multiple devices are controlled by a single power domain that
is dependent on another power domain(s).

This patch attempts to fix these two issues.

Signed-off-by: Ranjani Vaidyanathan <ranjani.vaidyanathan@nxp.com>

MLK-22355: mfd: si476x: Use system_freezable_wq instead of system_wq

There is issue that system can't enter suspend while the si476x is
working.

The reason is that with the workqueue thread is still working after
i2c enter suspend, then cause the cpu_suspend function failed.

This patch is to use the system_freezable_wq instead of the system_wq,
that the workqueue will be freeze before system enter suspend.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22377 VPU Decoder: move crc and input_data dump file directory to /data/

In order to compatibility with Android system, move crc and input_data dump
file directory from /home/ and /tmp/ to /data/.

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>

MLK-22294: arm64: dts: add imx8dxl phantom mek board

Add DTBs to support imx8dxl phantom mek board.

Signed-off-by: Teo Hall <teo.hall@nxp.com>

MLK-22164-2 VPU Decoder: check input frame type before update to ring buffer

Previously, only process for RV format, other formats should also
be treated in the same way.

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>

MLK-22369-2 ARM: imx: Fix PMC module registers offset

The latest reference manual (Rev.0, 06/2019) shows PMC0
and PMC1 have different register offsets, clean them up.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>

MLK-22369-1 ARM: imx: Fix the offset for the PMC0 control register

The PMC0 control register is at offset 0x28, not 0x24.

Fix it accordingly.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>

MLK-22337 dts: clk: remove non-exist lvds1 recources for imx8qm

The patch 4e995ba0a954980 removes the non-exist recources for LVDS1, so
remove the usage of SC_R_LVDS_1_I2C_0/SC_R_LVDS_1_I2C_1 in dts, and
replace pd_lvds1_i2c with pd_lvds1 which is the parent in lvds_i2c node.

Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22370: VPU Decoder: export firmware dbglog using raw data instead of
string

we can use the debug tool analyze the raw dbglog.

Signed-off-by: ming_qian <ming.qian@nxp.com>
Reviewed-by: Shijie Qin <shijie.qin@nxp.com>

MLK-22314-2 VPU Decoder: add driver param to show decode performance

Show the interval from input first data to receive start_done
and seq_hdr_found event.

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>

MGS-5061 GPU: Integrate 6.4.0.RC2 kernel driver

Include more bug-fixings for Vulkan and NN driver

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>

MLK-22347 VPU Decoder: add Xvid format supprot

add Xvid format support, and vpu treat it as MPEG4.

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>

MLK-22346 clk: imx: Fix the initialization of flag variable

The flag variable must be initialized before used.
the 'OR' operation will cause unpredictable behavior.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-22344 arm64: dts: mark ocotp as read-only

It is easy to exploit system by allowing fuse program,
so let's mark as read-only. If pepole wanna fuse program,
just delete this property.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

MLK-22303 gpu: imx: dpu: common: Fix build warning when CONFIG_PM_SLEEP=n

This patch fixes the below build warning when CONFIG_PM_SLEEP=n.

  CC      drivers/gpu/imx/dpu/dpu-common.o
drivers/gpu/imx/dpu/dpu-common.c:831:1: warning: ‘_dpu_submodules_init’ defined but not used [-Wunused-function]
 _dpu_submodules_init(struct dpu_soc *dpu, struct platform_device *pdev)
 ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Liu Ying <victor.liu@nxp.com>

MLK-22333: ASoC: fsl_easrc: Support FLOAT_LE

The audio float point data range is (-1, 1), the asrc would output
all zero for float point input and integer output case, that is to
drop the fractional part of the data directly.

In order to support float to int conversion or int to float conversion
we need to do special operation on the coefficient to enlarge/reduce
the data to the expected range.

For float to int case:
Up sampling:
1. Create a 1 tap filter with center tap (only tap) of 2^31
   in 64 bits floating point.
   double value = (double)(((uint64_t)1) << 31);
2. Program 1 tap prefilter with center tap above.

Down sampling,
1. If the filter is single stage filter, add "shift" to the exponent of
   stage 1 coefficients.
2. If the filter is two stage filter , add "shift" to the exponent of
   stage 2 coefficients.

The "shift" is 31, same for int16, int24, int32 case.

For int to float case:
Up sampling:
1. Create a 1 tap filter with center tap (only tap) of 2^-31
   in 64 bits floating point.
2. Program 1 tap prefilter with center tap above.

Down sampling,
1. If the filter is single stage filter, subtract "shift" to the
   exponent of stage 1 coefficients.
2. If the filter is two stage filter , subtract "shift" to the
   exponent of stage 2 coefficients.

The "shift" is 15,23,31, different for int16, int24, int32 case.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 8a18a7a2dd1184814c6c61cb116f4d868b003447)

MLK-22315 VPU Decoder: add driver param to dump input frame data

module_param(vpu_datadump_ena, int, 0644);
MODULE_PARM_DESC(vpu_datadump_ena, "enable dump input frame data (0-1)");

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>

MLK-21976 nvmem: imx-scu-octop: implement program support

Implement program support.
Restruct code to check hole/ecc region.
Use ATF SIP to program fuse
Add mutex lock to protect access

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

MLK-22314 VPU Decoder: add driver param to show decode performance

module_param(vpu_show_perf_ena, int, 0644);
MODULE_PARM_DESC(vpu_show_perf_ena, "enable show vpu decode
performance(0-1)");
module_param(vpu_show_perf_idx, int, 0644);
MODULE_PARM_DESC(vpu_show_perf_idx, "show performance of which
instance(bit N to mask instance N)");
module_param(vpu_show_perf_ent, int, 0644);
MODULE_PARM_DESC(vpu_show_perf_ent, "show performance of which
event(1: decoded, 2: ready)");

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>

MLK-22312 VPU Decoder: correct insert seq header process for VP6 format

For VP6 format, the first input data shall including frame data,
hence should not drop it.

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>

MMFMWK-8572-2 VPU Decoder: not add frm_total_num if input data not including frame data

+MPEG4/MPEG2, the first input data also not including frame data

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>

MLK-13470 mfd: max17135: export symbols to fix build error as a module

export symbols to fix build error as a module:

ERROR: "max17135_reg_read" [drivers/hwmon/max17135-hwmon.ko] undefined!

Signed-off-by: Julien Olivain <julien.olivain@nxp.com>
Acked-by: Robby Cai <robby.cai@nxp.com>

MLK-22313: VPU Decoder: support rv and divx according firmware version

1.firmware decide whether it support rv and divx.
if firmware don't support, driver will disable these formats.

2. update copyright description

Signed-off-by: ming_qian <ming.qian@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>

MLK-22309-2 media: mxc-mipi-csi2: mark PM functions as __maybe_unused

fix build warnings if CONFIG_PM_SLEEP is disabled.

drivers/media/platform/imx8/mxc-mipi-csi2_yav.c:703:12: warning: 'mipi_csi2_pm_resume' defined but not used [-Wunused-function]
 static int mipi_csi2_pm_resume(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~
drivers/media/platform/imx8/mxc-mipi-csi2_yav.c:685:12: warning: 'mipi_csi2_pm_suspend' defined but not used [-Wunused-function]
 static int mipi_csi2_pm_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>

MLK-22309-1 media: mxc-parallel-csi: mark PM functions as __maybe_unused

fix build warnings if CONFIG_PM_SLEEP is disabled.

drivers/media/platform/imx8/mxc-parallel-csi.c:618:12: warning: 'parallel_csi_pm_resume' defined but not used [-Wunused-function]
 static int parallel_csi_pm_resume(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/imx8/mxc-parallel-csi.c:613:12: warning: 'parallel_csi_pm_suspend' defined but not used [-Wunused-function]
 static int parallel_csi_pm_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>

MLK-22186 clk: imx8qm: Remove non-exist clocks

There is no SC_R_LVDS_1_I2C_0/SC_R_LVDS_1_I2C_1 in SCFW, remove
those clocks which are associated with these non-exist resources.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit c242b208b0f7911c3dc0c40533d80847731c077e)

MMFMWK-8570: VPU Decoder: fix error in skip frames

the amount of REL_FRAME_BUFF event may be much bigger  the BUFF_RDY
event.
it means that some frame buffer are not used for decoding,
and firmware just release it directly.

The frame who is need to skip is decoded but not ready.

Signed-off-by: ming_qian <ming.qian@nxp.com>
Reviewed-by: Shijie Qin <shijie.qin@nxp.com>

include/linux/compiler_types.h: don't pollute userspace with macro definitions

Macros 'inline' and '__gnu_inline' used to be defined in compiler-gcc.h,
which was (and is) included entirely in (__KERNEL__ && !__ASSEMBLY__).
Commit 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually
exclusive") had those macros exposed to userspace, unintentionally.

Then commit a3f8a30f3f00 ("Compiler Attributes: use feature checks
instead of version checks") moved '__gnu_inline' back into
(__KERNEL__ && !__ASSEMBLY__) and 'inline' was left behind. Since 'inline'
depends on '__gnu_inline', compiling error showing "unknown type name
‘__gnu_inline’" will pop up, if userspace somehow includes
<linux/compiler.h>.

Other macros like __must_check, notrace, etc. are in a similar situation.
So just move all these macros back into (__KERNEL__ && !__ASSEMBLY__).

Note:
  1. This patch only affects what userspace sees.
  2. __must_check (when !CONFIG_ENABLE_MUST_CHECK) and noinline_for_stack
     were once defined in __KERNEL__ only, but we believe that they can
     be put into !__ASSEMBLY__ too.

Acked-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Xiaozhou Liu <liuxiaozhou@bytedance.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>

MLK-22306-2 dts: clks: imx8qxp: Fix clocks in the imaging subsystem.

Remove clocks that dont exist in imx8qxp.
Change clock names to match HW.

Signed-off-by: Ranjani Vaidyanathan <ranjani.vaidyanathan@nxp.com>

MLK-22306-1 clks: imx8qxp: Fix clocks in the imaging subsystem.

Remove clocks that dont exist in imx8qxp.
Change clock names to match HW.

Signed-off-by: Ranjani Vaidyanathan <ranjani.vaidyanathan@nxp.com>

MLK-22307 usb: chipidea: usbmisc: usb charger detection improvement

Improve the usb charger detection for imx7D/S and imx845s, which use
the same USB PHY, the main improvements:
1. Keep OPMODE override to be non-driving during the whole charger
   detection process according the USB PHY data sheet(Table 6-7
   Battery Charging Operations)
2. Disable DCDENB after data contact finished.
3. Use the BC 1.2 defined process for primary and secondary detection:
   - VDP_SRC is connected to USB_OTG*_DP and IDM_SINK is connected to
     USB_OTG*_DN, for primary detection;
   - VDM_SRC is connected to USB_OTG*_DN and IDP_SINK is connected to
     USB_OTG*_DP, for seconday detection.
   Check Battery Charger Detection Output bit(CHRGDET) to determine
   SDP/CDP/DCP.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit 7ca78ff4a324bb495e7d888640a0956c985ed04d)

arm64: dts: freescale: Disable the csi_bridge node in m4 dts on imx8mm

In M4 dts, the I2C3 is disabled by default, so the CSI camera sensor
is disabled too. it is not necessary to keep csi_bridge node enabled
anymore, just disable it.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Acked-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 93a7f9734d266920d5d1b6f09536021b1777c223)

MLK-22308 usb: typec: tcpci: mark PM functions as __maybe_unused

Fix build warning if CONFIG_PM_SLEEP is disabled:

  CC      drivers/usb/typec/tcpci.o
drivers/usb/typec/tcpci.c:849:12: warning: ‘tcpci_resume’ defined but
not used [-Wunused-function]
 static int tcpci_resume(struct device *dev)
            ^~~~~~~~~~~~
drivers/usb/typec/tcpci.c:837:12: warning: ‘tcpci_suspend’ defined but
not used [-Wunused-function]
 static int tcpci_suspend(struct device *dev)
            ^~~~~~~~~~~~~

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22280-2 usb: chipidea: usbmisc: remove mutex

Now charger detection is only for iMX7 which has separated
register area for each instance, register access is protected
by spinlock among APIs, so we can remove the mutex.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22280-1 usb: chipidea: usbmisc: add missing spin lock

Add missing spinlock for imx7d_charger_secondary_detection().

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>

MLK-22304-2 fbdev: mxsfb: fix build warnings if CONFIG_PM_SLEEP off

The system suspend and resume hooks is related with CONFIG_PM_SLEEP
instead of CONFIG_PM, so use CONFIG_PM_SLEEP to control the definitions
for them. And after this, the related overlay suspend and resume should
be defined under CONFIG_PM_SLEEP control. Below are the build warnings
before this patch.

drivers/video/fbdev/mxsfb.c:2463:12: warning: ‘mxsfb_resume’ defined but not used [-Wunused-function]
 static int mxsfb_resume(struct device *pdev)
            ^~~~~~~~~~~~
drivers/video/fbdev/mxsfb.c:2444:12: warning: ‘mxsfb_suspend’ defined but not used [-Wunused-function]
 static int mxsfb_suspend(struct device *pdev)
            ^~~~~~~~~~~~~

Signed-off-by: Fancy Fang <chen.fang@nxp.com>

MLK-22304-1 drm/imx: lcdif-dsim: fix build warnings if CONFIG_PM_SLEEP off

When CONFIG_PM_SLEEP is disabled, the suspend and resume hooks
are implemented as dummy functions, but GCC will report below
build warnings:

drivers/gpu/imx/lcdif/lcdif-common.c:731:12: warning: ‘imx_lcdif_suspend’ defined but not used [-Wunused-function]
 static int imx_lcdif_suspend(struct device *dev)
            ^
drivers/gpu/imx/lcdif/lcdif-common.c:735:12: warning: ‘imx_lcdif_resume’ defined but not used [-Wunused-function]
 static int imx_lcdif_resume(struct device *dev)
            ^
drivers/gpu/drm/imx/sec_mipi_dsim-imx.c:324:12: warning: ‘imx_sec_dsim_suspend’ defined but not used [-Wunused-function]
 static int imx_sec_dsim_suspend(struct device *dev)
            ^
drivers/gpu/drm/imx/sec_mipi_dsim-imx.c:329:12: warning: ‘imx_sec_dsim_resume’ defined but not used [-Wunused-function]
 static int imx_sec_dsim_resume(struct device *dev)
            ^

So remove these dummy functions to avoid these build warnings.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>

MLK-22302-5: regulator: pfuze100: fix build warning with CONFIG_PM_SLEEP=n

Fix build waring with CONFIG_PM_SLEEP=n.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit 9967e06ba509ba84fec4b3848341c58d1c4d740a)

MLK-22302-4: input: keyboard: pf1550_onkey: fix build warning with CONFIG_PM_SLEEP=n

Fix build waring with CONFIG_PM_SLEEP=n.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit fc6b26798579676f259aede42fb4aaecef9599ea)

MLK-22302-3: dmaengine: mxs-dma: fix build warning with CONFIG_PM_SLEEP=n

Fix build waring with CONFIG_PM_SLEEP=n.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit 3d4bb7eb025b18c8699e80a1a76226887120b198)

MLK-22302-2: dmaengine: fsl-edma-v3: fix build warning with CONFIG_PM_SLEEP=n

Fix build waring with CONFIG_PM_SLEEP=n.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit dfe2a755209615f9592ed937957b2efdc3b6d6c0)

MLK-22302-1: dmaengine: imx-sdma: fix build warning with CONFIG_PM_SLEEP=n

Fix build waring with CONFIG_PM_SLEEP=n.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit 14ba28430da19e26445e05ae77195d88f1a0e7cf)

MLK-22284-3 ARM64: dts: freescale: imx8dx/qm: split dma channel power domain

Split dma channel power domain from sub-domain of dma customer driver
such as Audio, LPSPI, LPUART.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: S.j. Wang <shengjiu.wang@nxp.com>
(cherry picked from commit b76f339fdf91fe44066c2c820e4def07f47d159c)

MLK-22284-2 dmaengine: fsl-edma-v3: check dma description before register touch

Check dma desscription firstly to ignore any unexpected interrupt
after channel terminate, otherwise, still have chance to touch channel
register whose power has been already off.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: S.j. Wang <shengjiu.wang@nxp.com>
(cherry picked from commit fd073e017e317006a4c254ca5ae3ea17b6f32502)

MLK-22284-1 dmaengine: fsl-edma-v3: add power domains for each channel

Add power domains for each dma channel so that edma channel could
know the power state of every dma channel anytime and clear easily
unexpected interrupt which triggered before the last partition reset.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: S.j. Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 0b6da46b7bdb2284e24757d48466268b9feb5b7c)

MLK-22301 VPU: Fix build warning when CONFIG_PM_SLEEP=n

Fixing unused compiler warning for
decode: vpu_suspend() and vpu_resume()
encode: vpu_enc_suspend() and vpu_enc_resume()

Signed-off-by: Shijie Qin <shijie.qin@nxp.com>
Reviewed-by: ming_qian <ming.qian@nxp.com>

MLK-22300: [i.MX8M/VPU]: Fixing compiler warning when pm sleep is disabled

Fixing unused compiler warning for xxx_suspend()/xxx_resume(), include
850Dg1g2(hantrodec.c)/845g1g2(hantrodec_845s.c)/845h1(hx280enc.c)

Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>

MLK-21076-8 rtc: imx-sc: Fix build error when CONFIG_PM_SLEEP=n

Fix below build error when CONFIG_PM_SLEEP=n:

drivers/rtc/rtc-imx-sc.c:210:9: error: ‘IMX_SC_RTC_PM_OPS’ undeclared here (not in a function)
   .pm = IMX_SC_RTC_PM_OPS,
         ^
scripts/Makefile.build:326: recipe for target 'drivers/rtc/rtc-imx-sc.o' failed
make[2]: *** [drivers/rtc/rtc-imx-sc.o] Error 1
make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit 0550943f8c145072580bd103ff3fdd74eb5cb807)

MLK-21076-7 pinctrl: imx8mn: Fix build warning when CONFIG_PM_SLEEP=n

Fix below build warning when CONFIG_PM_SLEEP=n:

drivers/pinctrl/freescale/pinctrl-imx8mn.c:355:12: warning:
 ‘imx8mn_pinctrl_suspend’ defined but not used [-Wunused-function]
 static int imx8mn_pinctrl_suspend(struct device *dev)
            ^
drivers/pinctrl/freescale/pinctrl-imx8mn.c:360:12: warning:
 ‘imx8mn_pinctrl_resume’ defined but not used [-Wunused-function]
 static int imx8mn_pinctrl_resume(struct device *dev)
            ^

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit 6f84c2d2d1e30d8f3cf68245fa1f12dfac8b6a8e)

MLK-21076-6 pinctrl: imx8mm: Fix build warning when CONFIG_PM_SLEEP=n

Fix below build warning when CONFIG_PM_SLEEP=n:

drivers/pinctrl/freescale/pinctrl-imx8mm.c:355:12: warning:
 ‘imx8mm_pinctrl_suspend’ defined but not used [-Wunused-function]
 static int imx8mm_pinctrl_suspend(struct device *dev)
            ^
drivers/pinctrl/freescale/pinctrl-imx8mm.c:361:12: warning:
 ‘imx8mm_pinctrl_resume’ defined but not used [-Wunused-function]
 static int imx8mm_pinctrl_resume(struct device *dev)
            ^

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit a4745f292da5bcaae3d75e3ac8b293c71fe7dcb1)

MLK-21076-4 regulator: pfuze100: Fix build warning when CONFIG_PM_SLEEP=n

Fix below build warning when CONFIG_PM_SLEEP=n:

drivers/regulator/pfuze100-regulator.c:743:12: warning:
 'pfuze_resume' defined but not used [-Wunused-function]
 static int pfuze_resume(struct device *dev)
            ^~~~~~~~~~~~
drivers/regulator/pfuze100-regulator.c:717:12: warning:
 'pfuze_suspend' defined but not used [-Wunused-functio ]
 static int pfuze_suspend(struct device *dev)
            ^~~~~~~~~~~~~

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit 36fb6ba8ad9f3a5eb6d883e53c5bb42cd5aec3ce)

MLK-21076-3 pinctrl: imx7d: Fix build warning when CONFIG_PM_SLEEP=n

Fix below build warning when CONFIG_PM_SLEEP=n:

drivers/pinctrl/freescale/pinctrl-imx7d.c:400:12: warning:
'imx7d_pinctrl_resume' defined but not used [-Wunused-function]
 static int imx7d_pinctrl_resume(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/freescale/pinctrl-imx7d.c:394:12: warning:
 'imx7d_pinctrl_suspend' defined but not used [-Wunused-function]

 static int imx7d_pinctrl_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit 219d360b02f74e210c8382de5c8061d660b14241)

MLK-21076-2 thermal: imx: Fix build warning when CONFIG_PM_SLEEP=n

Fix below build warning when CONFIG_PM_SLEEP=n:

drivers/thermal/imx_thermal.c:243:12: warning: 'imx7_lpsr_save'
defined but not used [-Wunused-variable]

 static u32 imx7_lpsr_save[2];
            ^~~~~~~~~~~~~~
  AR      drivers/spi/built-in.o

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit e4a858fb57a2460af3c615647828f9f32e532097)

MLK-21076-1 rtc: imx-rpmsg: Fix build error when CONFIG_PM_SLEEP=n

drivers/rtc/rtc-imx-rpmsg.c:374:9:
error: 'IMX_RPMSG_RTC_PM_OPS' undeclared here (not in a function);
did you mean 'IMX8_RPMSG_RTC_PM_OPS'?

   .pm = IMX_RPMSG_RTC_PM_OPS,
         ^~~~~~~~~~~~~~~~~~~~
         IMX8_RPMSG_RTC_PM_OPS

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
(cherry picked from commit 86aba1097ae69ff75999bddc3c3b0ad6c0bc7e2e)

MLK-22295-2: ASoC: fsl_easrc: Fix build warning with CONFIG_PM_SLEEP=n

Fix build warning with CONFIG_PM_SLEEP=n, the message is

In file included from sound/soc/fsl/fsl_easrc.c:2204:0:
sound/soc/fsl/fsl_easrc_m2m.c:960:13: warning: ‘fsl_easrc_m2m_resume’ defined but not used [-Wunused-function]
 static void fsl_easrc_m2m_resume(struct fsl_easrc *easrc)
             ^~~~~~~~~~~~~~~~~~~~
sound/soc/fsl/fsl_easrc_m2m.c:927:13: warning: ‘fsl_easrc_m2m_suspend’ defined but not used [-Wunused-function]
 static void fsl_easrc_m2m_suspend(struct fsl_easrc *easrc)
             ^~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 0b6e34f8aaac3a6e5a5e1459a9fc6a42d8a8c127)

MLK-22295-1: ASoC: fsl_asrc: fix build warning with CONFIG_PM_SLEEP=n

fix build warning with CONFIG_PM_SLEEP=n, the warning message is

In file included from sound/soc/fsl/fsl_asrc.c:968:0:
sound/soc/fsl/fsl_asrc_m2m.c:1021:13: warning: ‘fsl_asrc_m2m_resume’ defined but not used [-Wunused-function]
 static void fsl_asrc_m2m_resume(struct fsl_asrc *asrc_priv)
             ^~~~~~~~~~~~~~~~~~~
sound/soc/fsl/fsl_asrc_m2m.c:990:13: warning: ‘fsl_asrc_m2m_suspend’ defined but not used [-Wunused-function]
 static void fsl_asrc_m2m_suspend(struct fsl_asrc *asrc_priv)
             ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit a3ec5433cfd6fd2b90113a78d5045e04f6a8328c)

MLK-22296-5 irqchip: irqsteer: Fix build warning when CONFIG_PM_SLEEP=n

Fix build warning when CONFIG_PM_SLEEP=n, the warning message is:
drivers/irqchip/irq-imx-irqsteer.c:104:13: warning: ‘imx_irqsteer_init’ defined but not used [-Wunused-function]
 static void imx_irqsteer_init(struct irqsteer_irqchip_data *irqsteer_data)
             ^~~~~~~~~~~~~~~~~

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22296-4 misc: mpl3115: Fix build warning when CONFIG_PM_SLEEP=n

Fix build warning when CONFIG_PM_SLEEP=n, the warning message is:
drivers/input/misc/mpl3115.c:290:12: warning: ‘mpl3115_start_chip’ defined but not used [-Wunused-function]
 static int mpl3115_start_chip(struct i2c_client *client)
            ^~~~~~~~~~~~~~~~~~

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22296-3 misc: fxls8471_i2c: Fix build warning when CONFIG_PM_SLEEP=n

Fix build warning when CONFIG_PM_SLEEP=n, the warning message is:
drivers/input/misc/fxls8471_i2c.c:77:12: warning: ‘fxls8471_i2c_resume’ defined but not used [-Wunused-function]
 static int fxls8471_i2c_resume(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~
drivers/input/misc/fxls8471_i2c.c:71:12: warning: ‘fxls8471_i2c_suspend’ defined but not used [-Wunused-function]
 static int fxls8471_i2c_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22296-2 i2c: lpi2c: Fix build warning when CONFIG_PM_SLEEP=n

Fix build warning when CONFIG_PM_SLEEP=n, the warning message is:
drivers/i2c/busses/i2c-imx-lpi2c.c:515:20: warning: ‘lpi2c_imx_isr’ defined but not used [-Wunused-function]
 static irqreturn_t lpi2c_imx_isr(int irq, void *dev_id)
                    ^~~~~~~~~~~~~

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22296-1 i2c: i2c-imx: Fix build warning when CONFIG_PM_SLEEP=n

Fix build warning when CONFIG_PM_SLEEP=n, the warning message is:
drivers/i2c/busses/i2c-imx.c:1299:12: warning: ‘i2c_imx_resume’ defined but not used [-Wunused-function]
 static int i2c_imx_resume(struct device *dev)
            ^~~~~~~~~~~~~~
drivers/i2c/busses/i2c-imx.c:1293:12: warning: ‘i2c_imx_suspend’ defined but not used [-Wunused-function]
 static int i2c_imx_suspend(struct device *dev)
            ^~~~~~~~~~~~~~~

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>

MLK-22299 pci: imx: fix build error when CONFIG_PM_SLEEP=n

drivers/pci/controller/dwc/pci-imx6.c:2826:2: error: implicit
declaration of function ‘pci_imx_set_msi_en’
[-Werror=implicit-function-declaration]
pci_imx_set_msi_en(&pci->pp);
^
drivers/pci/controller/dwc/pci-imx6.c: At top level:
drivers/pci/controller/dwc/pci-imx6.c:2857:10: error:
‘pci_imx_pm_ops’ undeclared here (not in a function)
.pm = &pci_imx_pm_ops,
    ^
cc1: some warnings being treated as errors

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>

MLK-22297: [i.MX6/VPU]: Fixing compiler warning when pm sleep is disabled

Fixing unused compiler warning for vpu_suspend() and vpu_resume()

Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>

MGS-5051 Modify the GPU CLK from 500M to 600M for IMX8MN(815) board

At IMX8MN(815) we need to Increase GPU CLK frequency to match the overdrive mode.
The SOC default setting is overdrive mode,and GPU 600M is corresponding to overdrive mode.

Signed-off-by: Minjie Zhuang <minjie.zhuang@nxp.com>

MGS-4868 [#ccc] enable userspace register read

In v6.2.4, userspace register access was controlled by defining
gcdREGISTER_ACCESS_FROM_USER, enabled by default.

This changed in v6.4.0 where gcdREGISTER_ACCESS_FROM_USER is replaced by
gcdREGISTER_READ_FROM_USER and gcdREGISTER_WRITE_FROM_USER,
both disabled by default.

For the moment, gputop uses userspace register access ioctl to
read the GPU performance counters.

Signed-off-by: Adrian Negreanu <adrian.negreanu@nxp.com>

MLK-22254: ASoC: fsl_easrc: Fix issue reported by coverity

Fix issue reported by coverity:
a. Resource leak for ctx is not freed when m2m allocation
failed
b. Use of untrusted scalar value

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

MLK-22242: fsl_easrc: Fix definition issue of parameter width

Some definition of parameter's width is wrong, that cause the
failure of conversion for more than 16 channels.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

MLK-22243: fsl_easrc: Add lock to protect configuration of slot

With multi-instance case, the fsl_easrc_config_slot will be called
in parallel, the fsl_easrc_slot is independent with context, so
we need to lock to protect the access of fsl_easrc_config_slot,
otherwise, the slot configuration will be fail for some instance
that cause "input DMA task timeout".

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

MLK-22161: fsl_easrc: Remove float point format support

The input audio float data range is normalized to (-1, 1), but
the hardware will drop to fractional part if output format
is integer format, so the output is all zero, which does not flow
the normal audio case, that to shift the output to Q15/Q31.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22160: fsl_easrc: Remove Big endian support

The hardware don't support big endian format. which only
support bit reverse.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22239-3: ASoC: fsl_asrc: Support S24_3LE for m2m

Support S24_3LE for m2m with SDMA, but add constraint
for EDMA case, for EDMA don't support 3bytes copy.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22239-2: ASoC: fsl_easrc: Support S24_3LE and S20_3LE for m2m

upport S24_3LE and S20_3LE for m2m.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

MLK-22239-1: dmaengine: imx-sdma: Support 24bit/3bytes for sg mode

Support 24bit/3bytes for sg mode.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Robin Gong <yibin.gong@nxp.com>

MLK-22168-2: fsl_easrc：fix timeout issue if STOP_CONV is not called

When error happen, user may not call STOP_CONV to stop the context,
then there will be "input DMA task timeout" issue for next m2m task.

In this patch, fsl_easrc_stop_context is called in RELEASE_PAIR to
make sure context is stopped.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

MLK-22168: fsl_easrc：Add error handle for format check

Add error handler for format check, if the format is not supported
should return error, otherwise it cause "input DMA task timeout"

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>