MLK-16942: dts: Remove disp_apb clock rate setting
The patch that moved the dcss node from fsl-imx8mq-evk.dts to
fsl-imx8mq.dtsi reverted Sandor's patch 8c9aa9e which removed the APB
clock from assigned-clocks, this way breaking the HDMI CEC
functionality.
This patch re-applies the changes made initially in 8c9aa9e.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
MLK-17005: linux-imx: serial: fsl_lpuart: Clear LOOP mode when requested
The LOOP mode remained always set after first use.
If the ioctl tiocmset gets called with TIOCMBIC for TIOCM_LOOP,
UARTCTRL_LOOPS needs to be cleared in the LPUART control register.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
MLK-16988: watchdog: imx8_wdt: stop watchdog while suspend
Since watchdog on i.mx8 is a software watchdog in scfw side, it should be
stopped while kernel enter system suspend if watchdog fired. Otherwise,
unexpected watchdog reset will happen. Restore back if watchdog fired too.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16834-02 dts: Add display port only dts for imx8qm arm2
Add fsl-imx8qm-lpddr4-arm2-dp.dts for display port only.
Move hdmi sound propriety from fsl-imx8qm-lpddr4-arm2.dts
to fsl-imx8qm-lpddr4-arm2-dp.dts because hdmi sound should
enable with hdmi driver.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit c9db9489e7589c148f178056df22eda574b2c3ec)
MLK-16973-10 arm64: dts: fsl-imx8qm-mek: Add JDI WUXGA LVDS panel support on LVDS1
This patch adds JDI WUXGA LVDS panel(on LVDS1) support
for the i.MX8QM MEK platform.
Note that the i.MX8QM MEK board needs a hardware rework
to add a 0ohm resistor for R211 to make the PWM backlight
work for the panel.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-9 arm64: dts: fsl-imx8qm-lpddr4-arm2: Add JDI WUXGA LVDS panel support on LVDS1
This patch adds JDI WUXGA LVDS panel(on LVDS1) support
for the i.MX8QM LPDDR4 ARM2 platform.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-8 arm64: dts: fsl-imx8qm-mek: Add LVDS0/1 PWM backlight support
This patch adds LVDS0/1 PWM backlight support
for the i.MX8QM MEK platform.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-7 arm64: dts: fsl-imx8qm-lpddr4-arm2: Add LVDS0/1 PWM backlight support
This patch adds LVDS0/1 PWM backlight support
for the i.MX8QM LPDDR4 ARM2 platform.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-6 arm64: dtsi: fsl-imx8qm: Add lvds0/1_pwm nodes
This patch adds lvds0/1_pwm device tree nodes for the i.MX8QM SoC.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-5 arm64: defconfig: Build in generic PWM backlight driver
This patch builds in the generic PWM backlight driver.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-4 pwm: imx: Use ipg and per clks in ->config, ->enable and ->disable
For the i.MX8QM SoC, it turns out that both ipg and per clocks
are needed to be enabled when the PWM registers are configured.
Hence, we use the two clocks in the ->config, ->enable and
disable hooks. For other SoCs unlike i.MX8QM, it could bring
some additional trivial power consumptions due to the additional
active ipg clock when PWM is enabled.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-3 arm64: defconfig: Build in DRM simple panel driver
This patch builds in the DRM simple panel driver.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-2 drm/panel: simple: Add support for JDI TX26D202VM0BWA panel
This patch adds support for Japan Display Inc. 10.1" TX26D202VM0BWA
WUXGA(1920x1200) TFT LCD panel with LVDS interface.
The panel has dual LVDS channels.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16973-1 dt-bindings: display: Add JDI TX26D202VM0BWA LCD panel bindings
The JDI TX26D202VM0BWA LCD panel is a 10.1" panel
with a 1920x1200 (WUXGA) resolution.
The panel has dual LVDS channels.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
MLK-16989-4 ARM64: dts: imx8mq: remove '_drm' postfix for all display nodes
Since the display subsystem is using DRM framework by
default, it is unnecessary to keep '_drm' postfix in
the device node names anymore to indicate that they
are DRM devices.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
MLK-16982 PCI: imx: fix the failure of the msi verification
Failed to verify the MSI in the EP RC system.
Root cause: the MSI address is not fetched corretly.
The second port of iMX8MQ EVK board should be used
as EP port, not the first one.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Frank Li <frank.li@nxp.com>
MLK-16671-7 - [i.MX8QXP/Malone]: Add vpu malone decoder
Fix random hang issue, need to handle below cases:
- Image done and DBE done may not be triggered at the same time
- Software interrupt maybe overwritten on mulit-core environment
Signed-off-by: Zhou Peng-B04994 <eagle.zhou@nxp.com>
MLK-16956: ASoC: fsl_asrc: fix error with S24_3LE format bitstream
The error is "aplay: pcm_write:2023: write error: Input/output error"
query the caps of dma, then update the hw parameters according
the caps. for EDMA can't support 24bit sample, but we didn't
add any constraint, that cause issues.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
MLK-16989-3 ARM64: dts: imx8mq: remove unused device nodes
The below legacy fbdev related device nodes are not
used anymore:
a. dcss
b. lcdif
c. mipi_dsi
d. hdmi
So remove them from IMX8MQ platform to make the dts
more clean.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
MLK-16989-2 ARM64: dts: imx8mq: remove legacy fbdev dtbs
Remove below three dtbs related to legacy fbdev
on IMX8MQ platform:
1. fsl-imx8mq-evk-4k.dtb
2. fsl-imx8mq-evk-fbdev.dtb
3. fsl-imx8mq-evk-lcdif-dsi.dtb
since the fbdev drivers are not supported and
maintained anymore.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
MLK-16989-1 ARM64: dts: imx8mq-evk: correct the include dtb names
After changing the default dtb on IMX8MQ EVK platform
from 'fsl-imx8mq-evk-fbdev.dts' to 'fsl-imx8mq-evk.dts'
by commit '73590d0be046a0b7e051191eed8065a1e43da0af',
the dtbs included in 'fsl-imx8mq-evk-m4.dts' and
'fsl-imx8mq-evk-pcie1-m2.dts' should be also changed
to 'fsl-imx8mq-evk.dts'.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
MLK-16953: drm: imx: dcss: Add propriety to change global alpha priority
This patch adds 'use_global_alpha' property to the primary plane, so that
one can choose whether to use global alpha instead of per-pixel alpha,
when the framebuffer has per-pixel alpha.
Framebuffers that do not have per-pixel alpha will always use global
alpha.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
MLK-15473-8: crypto: caam: Disable CAAM JR1 according to SCFW update
After CAAM JR1 has been moved to SECO,
imx-sc-firmware commit 36ff24f36b56 ("Move CAAM JR1 to SECO FW."),
Linux no longer boots and rises a kernel panic at "caam_probe".
So the CAAM JR1 should be disabled in the device-tree.
Tested-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Silvano Di Ninno <silvano.dininno@nxp.com>
Signed-off-by: Aymen Sghaier <aymen.sghaier@nxp.com>
MLK-16977-3 media: camera: refine the reset sequence for camera
adjust the init sequence for camera thus no rework will be required
for DVDD_1V5.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
MLK-16977-2 media: v4l_cap: don't support suspend when camera is running
Don't support suspend/resume by checking if camera is running.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
MLK-16977-1 media: v4l_cap: implement S_FMT ioctl
gsteamer uses S_FMT ioctl to set the resolution instead of using
S_PARM ioctl. The S_PARM ioctl depends on the capture mode which is
not in the common way.
This patch uses a common method to set the picture resulotion.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
MLK-16954: drm: imx: dcss: adjust context loader trigger values
Apparently, when DCSS has to fight for data on the bus with other
processes, exists the risk for the scaler to freeze. Previous setting
used the documentation recommendation for setting the DB context loader
trigger time. Unfortunately, with that value, under high stress, the RGB
planes will go black and scaler will freeze.
This patch sets the SB/DB context loader triggers to a values
obtained through repeated tests that proved...
drm/edid: complete CEA modedb(VIC 1-107)
CEA-861-F specs defines new video modes to be used with
HDMI 2.0 EDIDs. The VIC range has been extended from 1-64 to
1-107.
Our existing CEA modedb contains only 64 modes (VIC=1 to VIC=64). Now
to be able to parse new CEA modes using the existing methods, we have
to complete the modedb (VIC=65 onwards).
This patch adds:
- Timings for existing CEA video modes (from VIC=65 till VIC=92)
- Newly added 4k modes (from VIC=93 to VIC=107).
The patch was or...
video: Add new aspect ratios for HDMI 2.0
HDMI 2.0/CEA-861-F introduces two new aspect ratios:
- 64:27
- 256:135
This patch adds enumeration for the new aspect ratios
in the existing aspect ratio list.
V2: rebase
V3: rebase
V4: Added r-b from Jose, Ack by Tomi
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Jose Abreu <Jose.Abreu@synopsys.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Daniel Vetter <daniel.v...
MLK-16918: arm64: dts: fsl-imx8mq-evk: Fix dsi conflicts
The MIPI-DSI nodes related to ADV7535 are in conflict with OV5640
MIPI-CSI camera, since they share the same address on the same i2c bus:
0x3c. In order to make DSI work with ADV7535 adapter, the OV5640 camera
needs to be disabled.
Also, for LCDIF (MXSFB), the irqsteer_dcss module needs to be disabled,
otherwise it will interfere in the suspend/resume routines.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurenti...
MLK-16750-7 arm: dts: add dedicated dts for OP-TEE
Add dedicated dts for OP-TEE.
The modification is about ocram partition. The default dtsi
use lower ocram area for low power things. But i.MX
chips TZASC could only protect OCRAM from high address to low address.
So modify the OCRAM space for OP-TEE.
The PSCI/OPTEE firmware node will be dynamically created in OP-TEE.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-6 arm: imx7d: cpuidle: Fix missing decrement of master_lpi
This fixes commit ("MLK15034: ARM: cpuidle imx7d: Check
IPIs manually before LPI").
In this patch, also need to take care of psci part.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-5: arm: imx: support using psci to handle power stuff
Support using PSCI to handle Power stuff.
Use PSCI to differentiate secure/non-secure kernel.
i.MX7 LPSR mode not implemented now.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-4 clk: imx6sx: keep TZASC clock on
Keep TZASC clock on. With TEE enabled, TZASC enabled, if disable
tzasc clock, system may hang up.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-3 arm: imx6sx: busfreq: lock L2 cache instead of disabling it
In non-secure mode, L2 cache can NOT be disabled, lock
L2 cache instead of disabling it to avoid L2 cache
access DDR.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-2 arm: imx: busfreq: lock L2 cache instead of disabling it
In non-secure mode, L2 cache can NOT be disabled, lock
L2 cache instead of disabling it to avoid L2 cache
access DDR.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Peng Fan<peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
MLK-16750-1 arch: arm: imx_v7_defconfig Enable PSCI and TEE
Default enable PSCI and TEE.
If no psci optee node in dts, it works as before.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
tee: optee: add const to tee_driver_ops and tee_desc structures
Add const to tee_desc structures as they are only passed as an argument
to the function tee_device_alloc. This argument is of type const, so
declare these structures as const too.
Add const to tee_driver_ops structures as they are only stored in the
ops field of a tee_desc structure. This field is of type const, so
declare these structure types as const.
Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Jens Wikl...
tee: tee_shm: Constify dma_buf_ops structures.
dma_buf_ops are not supposed to change at runtime. All functions
working with dma_buf_ops provided by <linux/dma-buf.h> work with
const dma_buf_ops. So mark the non-const structs as const.
File size before:
text data bss dec hex filename
2026 112 0 2138 85a drivers/tee/tee_shm.o
File size After adding 'const':
text data bss dec hex filename
2138 0 0 2138 85a drivers/...
tee: add ARM_SMCCC dependency
For the moment, the tee subsystem only makes sense in combination with
the op-tee driver that depends on ARM_SMCCC, so let's hide the subsystem
from users that can't select that.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
(cherry picked from commit e84188852a7239d7a144af12f7e5dac8fa88600b)
tee: optee: fix uninitialized symbol 'parg'
Fixes the static checker warning in optee_release().
error: uninitialized symbol 'parg'.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit efb14036bd7f8914f721e1e82891d4ba617cc784)
tee: add forward declaration for struct device
tee_drv.h references struct device, but does not include device.h nor
platform_device.h. Therefore, if tee_drv.h is included by some file
that does not pull device.h nor platform_device.h beforehand, we have a
compile warning. Fix this by adding a forward declaration.
Submitted upstream, see link below.
Link: http://lists.infradead.org/pipermail/linux-arm-kernel/2017-May/509790.html
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>...
tee: optee: sync with new naming of interrupts
In the latest changes of optee_os, the interrupts' names are
changed to "native" and "foreign" interrupts.
Signed-off-by: David Wang <david.wang@arm.com>
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit 39e6519a3f135b143dee4d4fb5ac0438e75454e2)
