MLK-21149-02 arm64: dts: imx: fix the build warning of endpoint on imx8mm

Fix the build warning of endpoint to follow the device tree spec.

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

MLK-21149-01 arm64: dts: imx: update the usdhc compatible string on imx8mm

The usdhc controller on i.MX8MM is compatible with i.MX7D, so update
the compatible property.

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

MLK-18617-3 pwm: imx: Use 32k clock if it is supplied

The PWM in i.MX8qxp MIPI subsystem needs to use the
'32k' clock to work properly.  This patch gets this
clock in the PWM driver and uses it if it is supplied.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit a343cc44ee9aa4be408c51b02176c8d0970a698d)

Conflicts:
drivers/pwm/pwm-imx.c

MLK-18627 pwm: imx: Add clk_ipg for imx8qm

As part of converting the imx pwm driver to an atomic apply function the
code handling ipg clock was dropped. Add it back because on imx8qm it is
indeed required.

This fixes the same issue as imx_4.9.y commit
ce627dbfd76e ("MLK-16973-4 pwm: imx: Use ipg and per clks in ->config, ->enable and ->disable")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reported-by: Marius Vlad <marius-cristian.vlad@nxp.com>
Tested-by: Marius Vlad <marius-cristian.vlad@nxp.com>
Reviewed-by: Liu Ying <victor.liu@nxp.com>

MLK-21148-3 arm64: defconfig: enable i.MX SC RTC

Select i.MX SC RTC by default.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

MLK-21148-2: soc: imx: enable SCU notifier

Enable i.MX8 SCU notifier for handling general MU
irq event.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

MLK-21148-1 arm64: dts: imx8qm: correct isi irq type setting

GIC irqchip driver introduces the warning when IRQ type is
set to IRQ_TYPE_NONE while it is NOT belonging to GIC_IRQ_TYPE_PARTITION,
the ISI irqs' setting trigger below WARNING during kernel boot
up, set ISI irqs type to IRQ_TYPE_LEVEL_HIGH to avoid such
warning during kernel bootup, the GIC driver ONLY supports
IRQ_TYPE_LEVEL_HIGH and IRQ_TYPE_EDGE_RISING for SPIs actually.

drivers/irqchip/irq-gic-v3.c:
WARN_ON(*type == IRQ_TYPE_NONE &&
fwspec->param[0] != GIC_IRQ_TYPE_PARTITION);

[    0.650117] WARNING: CPU: 3 PID: 1 at drivers/irqchip/irq-gic-v3.c:975
 gic_irq_domain_translate+0xa8/0x110
[    0.659434] Modules linked in:
[    0.662478] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 4.19.26-04846-g3ebadee #216
[    0.669944] Hardware name: Freescale i.MX8QM MEK (DT)
[    0.674984] pstate: 00000005 (nzcv daif -PAN -UAO)
[    0.679759] pc : gic_irq_domain_translate+0xa8/0x110
[    0.684717] lr : irq_create_fwspec_mapping+0x64/0x33c
[    0.689747] sp : ffff00000806b890
[    0.693049] x29: ffff00000806b890 x28: ffff8008f81264c0
[    0.698349] x27: 0000000000000000 x26: 0000000000000001
[    0.703647] x25: ffff8008f81264c0 x24: ffff0000094b8000
[    0.708946] x23: 0000000000000000 x22: ffff00000806b908
[    0.714246] x21: ffff8008fff77d00 x20: ffff0000094b8000
[    0.719545] x19: ffff8008f9824000 x18: ffff00000923a000
[    0.724844] x17: ffff000009239000 x16: ffff000009239948
[    0.730144] x15: 0000000000000001 x14: ffffffffffffffff
[    0.735443] x13: 000000000000030f x12: 0000000000000000
[    0.740742] x11: 0000000000000030 x10: 0101010101010101
[    0.746042] x9 : 0000000000000006 x8 : 7f7f7f7f7f7f7f7f
[    0.751341] x7 : 0000000000000000 x6 : 0000000000000092
[    0.756641] x5 : ffff000008485f14 x4 : ffff000008f9a0a0
[    0.761940] x3 : ffff00000806b8cc x2 : 0000000000000000
[    0.767240] x1 : 00000000a110c8ee x0 : 0000000000000000
[    0.772542] Call trace:
[    0.774976]  gic_irq_domain_translate+0xa8/0x110
[    0.779580]  irq_create_of_mapping+0x80/0xa8
[    0.783841]  of_irq_get+0x70/0xe4
[    0.787138]  of_irq_to_resource+0x38/0xfc
[    0.791134]  of_irq_to_resource_table+0x4c/0x68
[    0.795655]  of_device_alloc+0x120/0x1b8
[    0.799562]  of_platform_device_create_pdata+0x7c/0x11c
[    0.804774]  of_platform_bus_create+0x140/0x388
[    0.809289]  of_platform_bus_create+0x1a0/0x388
[    0.813806]  of_platform_populate+0x50/0xd4
[    0.817983]  of_platform_default_populate_init+0xbc/0xd0
[    0.823280]  do_one_initcall+0x58/0x168
[    0.827104]  kernel_init_freeable+0x1b4/0x274
[    0.831446]  kernel_init+0x10/0x104
[    0.834921]  ret_from_fork+0x10/0x18
[    0.838482] ---[ end trace 52dbd1b75308ae5a ]---

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

