Guoniu.Zhou [Mon, 5 Feb 2018 07:58:39 +0000 (15:58 +0800)]
MLK-17230-6: sensor: add driver for ov5640 camera sensor
Add version3.0 driver for ov5640 camera sensor. It works on DVP
mode
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
64d7dd18ac3c768480df8390ab02a35142a220cd)
Guoniu.Zhou [Mon, 5 Feb 2018 07:43:23 +0000 (15:43 +0800)]
MLK-17230-5: CI_PI: enable CI_PI SS
Add driver for CI_PI controller.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
980ac5f965bd8e94cce8a8c3fa78b1062dbd1727)
Guoniu.Zhou [Mon, 5 Feb 2018 07:26:34 +0000 (15:26 +0800)]
MLK-17230-4: CI_PI: add dts file for CI_PI SS
Add pinmux setting for CI_PI and bridge connection between
CI_PI and camera sensor.
Enable CI_PI and camera sensor ov5640.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
45ba6a1d8303724df9d0934c2eebd385a6c36690)
Guoniu.Zhou [Mon, 5 Feb 2018 07:17:23 +0000 (15:17 +0800)]
MLK-17230-3: CI_PI: add device nodes for CI_PI SS
Add clock and power domain device nodes for CI_PI subsystem.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
825392c25d2f3d430a877fc34e5268a4bd0324f0)
Guoniu.Zhou [Mon, 5 Feb 2018 07:12:58 +0000 (15:12 +0800)]
MLK-17230-2: CI_PI: add power domain names for CI_PI ss
Add power domain macro names for CI_PI subsystem.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
fd8318f4455ceafda963681ce05effd0ad81d714)
Guoniu.Zhou [Mon, 5 Feb 2018 06:52:07 +0000 (14:52 +0800)]
MLK-17230-1: CI_PI: register clocks for CI_PI ss
Register clocks for CI_PI subsystem.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
d29308ec4fa29addd049c114520d7628e9e921d7)
Anson Huang [Tue, 20 Mar 2018 07:25:51 +0000 (15:25 +0800)]
MLK-17843 rtc: rtc-imx-rpmsg: fix alarm enable function
Add missing enable parameter for alarm enable function,
without correct parameter, the "enable" value is a random
value in memory and M4 may disable alarm unexpectedly.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Robin Gong <yibin.gong@nxp.com>
Richard Zhu [Tue, 13 Mar 2018 09:14:07 +0000 (17:14 +0800)]
MLK-17815-2 ata: imx: imx8qm: configure phy impedance ratio
- To save power consumption, PHY related CLKs can be
gated off after the configurations are done.
- The impedance ratio should be configured refer to
differnet REXT values.
0x6c <--> REXT valuse is 85Ohms
Default values 0x80 <--> REXT value is 100Ohms.
- IMX8QM_HSIO_PHY_X1_APB_CLK is mandatory required when
access SATA PHY registers. Change the power domain to SATA.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Tue, 13 Mar 2018 09:11:57 +0000 (17:11 +0800)]
MLK-17815-1 dts: arm64: imx8qm: add sata phy region
Add the extra imx8qm sata phy register region,
and the clock phy_apbclk, mandatory required to
access phy registers.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Haibo Chen [Mon, 12 Mar 2018 10:57:48 +0000 (18:57 +0800)]
MLK-17829-2 ARM64: imx8mscale: add s3508 touch support in device tree
Default disable this touch.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Mon, 5 Mar 2018 09:46:15 +0000 (17:46 +0800)]
MLK-17829 touchscreen: Add synaptics_dsx S3508 i2c touch driver
Add S3508 touch driver support.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Silvano di Ninno [Fri, 16 Mar 2018 13:49:57 +0000 (14:49 +0100)]
MLK-17674-4: driver/crypto: CAAM add support for 7ulp
Add support for imx7ulp SoC.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Silvano di Ninno [Fri, 16 Mar 2018 13:48:10 +0000 (14:48 +0100)]
MLK-17674-2: CAAM SM : get base address from device tree
Remove hard coded value for base physical address.
Use device tree to get this value.
i.MX8 with seco is still not address since CAAM uses a private bus
to access secure memory
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Silvano di Ninno [Fri, 16 Mar 2018 13:46:28 +0000 (14:46 +0100)]
MLK-17674-1: sm_store remove CONFIG_OF
I.MX linux only works with device tree support
No need to keep code without CONFIG_OF
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Fugang Duan [Thu, 15 Mar 2018 09:36:29 +0000 (17:36 +0800)]
MLK-17819 ARM: imx7ulp: update iomux header for i.MX7ULP B0 silicon
- Update iomux header for i.MX7ULP B0 silicon.
- Keep the pin func name prefix name is "IMX7ULP_" that align with
upstreaming kernel.
- Align the pin func name with header file for all dts files.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Acked-by: Shenwei Wang <shenwei.wang@nxp.com>
Peng Fan [Tue, 13 Mar 2018 07:43:53 +0000 (15:43 +0800)]
MLK-17787 clk: imx: gate-scu: fix return code
The sc api error code is not compatible with Linux error code,
directly returning the sc api error code to caller is wrong.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
Liu Ying [Wed, 14 Mar 2018 06:10:13 +0000 (14:10 +0800)]
MLK-17803 drm/imx: dpu: kms: Correct the way to do DPR manual/auto mode switch
The DPR works in manual mode for the first frame and we need to
switch it to auto mode so that auto shadow load mechanism works.
The designers require us to switch the DPR manual mode to auto mode
directly for display controllers instead of using the DPR control
done irq handler, because the irq will not come in some cases(which
leads to shadow load failure). Finer switch operations on DPR
register bits are needed for SW_SHADOW_LOAD_SEL, SHADOW_LOAD_EN,
RUN_EN and REPEAT_EN. Also, for overlay planes, we need to wait for
a frame additionally in the "on-the-fly" cases to make sure the
switch is successful. In all, this patch should be able to address
frame dropping and screen tearing issue(due to the shadow load
failure) when users play video on overlay planes.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Liu Ying [Wed, 14 Mar 2018 03:07:42 +0000 (11:07 +0800)]
MLK-17802 drm/imx: dpu: plane: Remove pixel formats unsupported by DPR
The RGB888/BGR888/NV16/NV61/NV24/NV42 pixel formats are not supported
by DPR. They cannot get the benefits(i.e., tile resolving and
underrun-proof) from the prefetch engines. Also, 16bit and 32bit
RGB pixel formats are widely used by GUI, while NV12 pixel format
is the only pixel format supported by VPU. Thus, it makes little
sense to support the pixel formats which are not supported by DPR.
Another idea is that removing the pixel formats makes the driver
a bit simpler since we don't have to deal with the cases in which
prefetch engines are bypassed.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Leonard Crestez [Wed, 14 Mar 2018 12:39:28 +0000 (14:39 +0200)]
Revert "MLK-17750: drm/imx: ldb: Fix build on imx6/7"
This reverts commit
414fba94a0f0cbc0ca6c7f445908aa86288a178f.
Shengjiu Wang [Wed, 14 Mar 2018 07:47:12 +0000 (15:47 +0800)]
MLK-17799: ARM64: dts: restruct audio power domain tree
There is dedicate resource id for audio clocks (PLL_0, PLL_1,
AUDIO_CLK_0, AUDIO_CLK_1), the scfw need user to enable the power
of resource before using it. The audio clock may used by all
audio devices, but the kernel only allow register one power-domains
for each device note.
So the solution is to add parent-child relationship for them
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Wed, 14 Mar 2018 07:25:46 +0000 (15:25 +0800)]
MLK-17798: ARM64: dts: configure IOMUXD_COMP_CTL_GPIO_1V8_3V3_GPIORHB
The ESAI and SPDIF pin are in enet bank, the board is using 3.3v,
so we need to configure the PSW_OVR to zero, whose default setting
is for 2.5V.
Signed-off-by: Anson Huang <anson.huang@nxp.com>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Sandor Yu [Wed, 14 Mar 2018 02:45:10 +0000 (10:45 +0800)]
MLK-17796: hdp: Remove duplicate define variable cur_mode
variable cur_mode have define in struct of imx_hdp.video.
so remove it in stuct imx_hdp.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Shengjiu Wang [Wed, 14 Mar 2018 02:44:15 +0000 (10:44 +0800)]
MLK-17794: ASoC: fsl: Add SND_SOC_IMX_CDNHDMI back
The FB_MX8_HDMI is removed, the dependency is changed
to DRM_IMX_HDP.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Richard Zhu [Fri, 9 Mar 2018 05:50:29 +0000 (13:50 +0800)]
MLK-11780 PCI: imx: correct some type mistakes
- They should be bitwise logic, not the boolean logic.
- Correct the error return values.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Han Xu [Tue, 13 Mar 2018 19:56:51 +0000 (14:56 -0500)]
MLK-17792: arm64: configs: i.MX8QM flexspi power domain fix
fix the flexspi power domain for i.MX8QM.
Signed-off-by: Han Xu <han.xu@nxp.com>
Leonard Crestez [Fri, 9 Feb 2018 14:54:55 +0000 (16:54 +0200)]
MLK-17750: drm/imx: ldb: Fix build on imx6/7
This code is enabled in upstream imx_v6_v7_defconfig but fails to build
because of sc api calls. Fix this by adding ifdef checks to pixel_link
code.
These calls are already guarded at runtime with checks for devtype
pixel_link_valid_quirks so the empty ifdefed functions will never get
called anyway.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Robert Chiras <robert.chiras@nxp.com>
Haibo Chen [Fri, 9 Feb 2018 10:02:18 +0000 (18:02 +0800)]
MLK-17579 ARM64: dts: correct the pad setting for imx8 usdhc
according to IC suggestion, usdhc clock pad need to be configed as
input/output mode, for other usdhc pad, including the strobe pad, need
to be configed as normal mode.
This patch do the change on the imx8qxp and imx8qm board.
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Robin Gong [Mon, 12 Mar 2018 18:03:09 +0000 (02:03 +0800)]
MLK-17782 dma: fsl-edma-v3: fix issue reported by Coverity
Fix below issue reported by Coverity, actually, don't need this
condition check here, remove it.
CID undefined (#1 of 1): Wrong operator used (CONSTANT_EXPRESSION_RESULT)operator_confusion:
(16UL /* 1UL << 4 */) | (__u16)(__le16)tcd->csr is always 1/true regardless of the values of its operand.
This occurs as the logical first operand of "&&".
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Mirela Rabulea [Wed, 7 Mar 2018 08:48:21 +0000 (10:48 +0200)]
MLK-17684-3: drm/mxsfb: Add support for new pixel formats in eLCDIF
Add support for the following pixel formats:
16 bpp: RG16 ,BG16, XR15, XB15, AR15, AB15
Set the bus format based on input from the user and panel capabilities.
Save the bus format in crtc->mode.private_flags, the DSI will use it.
Use drm_get_format_name instead of locally defined fourcc_to_str.
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Mirela Rabulea [Wed, 7 Mar 2018 08:45:29 +0000 (10:45 +0200)]
MLK-17684-2: drm/bridge: nwl-dsi: Let CRTC dictate the final bus format
Use the bus format that was established by CRTC in
crtc->mode.private_flags.
This will be available during enable phase.
The DSI host will be configured via interface_color_coding
and pixel_format (DPI-2 interface ports).
Previously the interface_color_coding was hardcoded to 24-bit.
Set the DSI pixel format before it is necessary in
nwl_dsi_get_bit_clock, during imx_nwl_dsi_enable.
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Mirela Rabulea [Wed, 7 Mar 2018 08:41:31 +0000 (10:41 +0200)]
MLK-17684-1: drm/panel: rm67191: Add support for new bus formats
Do not hardcode pixel_format to 0x77 but calculate it from dsi->format.
Report all the supported bus formats in get_modes:
MEDIA_BUS_FMT_RGB888_1X24
MEDIA_BUS_FMT_RGB666_1X18
MEDIA_BUS_FMT_RGB565_1X16
Change pixelclock from 120 to 132 MHz, or 16 bpp formats will not work.
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Leonard Crestez [Fri, 9 Feb 2018 14:35:59 +0000 (16:35 +0200)]
MLK-17583-2: arm: imx: Fix imx6sl cpuidle build fail without CONFIG_SOC_IMX6SLL
Fixes commit
91558864ab21 ("MLK-13344-05 ARM: imx: Add cpuidle support on imx6sll")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
Leonard Crestez [Fri, 9 Feb 2018 14:11:42 +0000 (16:11 +0200)]
MLK-17583-1: arm: imx: Fix ifdef check on imx6sll_lpddr2_freq_change
Fixes commit
e9f330efbe16 ("MLK-13344-04 ARM: imx: Add busfreq support on imx6sll")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
Xianzhong [Mon, 12 Mar 2018 19:12:17 +0000 (03:12 +0800)]
MGS-3691 fix gpu kernel panic in cache invalidate
kernel panic when run opencl cts test_buffers on mScale850D,
use get_user and put_user to touch and validate user memory,
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Olivier Masse [Thu, 1 Feb 2018 14:02:12 +0000 (15:02 +0100)]
MMIOT-30 staging: android: uapi: add secure_ion.h
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
Antoine Bouyer [Wed, 17 Jan 2018 16:47:28 +0000 (17:47 +0100)]
MMIOT-35-1 arm64: dts: imx8mq drm: create dts for drm purpose
Signed-off-by: Antoine Bouyer <antoine.bouyer@nxp.com>
Antoine Bouyer [Thu, 7 Sep 2017 14:41:02 +0000 (16:41 +0200)]
MMIOT-35-1 arm64: dts: imx8mq: add dts node pointers
These pointers are required for drm dts
Signed-off-by: Antoine Bouyer <antoine.bouyer@nxp.com>
Antoine Bouyer [Wed, 7 Feb 2018 15:12:56 +0000 (16:12 +0100)]
Documentation: add fsl-heap and imx-ion-pool docs
Signed-off-by: Antoine Bouyer <antoine.bouyer@nxp.com>
Antoine Bouyer [Wed, 7 Feb 2018 15:10:55 +0000 (16:10 +0100)]
devicetree: add linux,ion-heap-unmapped compatible
Signed-off-by: Antoine Bouyer <antoine.bouyer@nxp.com>
Hervé Fache [Thu, 7 Sep 2017 14:41:02 +0000 (16:41 +0200)]
MMIOT-6-2 android: ion: add carveouts for Freescale i.MX8MQ DCSS and VPU
Signed-off-by: Hervé Fache <herve.fache@nxp.com>
Signed-off-by: Antoine Bouyer <antoine.bouyer@nxp.com>
MMIOT-6-2 android: ion: Minor changes for readability
Signed-off-by: Alexandre Jutras <alexandre.jutras@nxp.com>
Etienne Carriere [Mon, 18 Sep 2017 09:54:27 +0000 (11:54 +0200)]
staging/ion: fix unmapped heap conditional support
Fixes:
7c7d9c446252 "staging/ion: CONFIG_ION_UNMAPPED_HEAP conditions unmapped heap"
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
bf829aa7c001c085a47c715e04cb3c347b1a38f8
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Mon, 18 Sep 2017 09:54:19 +0000 (11:54 +0200)]
staging/ion: ARM64 supports ION_UNMAPPED_HEAP
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
916d9f36e107c37a88cb15924e0da8c5a572f90a
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Fri, 8 Sep 2017 11:56:26 +0000 (13:56 +0200)]
staging/ion: CONFIG_ION_UNMAPPED_HEAP conditions unmapped heap
Condition ION unmapped heap implementation to architectures that
currently support it. ARM is one of these.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
7c7d9c446252829aa138c87c47a937e2a3b4fd26
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Thu, 24 Aug 2017 13:44:46 +0000 (15:44 +0200)]
ion: fix unmapped heap test settings **not for mainline**
If one enables ION_DUMMY_UNMAPPED_HEAP without providing the target
unmapped heap configuration settings (physical base address and size),
the kernel cannot build. This situation occurs in Linux test build
cases, i.e running the allmodconfig configuration.
This change overcomes the issue by providing default null settings for
both ION_DUMMY_UNMAPPED_BASE and ION_DUMMY_UNMAPPED_SIZE.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit
ac0c2c26b9819c5e95d56cb2d8937de0357eecaa
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Thu, 23 Mar 2017 13:03:05 +0000 (14:03 +0100)]
ion: unmapped heap support in ion dummy driver **not for mainline**
Add configuration ION_DUMMY_UNMAPPED_HEAP to enable optional definition
of a statically defined "unmapped" heap for test purpose: kernel config
must provide the memory pool base address and byte size.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
961993fde60ebd06715d1433f8eb265471a0f38c
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Thu, 23 Mar 2017 13:02:44 +0000 (14:02 +0100)]
ion: "unmapped" heap for secure data path **not for mainline**
OP-TEE/SDP (Secure Data Path) memory pools are created through ION
secure type heap" from Allwinner. This change renames "secure" into
"unmapped" as, from Linux point of view, the heap constraint is
manipulating unmapped memory pools/buffers.
"Unmapped" heap support is integrated in ION UAPI (actually this was
the Allwinner initial proposal) and ION DT parsing support.
Based in work from Sunny <sunny@allwinnertech.com> for Allwinner.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
4a95713514ddc3d55d5df213513aeec5a3717243
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Etienne Carriere [Thu, 23 Mar 2017 13:02:08 +0000 (14:02 +0100)]
staging/ion: add Allwinner ION "secure" heap **not for mainline**
Dumped from:
https://github.com/loboris/OrangePI-Kernel/tree/master/linux-3.4
0cc8d855adb
Author: Sunny <sunny@allwinnertech.com> for Allwinner.
Changes made on original "secure heap" implementation:
- minor coding style: fix includes, empty lines and overlong lines,
indentation, comment layout.
- Original path modified the ion uapi. We do not attempt to modify
uapi/ion.h. "secure" (or "domain") heaps are under ID
ION_HEAP_TYPE_CUSTOM + 1 (legacy 'secure heap type' value).
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit
e31dd54997b050b6a6965d7cfbc795492256847c
linaro repo https://github.com/linaro-swg/linux.git
tag optee-v4.9-
20171005)
Richard Zhu [Fri, 2 Mar 2018 09:24:05 +0000 (17:24 +0800)]
MLK-17731 PCI: dwc: implement MSI-X support
The DWC MSI controller does not support different MSI-X target addresses
and does not allow to route individual IRQs to different CPUs. Aside
from those shortcomings it is able to support MSI-X just fine.
Some devices like the Intel i210 network controller depend on MSI-X to
be available to enable all hardware features, so even a feature limited
implementation of MSI-X on the host side is useful.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Richard Zhu [Tue, 27 Feb 2018 07:49:40 +0000 (15:49 +0800)]
MLK-17544 PCI: imx: change the imx6 specific name
Replace the specific name imx6_xxx by imx_xxx.
Since all imx6/7/8 PCIe use the same driver.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Franck LENORMAND [Fri, 9 Mar 2018 17:05:49 +0000 (18:05 +0100)]
MLK-17732-2: SM store: Support iMX8QX and iMX8QM
The iMX8 QX and QM have SECO/SCU enabled and the access
to SM registers is different as long as the addresses of
the pages.
Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
Franck LENORMAND [Thu, 8 Mar 2018 11:13:07 +0000 (12:13 +0100)]
MLK-17732-1: defconfig: imx8m: Enable SM keystore and test
We enable the SM keystore and its test by default to be
tested at the boot of the kernel.
Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
Laurentiu Palcu [Fri, 9 Mar 2018 12:12:58 +0000 (14:12 +0200)]
MLK-17648-2: drm: imx: dcss: Load the HDR10 from header file
This commit allows one to select if a firmware file is used, for loading
the HDR10 tables, or a header. By default, this will be header file.
This is until a proper way of passing the file from bootloader is found.
Also, fix a minor bug which made parsing the tables over the actual data
limit.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Laurentiu Palcu [Fri, 9 Mar 2018 12:09:00 +0000 (14:09 +0200)]
MLK-17648-1: drm: imx: dcss: add HDR10 module tables
This commit adds HDR10 tables as a header. Using a FW file is
problematic since the tables need to be available immediately after
boot. After the rootfs is mounted, as is the case for loading a FW file,
it's already too late if some conversion tables are needed.
This usually happens if the output pipe is configured as YUV420.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Cosmin-Gabriel Samoila [Fri, 9 Mar 2018 09:49:58 +0000 (11:49 +0200)]
MLK-17743 ASoC: codecs: ak4458: Fix mute gpio mixed with pdn gpio
Fix bug when PDN gpio is requested instead of mute gpio.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Viorel Suman [Fri, 9 Mar 2018 10:41:42 +0000 (12:41 +0200)]
MLK-17580: ASoC: fsl: sai: check for pinctrl status
For some cases (like AMIX) pinctrl may be null - this
breaks SAI functionality. Enforce pinctrl null pointer
checking prior calling any function which involves
pins state changes.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Fugang Duan [Thu, 8 Mar 2018 10:43:10 +0000 (18:43 +0800)]
MLK-17740 ARM: imx_v7_defconfig: enable wireless HOSTAP
Add wireless HOSTAP config enable for i.MX7ULP Murata 1PJ (Qca9377-3).
Reviewed-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Thu, 1 Mar 2018 01:48:05 +0000 (09:48 +0800)]
MLK-17603 arm: dts: imx7d-sdb-epdc: enable enet1 for epdc extra dts file
Enable enet1 for epdc extra dts file since only enet2 has pin conflict
with epdc.
Reviewed-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Tue, 6 Mar 2018 09:41:14 +0000 (17:41 +0800)]
MLK-17739 tty: serial: imx: clear wakeup flag before enable wakeup interrupt
It is better to clear wakeup flag in status register before enable
wakeup interrupt bits, which can avoid system suspend fail during
devices no irq suspend stage.
Reviewed-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Mon, 5 Mar 2018 10:45:51 +0000 (18:45 +0800)]
MLK-17738 tty: serial: lpuart: restore console setting after power lost
i.MX7ULP enter VLLS mode that lpuart module power off and registers
all lost no matter the port is wakeup source.
For console port, console baud rate setting lost and print messy
log when enable the console port as wakeup source. To avoid the
issue happen, user should not enable uart port as wakeup source
in VLLS mode, or restore console setting.
The patch is to add one fixup to restore console port register setting
for i.MX7ULP platform.
Reviewed-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Fri, 23 Feb 2018 03:32:27 +0000 (11:32 +0800)]
MLK-17737 net: fec: fix the struct define issue
Fix the cherry pick and merge issue by below commit on kernel 4.9:
Fixes:
19b76fd012ce ("net: fec: add stop mode support for dts register set")
Reviewed-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Fugang Duan <B38611@freescale.com>
Fugang Duan [Fri, 9 Mar 2018 03:04:18 +0000 (11:04 +0800)]
MLK-17736-02 dts: imx7ulp-evk: add interrupt property for rpmsg io node
Add interrupt property for rpmsg io node.
Reviewed-by: Robin Gong<yibin.gong@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Thu, 1 Feb 2018 05:53:24 +0000 (13:53 +0800)]
MLK-17736-01 gpio: imx-rpmsg: add gpio interrupt chip support
Add gpio interrupt chip support that only support wakeup feature
by M4 core.
Reviewed-by: Robin Gong<yibin.gong@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Wed, 7 Mar 2018 10:41:21 +0000 (18:41 +0800)]
MLK-17735 ARM: imx: pm-rpmsg: ensure the pm is late suspended and early resumed
Since some drivers using rpmsg io as wakeup source enable the wakeup
in suspend stage, then it has to ensure pm rpmsg driver pm sleep is
late suspended and early resumed, otherwise M4 will wakeup A core
directly even if there has no wakeup signal.
Reviewed-by: Robin Gong<yibin.gong@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Viorel Suman [Thu, 8 Mar 2018 12:46:07 +0000 (14:46 +0200)]
MLK-17580: ARM64: dts: support DSD512 for ak4497
Add a dedicated DSD512 pinmux group for DSD512 in order
to eliminate the noise caused by a hight MCLK rate.
With the new option the SAI1 BCLK is routed to codec MCLK pin.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
Viorel Suman [Thu, 8 Mar 2018 12:43:34 +0000 (14:43 +0200)]
MLK-17580: ASoC: fsl: sai: Use DSD helper
Replace DSD related code with calls to DSD helper functions.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
Viorel Suman [Thu, 8 Mar 2018 12:37:30 +0000 (14:37 +0200)]
MLK-17580: ASoC: fsl: dsd: Add DSD utilities helper
Add DSD utilities helper.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com
Daniel Baluta [Thu, 8 Mar 2018 17:04:19 +0000 (19:04 +0200)]
MLK-17734-2: ASoC: fsl: ak5558: Remove support for 192KHz in TDM mode
Using TDM256 mode (our only supported mode) in order to
support 192KHz we would need a MCLK of 192000 * 512 =
98304000.
But maximum frequency supported by the Audio PLL is 4.91 MHz.
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Daniel Baluta [Thu, 8 Mar 2018 16:55:32 +0000 (18:55 +0200)]
MLK-17734-1: ASoC: fsl: imx-ak5558: Fix TDM mode for 8kHz / 16Khz
In order for TDM to correctly work we need that MCLK and
BCLK to follow the values in Table 9.
Thus,
* TDM128: BCLK = 128fs, MCLK = 128-1024fs
* TDM256: BCLK = 256fs, MCLK = 256-1024fs
* TDM512: BCLK = 512fs, MCLK = 512-1024fs
We assume only support TDM256 for the moment.
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Laurentiu Palcu [Thu, 8 Mar 2018 09:47:05 +0000 (11:47 +0200)]
MLK-17647: drm: imx: dcss: fix the flip_done timed out problem
The commit:
44c45128 - MLK-17634-1: drm: imx: dcss: send vblank event from ISR
made some changes related to vblank handling. However, it looks like
they were not robust enough and, sometimes, the flip events are not
sent. This happens only when playing videos over Weston.
This patch, effectively, reverts those changes.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Yuchou Gan [Fri, 9 Mar 2018 14:37:15 +0000 (22:37 +0800)]
MGS-3724 increase the core clock rate for qxp B0 board.
The qxp B0 board gpu core clock rate is 700MHz, increase to it.
Signed-off-by: Yuchou Gan<yuchou.gan@nxp.com>
Robert Chiras [Thu, 8 Mar 2018 11:53:53 +0000 (13:53 +0200)]
MLK-17689-3: arm64: dts: fsl-imx8mq-evk: Fix clocks for DCSS-RM67191
Currently, the default clock configuration for DCSS configures the pixel
clock to be sourced from VIDEO_PLL2, but this source cannot be used by the
DSI PHY_REF clock.
So, in order to make DCSS working with DSI, we need to have them both
(DCSS and DSI PHY) use the same clock source: VIDEO_PLL1.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Sandor Yu [Thu, 8 Mar 2018 08:14:36 +0000 (16:14 +0800)]
MLK-17692-4: imx hdp: Add pixel clock return check
Return 0 if pixel clock isn't supported by hdmi phy.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 6 Mar 2018 09:17:35 +0000 (17:17 +0800)]
MLK-17692-3: imx hdp: Remove CDN vic table
Remove CDN vic table and replace with drm_display_mode.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 6 Mar 2018 09:11:04 +0000 (17:11 +0800)]
MLK-17692-2: defconfig: Remove FB_MX8_HDMI
Remove FB_MX8_HDMI.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Sandor Yu [Tue, 6 Mar 2018 09:01:18 +0000 (17:01 +0800)]
MLK-17692-1: fbdev: Remove imx8 hdmi fb driver
imx8 hdmi fb driver is not maintain.
imx8 hdmi function have implemented with DRM framework
in driver/gpu/drm/imx folder.
So remove hdmi fb driver.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Anson Huang [Thu, 8 Mar 2018 03:23:17 +0000 (11:23 +0800)]
MLK-17730 rtc: rtc-imx-sc: only print once for read time error
As RTC read time will be called periodically, to avoid
too many error messages when RTC is NOT ready in SCFW,
change the error print to only print once.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Wed, 7 Mar 2018 06:01:39 +0000 (14:01 +0800)]
MLK-17698-6 ARM64: dts: freescale: imx8qm: enable mek board pmic thermal zone
Enable i.MX8QM MEK board PMIC thermal zone.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Tue, 6 Mar 2018 08:33:09 +0000 (16:33 +0800)]
MLK-17698-5 thermal: imx_sc: add PMIC thermal sensor for i.MX8QM
Remove unused thermal sensors and add PMIC thermal sensors
for i.MX8QM.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Wed, 7 Mar 2018 05:53:40 +0000 (13:53 +0800)]
MLK-17698-4 ARM64: dts: freescale: imx8qxp: enable mek board pmic thermal zone
Enable i.MX8QXP MEK board PMIC thermal zone.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Tue, 6 Mar 2018 07:39:46 +0000 (15:39 +0800)]
MLK-17698-3 thermal: imx_sc: add PMIC thermal sensors for i.MX8QXP
Add PMIC thermal sensors for i.MX8QXP.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Tue, 6 Mar 2018 07:37:25 +0000 (15:37 +0800)]
MLK-17698-2 ARM64: dts: freescale: imx8qxp: update thermal zone info
Update thermal zone number, including CPU thermal
zone and DRC thermal zone.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Anson Huang [Tue, 6 Mar 2018 07:37:10 +0000 (15:37 +0800)]
MLK-17698-1 thermal: imx_sc: use system controller thermal sensor for A35 CPU
Now that SCFW (
0d43db9 SCF-22: Move SCU controls to SYSTEM.
Allows AP to use SCU temp sensor.) exposes SCU's temp sensor
for AP, and it is placed more close to i.MX8QXP A35 core, so
it should be used as A35's CPU thermal sensor, add this change
and move DRC temp sensor to a new thermal zone.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
Oliver Brown [Wed, 7 Mar 2018 19:27:47 +0000 (13:27 -0600)]
MLK-17729: ARM64: dts: Add power domains for display resources
Some resources are being enabled without the associated resource being
powered up.
Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
Gao Pan [Tue, 6 Mar 2018 01:25:10 +0000 (09:25 +0800)]
MLK-17672 lpspi: fix clock polarity issue and DBT issue
1. Fix code error of changing lpspi clock polarity.
2. Set one SPI clock period for DBT parameter.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Reviewed-by: Han Xu <han.xu@nxp.com>
Andrii Anisov [Tue, 7 Feb 2017 17:58:03 +0000 (19:58 +0200)]
MLK-17701 swiotlb-xen: implement xen_swiotlb_get_sgtable callback
Signed-off-by: Andrii Anisov <andrii_anisov@epam.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
(cherry picked from commit
69369f52d28a34c84acb6f2a8a585e743441566a)
on 8QM A0, video play use ion to allocate buffer and mmap buffer,
there is a call dma_get_sgtable, but xen arm not implement that.
when playing video, GPU driver will use sg dma address, but because
of xen_swiotlb_get_sgtable not implemented, sg->amd_address is not
exactly the address that ion allocated. This patch fixes the issue.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
Cosmin-Gabriel Samoila [Wed, 7 Mar 2018 09:45:22 +0000 (11:45 +0200)]
Sound: SoC: codecs: Put AK4458 codec in manual mode
We cannot both derive SAI BCLK for 384KHz-S32/768KHz-S16 and
respect the codec MCLK restrictions shown in AK4458 datasheet
Table 5, 6 and 7.
Since we can have same master clock for SAI and Codec in Manual
Mode, we've chosen to use it instead of Auto Mode.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Cosmin-Gabriel Samoila [Wed, 7 Mar 2018 09:35:07 +0000 (11:35 +0200)]
Sound: Soc: fsl: Set SAI Channel Mode to Output Mode
Transmit data pins will output zero when slots are masked or channels
are disabled. In CHMOD TDM mode, transmit data pins are tri-stated when
slots are masked or channels are disabled. When data pins are tri-stated,
there is noise on some channels when FS clock value is high and data is
read while fsclk is transitioning from high to low.
Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Shengjiu Wang [Wed, 7 Mar 2018 10:27:48 +0000 (18:27 +0800)]
MLK-17569-2: hdp: add channel/speaker allocation for 4 channel
According to CEA-861-E section 6.6.2, add channel/speaker
allocation configuration for 4 channel.
0x0: FL, FR
0x3: FL, FR, LFE, FC
0x1F:FL, FR, LFE, FC, RL, RR, FLC, FRC
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Shengjiu Wang [Wed, 7 Mar 2018 10:23:23 +0000 (18:23 +0800)]
MLK-17569-1: hdp: fix channel swapping issue for hdmi audio
There is channel swapping issue for 4 channel and 8 channel audio.
After dump the register, found that SMPL2PKT_CNFG is not set
correctly, the reason is that F_NUM_OF_I2S_PORTS should be
F_NUM_OF_I2S_PORTS_S.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>
Shengjiu Wang [Wed, 7 Mar 2018 03:14:53 +0000 (11:14 +0800)]
MLK-17156-7: ASoC: imx-rpmsg: use rpmsg codec instead the dummy
use the rpmsg_wm8960 codec instead of the dummy codec
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Tue, 6 Mar 2018 04:46:18 +0000 (12:46 +0800)]
MLK-17156-6: ASoC: imx-pcm-rpmsg: fix get codec data failed
Receive message is only used when the type is B. originally
we copy the receive message to revg_msg all the time, when
the message type is C, which will overide the revg_msg, which
cause the get codec data command return wrong value.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Wed, 7 Mar 2018 03:15:23 +0000 (11:15 +0800)]
MLK-17156-5: ASoC: imx-pcm-rpmsg: register rpmsg codec
register rpmsg codec after the rpmsg-audio-channel is
ready.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Wed, 7 Mar 2018 03:14:29 +0000 (11:14 +0800)]
MLK-17156-4: ASoC: rpmsg_wm8960: add rpmsg_wm8960 codec
This codec is accessed by rpmsg. As the wm8960 is controlled
mainly by M4, so we only add volume in this rpmsg_wm8960 codec.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Tue, 6 Mar 2018 04:45:22 +0000 (12:45 +0800)]
MLK-17156-3: ASoC: fs_rpmsg_i2s: update the protocol for i2c message
rpmsg provide command for A7 side to set the codec value and get
codec value by i2c. In this case, the A7 can control the codec.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Tue, 6 Mar 2018 04:46:45 +0000 (12:46 +0800)]
MLK-17156-2: ARM: dts: update dts for demo audio in A7 domain
This is dts is for demo SAI + codec in A7 domain, which need to
do i2c hardware rework, connect the wm8960 to i2c7.
for this is for demo usage, so don't need the headphone plug/unplug
event, so remove the iomux for this case.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Tue, 6 Mar 2018 03:45:30 +0000 (11:45 +0800)]
MLK-17156-1: ASoC: fsl_sai: update register offset for ULP B0
ULP B0 integrate the latest SAI IP, there is version id and
parameter id register in the beginning, so update the offset
for ULP B0
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Adriana Reus [Tue, 6 Mar 2018 13:28:03 +0000 (15:28 +0200)]
MLK-17696: Change resource from PID_0 to SYSTEM for scu control.
Syncs with the following change in scfw.
Author: Chuck Cannon <chuck.cannon@freescale.com>
Date: Mon Mar 5 07:44:27 2018 -0600
SCF-22: Move SCU controls to SYSTEM. Allows AP to use SCU temp
sensor.
BuildInfo:
- SCFW
e56d4c0a, IMX-MKIMAGE
d4e440b2, ATF
4af5ca0
- U-Boot 2017.03-imx_v2017.03_4.9.51_imx8_beta2+gf195c38
Tested-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Nitin Garg <nitin.garg@nxp.com>
Signed-off-by: Adriana Reus <adriana.reus@nxp.com>
Laurentiu Palcu [Tue, 6 Mar 2018 11:56:55 +0000 (13:56 +0200)]
MLK-17645: drm: imx: dcss: fix DTRC start issue
The following commit:
af01350 - MLK-17634-18: drm: imx: dcss: optimize context loading and DDR
bus load
introduced a regression. During my attempts to fix various green screen
issues, I modified the DTRC start routine by enabling the other register
bank, not the current one.
Unfortunately, this was committed by mistake...
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Laurentiu Palcu [Fri, 2 Mar 2018 08:56:15 +0000 (10:56 +0200)]
MLK-17655: drm: imx: hdp: send HDR metadata when property is set
HDR metadata infoframe was sent only when doing a mode set. However,
kmssink is using the same device as Weston and mode setting messes up
with Weston's plane state.
This patch allows for the HDR metadata to be sent out to the sink when
the property is set. Hence, no need for a mode set.
Also, the older functionality allowed only for 4K@60 to be used for HDR.
However, HDR is not about resolution. This patch will also allow to go
to HDR mode in other resolutions as well.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Laurentiu Palcu [Tue, 6 Mar 2018 09:18:54 +0000 (11:18 +0200)]
MLK-17671-2: drm: imx: hdp: mscale: remove delay at the end of mode setting
Since DCSS was moved to use VIDEO2_PLL clock, HDMI phy clock is not used
anymore. Hence, this delay here is not necessary. It's been added inside
DCSS driver.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>