MLK-21109 arm64: Kconfig: All imx8 HAVE_IMX_RPMSG

This was skipped during initial boot-to-prompt porting

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-11 arm64: defconfig: Enable more drivers from imx_4.14.y

The initial import of imx_4.14.y arm64 defconfig was ahead of actually
enabling imx for arm64 so many drivers were disabled.

Import again to enable more drivers.

Following are still disabled:

 * SND_SOC_AK4497: Does not compile
 * SND_SOC_IMX_DSP: Does not compile
 * EXTCON_PTN5150: Does not compile
 * SPI_FSL_FLEXSPI: Does not compile
 * REGULATOR_BD71837: Does not compile
 * KEYBOARD_IMX_SC_PWRKEY: Does not compile
 * RTC_DRV_IMX_SC: Does not compile
 * VIDEO_MXC_CSI_CAMERA: Does not link
 * CRYPTO_DEV_FSL_CAAM: Abort on probe

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-10 PCI: imx: Simplify PCI_IMX6 depends on

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64.

Simplify PCI_IMX6 "depends on" to just "ARCH_MXC || COMPILE_TEST" and
make it actually build on imx8.

Fixes: 2c3ecbe0d6a4 ("MLK-15064-4 PCI: imx: enable pcie support on imx8")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-09 net: fec: Replace ARCH_MXC_ARM64 with HAVE_IMX_SC

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64.

Update the FEC driver to check for CONFIG_HAVE_IMX_SC around
SCFW-dependent code.

Fixes: 800ae684d992 ("MLK-16022 net: fec: get mac address from fuse")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-08 irqchip: imx-irqsteer imx-intmux: Replace ARCH_MXC_ARM64

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64 so the current condition is never enabled.

Copy upstream Kconfig instead for irqsteer and intmux.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-07 nvmem: imx-scu-ocotp: Depend on HAVE_IMX_SC

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64 so the current condition is never enabled.

Make it depend on HAVE_IMX_SC instead because it depends on SCFW API.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-06 thermal: imx_sc: Depend on HAVE_IMX_SC

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64 so the current condition is never enabled.

Make it depend on HAVE_IMX_SC instead because it depends on SCFW API.

Fixes: 166ac38501ae ("MLK-14972-02 driver: thermal: Add i.MX8QM/QXP thermal support")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21080-05 gpio: Kconfig: Make GPIO_MXC_PAD_WAKEUP depend on HAVE_IMX_SC

Upstream rejected ARCH_MXC_ARM64 in favor of defining ARCH_MXC for
arm64 so the current condition is never enabled.

Make it depend on HAVE_IMX_SC instead because it depends on SCFW API.

Fixes: e972661a45c5 ("MLK-19305-2 gpio: mxc: add gpio PAD wakeup support")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21051 dt-bindings: pinctrl: Sync SCFW header to commit ef4a5057

Replace manually added pads with defines from SCFW export package.

Fixes: 197e0b941b37 ("MLK-21052-23 dt-bindings: pads-imx8qm: Add pads missing from SCFW API")
Fixes: 14f4ea8d1a1c ("MLK-21052-14 dt-bindings: pads-imx8qxp: Add pads missing from SCFW API")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit 21dc9c9834783b13999fcdd1d9dbe50c4ae730ae)

MLK-20958-2 imx8: Replace SC_R_LAST with SC_R_NONE in DTB

We are currently using SC_R_LAST as a marker for imx8 power domain tree
nodes without a resource attached. This value is compiled into dtb as
part of the linux build and used by uboot.

The SC_R_LAST constant changes frequently as SCFW resources are added
(by design) and every time we need to update linux and uboot headers
together or boot can fail.

Fix this by replacing SC_R_LAST usage with a new constant SC_R_NONE
defined to be 0xFFF0.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit f573dbd5ce119740ad30b663e3599cb75e6f67ed)

MLK-20099-2 PCI: imx: use ext osc as pcie refclk on 8mm

Use the external osc as the pcie refclk on 8mm evk board.
- Do not turn off the over ride of rc's clkreq#, when
L1SS is not enabled.
NOTE: L1SS_EN would be set at both RC and EP by
pcie_config_aspm_link when the L1SS is supported
by the link.

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

MMIOT-152 Update Secure Data Path physical address

Change-Id: I5837a5d54e2e27503b532b811d477f1d142b2b99
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
(cherry picked from commit 3ba5908a9e5efa3b5698da3a5c57572e2155f621)

MMIOT-152: imx8mm RDC configuration update

Change-Id: I8fb3b2515b6fa02cbb7c6849fd0661e4f3f66ee7
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
(cherry picked from commit 4b862c5dadd165310e1bdae7894b8f8f6f7b4f7e)

MMIOT-152: imx8mm: update SDP physical memory space

Change-Id: I410909ce69f79846c8956c185570af2e933c829a
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
(cherry picked from commit b46e3b88cb3c2353201463c46cb634babc01f0ab)

MMIOT-152 imx8mm drm device tree

Change-Id: Ic43bc3086562edc513f125605d416fe928c12135
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
(cherry picked from commit 0879ae0289bb034ecf3d990b2e35024ad5464645)

MLK-20998 ARM: dts: imx7ulp: move testing features to EVKB.

Move the emmc/lpuart/sdcard/sensor/spi-slave testing features
from EVK to EVKB board.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Reviewed-by: Frank Li <frank.li@nxp.com>
(cherry picked from commit d8a1f7ccec0154bea139ae58dde9e1b181e0b9d8)

MLK-20416-4 ARM: dts: imx7ulp-evkb: add dtb for RK055IQH042 panel support

On IMX7ULP-EVKB board, add a new dtb 'imx7ulp-evk-rm68191
-qhd.dts' to enable the 'RK055IQH042' MIPI panel display
on this platform.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 32a1254ac9f224a496c8504ed423646b471c758c)

MLK-20416-3 ARM: dts: imx7ulp-evkb: add dtb for RK055AHD042 panel support

On IMX7ULP-EVKB board, add a new dtb 'imx7ulp-evk-rm68200
-wxga.dts' to enable the 'RK055AHD042' MIPI panel display
on this platform.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 21f585f7ba2e46a0660f4d9cf4a187dfb2e21bfa)

MLK-20397 dts: arm: imx7ulp: add SOMB and EVKB revA board support

The main difference for EVKB(SOMB REVA + EVKB RevA) comparing with
EVK(SOM RevB2 + BB RevB1):
- SOMB REVA change: WIFI module Cypress 1DX replace with QCA 1PJ
- BB EVKB RevA change: MIPI connector

The EVKB board focus on default functions on board without rework,
WIFI/BT, and MIPI feature test. Currently, the patch don't consider
other functions with rework needed.

Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit 84e25f0ec7ae0cbb216b05bfae7fde4cde56e8ee)

MLK-20724: uapi: add RGBA to exend V4L2 standard format for android usage

Android has RGBA format output but V4L2 framework do not have this format
.In order to support this in our mem2mem driver, we need to extend V4L2
format.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit 24c970a517e1e4a860967255b0cca62c6e2f3c2e)
Only add uapi part to help yocto build
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

ASoC: fsl: refine the asrc driver for imx8qm

The clock source of ASRC in imx8qm is changed.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit b791083c0c38b324dc0544532c1e2398a5fd0e66)
Port early because uapi diffs could break yocto
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21085 uapi: Add missing imx8 headers

Copy missing uapi headers from rel_imx_4.14.98_2.0.0_ga_rc1 to help
userspace build.

VPU code will be ported later.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

ARM: dts: imx6ull: Add imx6ull-tempmon property

As per 'commit 2067b757e972 ("ARM: dts: imx6ul: Add imx6ul-tempmon")'
added tempmon property.

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit 56e54055c129fcbf8e4971e73e583c3f14e95da0)

MLK-21084 arm64: dts: Copy all imx8 dts

Copy all from rel_imx_4.14.98_2.0.0_ga_rc1 in order to help external
build systems.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21060 i2c: lpi2c: Fix clk fetch

During porting commit ede264acf031 ("MLK-14982-1 imx8: lpi2c: add ipg
clk for lpi2c driver") which replaced the single clk
with clk_ipg and clk_per was skipped.

Part of the code was later added in commit 96dbdd8c3d0b ("MLK-16713 i2c:
imx-lpi2c: add runtime pm support") except the "clk" field was kept and
clk_get calls were not updated.

Fix imx7ulp boot by fetching both clocks.

Fixes: 96dbdd8c3d0b ("MLK-16713 i2c: imx-lpi2c: add runtime pm support")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>

MLK-21059-5 arm64: defconfig: Enable imx8mm

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21059-4 arm64: Kconfig: Add imx8mm support

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21059-3 arm64: dts: Add imx8mm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

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

MLK-21059-2 pinctrl: Add imx8qmm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21059-1 clk: Add imx8mm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-6 arm64: defconfig: Enable imx8mq

Also disable fbdev dcss (does not build and is not needed) and enable
SERIAL_IMX_CONSOLE for debugging on 8m.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-5 arm64: Kconfig: Add imx8mq support

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-4 arm64: dts: Add imx8mq support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-3 pinctrl: Enable imx8mq support

Copy pin header from rel_imx_4.14.98_2.0.0_ga_rc1 and enable
compilation. The C code of the driver was already accepted in v4.19 in
an acceptable form so we use that.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-2 clk: Add imx8mq support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21054-1 soc: imx: Add gpc-psci

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21057 serial: imx: Restore proper init of shadow registers

Upstream commit 3a0ab62f43de ("serial: imx: implement shadow registers
for UCRx and UFCR") made the imx_uart_readl/writel functions use a
"cache" to avoid reads/writers to hardware for some registers.

Those values need to be initialized once at probe time using real reads
from hardware; using imx_uart_readl for this is obviously non-functional

Fixes: 372312842fe7 ("tty: serial: imx: use imx_uart_writel() and imx_uart_readl()")

This is required for imx8mq to boot and likely fixes other things.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Andy Duan <fugang.duan@nxp.com>

MLK-17597-1: i.MX8MQ workaround affecting other SoCs

Fix iMX8MQ workaround to be specific to that
machine.

Signed-off-by: Nitin Garg <nitin.garg@nxp.com>
(cherry picked from commit 5fc3246190546c455f47fa3094ee717bd84a167c)

MLK-16804-04 driver: irqchip: Add IPI SW workaround for imx8mq

On i.MX8MQ, when the CPU core is in power down state,
the IPI can NOT wakeup the core anymore(ERR011171), so using the
external IRQ32 to wakeup the core in power down idle
state successfully.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
(cherry picked from commit d3244056f749c0ce590a671e215eb39fff336fc2)

MLK-16804-02 arm64: configs: enable the system counter timer for nxp imx8

Enable the system counter timer by default.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
(cherry picked from commit 0bd34ee2e4dd4e728d688b6bee1ef2e6e3498b41)

MLK-16804-01 driver: clocksource: Add nxp system counter broadcast timer

On NXP i.MX8MQ SOC, it has system counter module for ARM
generic timer implementation. In this system counter module
it also has compare frame module to provide timer support.
So we can use it as an alternative clockevent device for
broadcast timer purpose when CPU core enter power down state
with local timer stopped.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
(cherry picked from commit f69eab1d013361bc7e520541a361752dfc644670)

MLK-21052-28 arm64: defconfig: Enable imx8qm support

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-16005-2 arm64: tlb: add the SW workaround for i.MX8QM TKT340553

on i.MX8QM TO1.0, there is an issue: the bus width between A53-CCI-A72
is limited to 36bits.TLB maintenance through DVM messages over AR channel,
some bits will be forced(truncated) to zero as the followings:

ASID[15:12] is forced to 0
VA[48:45] is forced to 0
VA[44:41] is forced to 0
VA[39:36] is forced to 0

This issue will result in the TLB aintenance across the clusters not working
as expected due to some VA and ASID bits get truncated and forced to be zero.

The SW workaround is: use the vmalle1is if VA larger than 36bits or
ASID[15:12] is not zero, otherwise, we use original TLB maintenance path.

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
(cherry picked from commit c9eb1788558f07dfda0c15b684f79aedb4bfa623)
This is still required for current imx8qm B0 chips.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-27 soc: imx: Add imx8 soc driver

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-26 arm64: Kconfig: Add ARCH_FSL_IMX8QM

Kconfig snippets based on rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-25 arm64: dts: Add imx8qm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-24 pinctrl: Add imx8qm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-23 dt-bindings: pads-imx8qm: Add pads missing from SCFW API

These are used in dts but missing in SCFW headers so copy definitions
from imx_4.14.y

See MLK-21051

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-22 clk: Add imx8qm support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-21 arm64: defconfig: Enable ARCH_FSL_IMX8QXP

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-20 arm64: Kconfig: Add imx8qxp support

Kconfig snippets based on rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-19 arm64: dts: Add imx8x support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-18 pinctrl: Add imx8qxp support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1 and add minor build fix in
pinctrl-scu.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-17 clk: imx8qxp: Add imx8qxp support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-16 soc: imx8: Add SC-based pm domain support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-15 dt-bindings: soc: Add imx8 PD support

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-14 dt-bindings: pads-imx8qxp: Add pads missing from SCFW API

These are used in dts but missing in SCFW headers so copy definitions
from imx_4.14.y

See MLK-21051

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-13 soc: imx: Add SCFW support

This is enabled via CONFIG_HAVE_IMX_SC

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-12 soc: imx: Redefine sc_rsrc_t to uint32_t from uint16_t

This was changed at some point by SC firmware but imx linux releases
didn't pick up the change and some drivers don't even compile with a
16-bit sc_rsrc_t.

Fix by overwriting SC API with imx_4.14 definition.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-11 soc: imx: Add SCFW 1.4 export package

Uses same layout as imx_4.14.y

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-10 soc: imx: Add fsl_sip headers

This file contains many defines for SIP calls to imx ATF.

Copy from rel_imx_4.14.98_2.0.0_ga_rc1

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-09 soc: imx: Fix building without HAVE_IMX_SRC

If support for imx_src_is_m4_enabled is not compiled then just return
the default value "false".

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-08 clk: imx: Add CLK_SET_PARENT_NOCACHE

Implement a CLK_SET_PARENT_NOCACHE flag in clk core for imx8 clk
implementation where the parent needs to be restore after PM domain is
up.

Reviewed-by: Anson Huang <anson.huang@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com>
(cherry picked from commit 87e997822c050fc7dc027a863c92f1f0b4816515)
[Leonard: split clk core part]
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-07 net: fec: Fix fec_devtype[IMX8QM] being imx6ul-fec

This was incorrectly added to the fec_devtype array only by commit
088c766a5c04 ("MLK-10724-6 net: fec: add i.mx6ul enet support")

The rest of 8qm support was later added by commit d1a46676c8b8
("MLK-16781 net: fec: add eee mode tx lpi support")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-06 usb: dwc3: Fix build failure by restoring err0 label in dwc3_probe

This label was removed by upstream commit 44feb8e6ea2d ("usb: dwc3: use
local copy of resource to fix-up register offset") but we added a new
probe state which needs this error handling label again.

Fixes: fc0d4039c7bf ("MLK-18922-2 usb: dwc3: add OTG capabilities handling")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-05 ath10k: Fix build failure by adding debug_mask arg to ath10k_dbg

Changing ath10k_err to ath10k_dbg requires an additional debug_mask
argument.

Fixes: d239e779c497 ("MLK-17039 qca6174: clear error message during wifi bootup")

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-04 net: phy: at803x: Fix build failure by removing gpiod_reset again

Upstream removed this in commit bafbdd527d56 ("phylib: Add device reset
GPIO support") but it was added by mistake while backporting in a way
that breaks arm64 build.

Fixes: 0c27b23fd1b1 ("MLK-15309-01 net: phy: at803x: add EEE mode, 1.8V IO, led_act blinding workaround support")

This phy driver is used on imx8 mek boards.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-02 arm64: defconfig: Import imx_4.14.y defconfig

Copy from rel_imx_4.14.98_2.0.0_ga_rc1
Cycle through savedefconfig
Disable various drivers which don't compile
Enable ARCH_MXC and FEC

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

MLK-21052-01 arm64: add basic Kconfig symbols for i.MX8

Add basic Kconfig symbols to make the MXC architecture available
in the ARM64 world.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
(cherry picked from commit 930507c1830498e00ede089890f188de4a108cc7)
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

clk-imx6sl.c: remove duplicate definition of CCDR

This was introduced in upstream stable v4.19.21:
CommitID: ea225de3bd6656a34f76723eb61b32cff6d54021

drivers/clk/imx/clk-imx6sl.c:23:0: warning: "CCDR" redefined
 #define CCDR   0x04

drivers/clk/imx/clk-imx6sl.c:20:0: note: this is the location of the previous definition
 #define CCDR    0x4

Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

ARM: dts: imx6sll: add gpio clocks

i.MX6SLL has GPIO clock gates in CCM CCGR, add
clock property for GPIO driver to make sure all
GPIO banks work as expected.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: dts: imx6sll: add gpio-ranges property

Add "gpio-ranges" property to establish connections between GPIOs
and PINs on i.MX6SLL pinctrl driver, for details, please refer to
Documentation/devicetree/bindings/gpio/gpio.txt of "gpio-ranges"
property.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

Revert "MLK-11495-03 ARM: imx: fix the ARM/IPG ratio when busfreq enabled"

This reverts commit 0919938115381fe9a19500af76da640fc18d5851.
Bus frequency fixes workaround changes are already in upstream.

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

ARM: dts: imx7d-sdb: Add missing lcdif display property

As per 'commit 318e04958ffb ("MLK-18583: "Revert ARM: dts: imx7d-sdb: Add
DRM panel support"")', added missing lcdif display property.

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

MLK-14283: mxsfb: fix clock definitions for lcdif

The mxsfb framebuffer driver uses three clock definitions, but only two
are defined in DTS for imx7s (also used by imx7d); because of this,
driver fails in probe. Since iMX7D uses only one clock, add the third clock
and make two of them dummy.
Also, add additional error messages for better identification of a
failing probe.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: imx7s: Add CAAM page 0 definition in device tree

As per 'commit 543560697919 ("MLK-16959: crypto: caam Add CAAM
page 0 definition in device tree")', adding CAAM page 0
definition in imx7s.dtsi

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: dts: imx7d: remove the duplicate entry of crypto

imx7s.dtsi already having crypto entry so removing duplicate
entry of crypto from imx7d.dtsi

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: dts: imx7d-sdb: fix endpont node name for mipi_sensor

This fixes the below compilation warnings:

arch/arm/boot/dts/imx7d-sdb.dtb: Warning (graph_endpoint): /soc/aips-bus@30400000/mipi-csi@30750000/port/endpoint1: graph endpont node name should be 'endpoint'
arch/arm/boot/dts/imx7d-sdb.dtb: Warning (graph_endpoint): /soc/aips-bus@30400000/mipi-csi@30750000/port/endpoint2: graph endpont node name should be 'endpoint'

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: dts: imx6dl: fix gpu node address

This fixes the below mentioned boot time backtraces:

CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.17-gf5efd42140de-dirty #1
Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
[<8010fc44>] (unwind_backtrace) from [<8010bc80>] (show_stack+0x10/0x14)
[<8010bc80>] (show_stack) from [<80a371fc>] (dump_stack+0x78/0x8c)
[<80a371fc>] (dump_stack) from [<8028b3fc>] (sysfs_warn_dup+0x58/0x64)
[<8028b3fc>] (sysfs_warn_dup) from [<8028b500>] (sysfs_create_dir_ns+0xb4/0xc8)
[<8028b500>] (sysfs_create_dir_ns) from [<80a3bfa0>] (kobject_add_internal+0x9c/0x2bc)
[<80a3bfa0>] (kobject_add_internal) from [<80a3c3b4>] (kobject_add+0x58/0xbc)
[<80a3c3b4>] (kobject_add) from [<80525244>] (device_add+0x100/0x604)
[<80525244>] (device_add) from [<807c98ac>] (of_platform_device_create_pdata+0x90/0xb8)
[<807c98ac>] (of_platform_device_create_pdata) from [<807c9ab4>] (of_platform_bus_create+0x198/0x22c)
[<807c9ab4>] (of_platform_bus_create) from [<807c9b00>] (of_platform_bus_create+0x1e4/0x22c)
[<807c9b00>] (of_platform_bus_create) from [<807c9c78>] (of_platform_populate+0x5c/0xac)
[<807c9c78>] (of_platform_populate) from [<80f0bde0>] (imx6q_init_machine+0x94/0x3c0)
[<80f0bde0>] (imx6q_init_machine) from [<80f038a8>] (customize_machine+0x20/0x30)
[<80f038a8>] (customize_machine) from [<801026b4>] (do_one_initcall+0x7c/0x1a8)
[<801026b4>] (do_one_initcall) from [<80f00e28>] (kernel_init_freeable+0x140/0x1d4)
[<80f00e28>] (kernel_init_freeable) from [<80a4a724>] (kernel_init+0x8/0x110)
[<80a4a724>] (kernel_init) from [<801010e8>] (ret_from_fork+0x14/0x2c)
Exception stack(0xd8073fb0 to 0xd8073ff8)
3fa0:                                     00000000 00000000 00000000 00000000
3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
3fe0: 00000000 00000000 00000000 00000000 00000013 00000000

Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>

ARM: dts: imx6sl.dtsi: fix gpu backtracing

Fix below backtraces by adding unique name for each gpu nodes.

sysfs: cannot create duplicate filename '/bus/platform/devices/2200000.gpu'
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.17-03233-g8d8ad8d43f2c-dirty #3
Hardware name: Freescale i.MX6 SoloLite (Device Tree)
[<80112890>] (unwind_backtrace) from [<8010dc64>] (show_stack+0x10/0x14)
[<8010dc64>] (show_stack) from [<80b97fd4>] (dump_stack+0x88/0x9c)
[<80b97fd4>] (dump_stack) from [<802ecad4>] (sysfs_warn_dup+0x5c/0x68)
[<802ecad4>] (sysfs_warn_dup) from [<802ece60>] (sysfs_do_create_link_sd+0xc8/0xcc)
[<802ece60>] (sysfs_do_create_link_sd) from [<805d5db4>] (bus_add_device+0x78/0x130)
[<805d5db4>] (bus_add_device) from [<805d2a18>] (device_add+0x320/0x638)
[<805d2a18>] (device_add) from [<808b249c>] (of_platform_device_create_pdata+0x90/0xb8)
[<808b249c>] (of_platform_device_create_pdata) from [<808b2680>] (of_platform_bus_create+0x1b0/0x348)
[<808b2680>] (of_platform_bus_create) from [<808b26f0>] (of_platform_bus_create+0x220/0x348)
[<808b26f0>] (of_platform_bus_create) from [<808b29c4>] (of_platform_populate+0x80/0x108)
[<808b29c4>] (of_platform_populate) from [<8110c404>] (imx6sl_init_machine+0x30/0xd0)
[<8110c404>] (imx6sl_init_machine) from [<81103de8>] (customize_machine+0x20/0x30)
[<81103de8>] (customize_machine) from [<80102e9c>] (do_one_initcall+0x54/0x314)
[<80102e9c>] (do_one_initcall) from [<811011d8>] (kernel_init_freeable+0x360/0x3f0)
[<811011d8>] (kernel_init_freeable) from [<80bac9d8>] (kernel_init+0x8/0x114)
[<80bac9d8>] (kernel_init) from [<801010e8>] (ret_from_fork+0x14/0x2c)
Exception stack(0xa80b5fb0 to 0xa80b5ff8)

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

ARM: dts: imx6sl: fix device tree structure for regulator nodes

Fix regulator tree structure to avoid address-cell and size-cells conflicts.

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

thermal: remove unused function imx_get_sensor_data

Remove unused function imx_get_sensor_data() to fix compilation warnings.

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

drivers: pinctrl: Fix compilation warnings

Fix compilation warnings by removing unused variables and adding missed
qualifiers.

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

ARM: dts: imx6sll: Fix compilation warnings

Fix below compilation warnings by adding address cells and size cells under
clock node.

Warning (reg_format): /clock-osc-24m:reg: property has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Warning (pci_device_bus_num): Failed prerequisite 'reg_format'
Warning (simple_bus_reg): Failed prerequisite 'reg_format'

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MLK-20216-4: video/fbdev/imx_dcss: remove useless function call

This fixes Coverity issue since the function does nothing. The function
only returns some values which are never used.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
CC: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MLK-20216-3: video/fbdev/imx_dcss: remove unnecessary BUG_ONs

This fixes Coverity issue since num_pix_x and num_pix_y are unsigned and
the conditions are never true.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
CC: Fancy Fang <chen.fang@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MGS-3083 [#imx-662] fix kernel build error with kasan config

hal/kernel/gc_hal_kernel_command.c: In function gckCOMMAND_Commit:
hal/kernel/gc_hal_kernel_command.c:2718:1:
error: the frame size of 2288 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]

removed _commandBufferObject instrance, use kmalloc to avoid kasan error.

Date: Jul 13, 2017
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit d8d57e43a24bd02b375d7c6bd633ed236db19337)
(cherry picked from commit 484e3073adf47d27581482f268b01fe5fe219d18)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MA-13450-1 [#ccc] Switch layer memory allocation to virtual pool to improve performance.

Add DRM_VIV_GEM_VIRTUAL_POOL flags.
Switch to virtual pool when this flag is set.

Change-Id: I6e1e799cd0b4f81ed1ffbfdabe8f105325fa9644
Signed-off-by: Ivan.liu <xiaowen.liu@nxp.com>
(cherry picked from commit c4bd0fc803409c54d06e3554f4857922d6640925)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MLK-20450 Fix Linux NO SMP kernel - GPU

       - Fix GPU-viv drivers to build without SMP

Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com>
(cherry picked from commit 6558c2881b0cd1441708933fa1ac397f54b5aa70)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MA-13467 [#imx-1237] Fix kernel panic when running deqp module.

Unable to handle kernel paging request at virtual address 1000100
[<ffff000008274ed8>] prefetch_freepointer.isra.37+0x8/0x14
[<ffff0000087bd3b0>] sync_file_create+0x28/0xc0
[<ffff000008b7c7e4>] gckOS_CreateNativeFence+0x74/0x110
[<ffff000008b89a78>] gckKERNEL_Dispatch+0xa54/0x15b0
[<ffff000008b8a8b8>] gckDEVICE_Dispatch+0x2e4/0x2f8
[<ffff000008b81160>] drv_ioctl+0x110/0x21c
[<ffff0000082b4478>] do_vfs_ioctl+0xb8/0x8b0
[<ffff0000082b4cf4>] SyS_ioctl+0x84/0x98

The reference count should be increased in one spin lock cycle.
Move spin lock out of _QueryIntegerId function.
Move signal reference count to gckOS_CreateNativeFence.

Change-Id: I1bf89b4de6055e5d0009baf7287f600696c4a529
Signed-off-by: Ivan.liu <xiaowen.liu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MGS-4363 [#imx-1246] fix coverity resource leak issue

CID 3925877: Resource leak (RESOURCE_LEAK)
14. leaked_storage: Variable pages going out of scope leaks the storage it points to.

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit a38d1b1ff31ce87a231588de1a2e24a787f87143)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MA-12928-2 [#imx-1199] Use gcdANDROID MARCO to control android build

Should use the correct build MARCO gcdANDROID to control android build.

Change-Id: I56a745b228a24ba502dc9771596aad78c1d8d808
Signed-off-by: Richard Liu <xuegang.liu@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>

MGS-4376 [#imx-1238] fix low performance with CMA allocator

there are lots of PFNs busy message when run GPU tests:
 [  622.370671] alloc_contig_range: [4ea70, 4ea7c) PFNs busy
 [  626.518072] alloc_contig_range: [4ea90, 4ea9c) PFNs busy

this problem is related with CMA migration for fragments,

move CMA allocator after GFP to avoid memory migration,
also fix CMA preempt for contiguous memory request.

can improve CTS and gpubench benchmarks on M850D.

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>