1
0
Fork 0
Commit Graph

881527 Commits (8e298b9ca4eef2e5b29f4e0dbdd51ef2446ed596)

Author SHA1 Message Date
Han Xu 2c4cf9ce2f MLK-23644: spi: spi-nxp-fspi: enable runtime pm for fspi
enable the runtime PM in fspi driver. Reading the power mode from the
debug monitor, FSPI_0 was on and with the patch it is lp.

Signed-off-by: Han Xu <han.xu@nxp.com>
2020-03-22 22:23:49 -05:00
Minjie Zhuang a31a61aa1d MGS-5554 [#imx-1868] update gc_feature_database.h and gc_hal_enum.h file
update gc_feature_database.h file for patch_base_on_6.4.0.p2_from_20200227_20200306
update gc_hal_enum.h for fixing R/B swap issue with 2D HWC composition on m865

Signed-off-by: Minjie Zhuang <minjie.zhuang@nxp.com>
2020-03-20 16:48:37 +08:00
Alice Guo 04e7c76cff MLK-23626-3 arm64: dts: imx8mq: let inmate dts do not include .dtsi
Rewrite inmate dts for jailhouse dual linux case.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
2020-03-21 22:08:16 +08:00
Alice Guo 161c003bfc MLK-23626-2 arm64: dts: imx8mn: let inmate dts do not include .dtsi
Rewrite inmate dts for jailhouse dual linux case.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
2020-03-21 22:08:16 +08:00
Alice Guo 705e7f1b29 MLK-23626-1 arm64: dts: imx8mm: let inmate dts do not include .dtsi
Rewrite inmate dts for jailhouse dual linux case.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
2020-03-21 22:08:16 +08:00
Iuliana Prodan 90d1ac247c MLK-23620-3 crypto: caam - update the check for the return code of caam_jr_enqueue function
In commit 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function"),
the return code of caam_jr_enqueue function was changed
from 0 to -EINPROGRESS, in case of success, -ENOSPC in case
the CAAM is busy (has no space left in job ring queue),
-EIO if it cannot map the caller's descriptor.

Update the case for exiting from sm_key_job based on
the new return code from caam_jr_enqueue function.

Fixes: 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function")
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
2020-03-19 11:07:46 +02:00
Iuliana Prodan 9d481aee74 MLK-23620-2 dma: caam - update the check for the return code of caam_jr_enqueue function
In commit 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function"),
the return code of caam_jr_enqueue function was changed
from 0 to -EINPROGRESS, in case of success, -ENOSPC in case
the CAAM is busy (has no space left in job ring queue),
-EIO if it cannot map the caller's descriptor.

Update the case for break from the loop of caam_dma_prep_memcpy
based on the new return code from caam_jr_enqueue function.

Fixes: 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function")
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
2020-03-19 11:07:32 +02:00
Iuliana Prodan 4031641e56 MLK-23620-1 security/keys/secure_key: update the check for the return code of caam_jr_enqueue function
In commit 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function"),
the return code of caam_jr_enqueue function was changed
from 0 to -EINPROGRESS, in case of success, -ENOSPC in case
the CAAM is busy (has no space left in job ring queue),
-EIO if it cannot map the caller's descriptor.

Update the case for wait_for_completion in sk_job_submit
based on the new return code from caam_jr_enqueue function.

Fixes: 4d370a1036 ("crypto: caam - change return code in caam_jr_enqueue function")
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
2020-03-19 11:06:49 +02:00
Anson Huang 3a6947d9cc MLK-23627 thermal: imx_sc_thermal: Fix incorrect data type
The temperature value passed from SCU could be negative value,
the data type should be signed instead of unsigned.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
2020-03-19 16:45:49 +08:00
Peter Chen 147a7ddcfa
MLK-23595-5 usb: cdns3: gadget: sg_support is only for DEV_VER_V2
The scatter buffer list support earlies for DEV_VER_V2 is not
good enough, software can't know short transfer well per
transfer. So, we only support sg for DEV_VER_V2.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2020-03-19 15:06:56 +08:00
Peter Chen 2d985587f1
MLK-23595-4 usb: cdns3: gadget: calculate short transfer req->actual correctly
For short transfer, every TRB was finished in TD according to DMA pointer,
but the Transfer Length for TRBs which were not handled were not updated,
so we can't calculte these TRBs.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2020-03-19 15:06:53 +08:00
Peter Chen eca571c273
MLK-23595-3 usb: cdns3: gadget: improve the dump TRB at cdns3_ep_run_transfer
We need to dump all TRBs for this transfer, but ont only the last one.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2020-03-19 15:06:49 +08:00
Peter Chen 3490e68497
MLK-23595-2 usb: cdns3: gadget: add CHAIN and ISP bit for sg list
For sg buffer list use case, we need to add ISP for each TRB, and
add CHAIN bit for each TRB except for the last TRB.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2020-03-19 15:06:44 +08:00
Peter Chen d2e892c29d
MLK-23595-1 usb: cdns3: gadget: calculate TDL per TD
TDL is for TD length, so we need to calculate this value per
TD, but not for TRB, and the TDL is only needed for the first
TRB in TD.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2020-03-19 15:06:25 +08:00
Viorel Suman a9972cff81 MLK-23579: dts: arm64: imx8mp-ab2: remove mask for 2ch dsd
Due to 8MQ/MM IOMUX specifics for DSD stereo case the audio
data is routed via DATA0 and DATA4 SAI1 signals, thus a
specific channel map is required for DSD stereo case. For
8MP there is no need for a such specific case, so remove it.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
2020-03-18 16:10:54 +02:00
Liu Ying 4869f6ea8c MLK-23616-3 phy: fsl-imx8mp-lvds: Enable/disable APB clock when necessary
The phy registers are accessible after APB clock is enabled,
otherwise, the system may hang.  We see the system hang issue
at the driver resume stage due to the disabled APB clock.
This patch fixes this issue by enabling/disabling the clock
when necessary.

Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
2020-03-18 18:44:29 +08:00
Liu Ying 04f3727879 MLK-23616-2 arm64: imx8mp.dtsi: Add APB clock related properties in lvds phy node
This patch adds APB clock related properties in lvds phy node,
so that the driver may get and control the APB clock.

Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
2020-03-18 18:44:15 +08:00
Liu Ying 3c97abb581 MLK-23616-1 dt-bindings: imx8mp-lvds-phy: Add APB clock relevant properties
The phy registers are accessible after APB clock is enabled.
So, add the relevant clock properties in device tree doc.

Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
2020-03-18 18:43:57 +08:00
Shengjiu Wang f967f755ed MLK-23618-16: arm64: dts: remove unneeded power domain for audio modules
The power domain for clocks is not needed by audio drivers, which
is handled by clock driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:28 +08:00
Shengjiu Wang a8fa53ea78 MLK-23618-15: clk: imx: 8dxl-acm: Support pm runtime
Support pm runtime, that power domain of ACM can
enter suspend.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:24 +08:00
Shengjiu Wang c95f0c4ea3 MLK-23618-14: clk: imx: 8qm-acm: Support pm runtime
Support pm runtime, that power domain of ACM can
enter suspend.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:20 +08:00
Shengjiu Wang c1ed1dd2bf MLK-23618-13: clk: imx: 8qxp-acm: Support pm runtime
Support pm runtime, that power domain of ACM can
enter suspend.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:16 +08:00
Shengjiu Wang 3864790e2a MLK-23618-12: clk: imx: acm: add acm utils function
Add some common code for handling multi power domain
to an utils file, that can share between 8qxp/8qm/8dxl.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:12 +08:00
Shengjiu Wang d55d453fdf MLK-23618-11: ASoC: fsl_spdif: Don't bind clock with regmap
The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
      - clk_pm_runtime_get()

Cause the power domain of lpcg clock always be enabled.
which impact the power consumption.

So we can't bind clock with regmap, then explicitly enable
clock when using. As we already enable all clock in
pm_runtime_resume, so only need to enable clock in probe.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:07 +08:00
Shengjiu Wang d91068f322 MLK-23618-10: ASoC: fsl_esai: Don't bind clock with regmap
The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
      - clk_pm_runtime_get()

Cause the power domain of lpcg clock always be enabled.
which impact the power consumption.

So we can't bind clock with regmap, then explicitly enable
clock when using. As we already enable all clock in
pm_runtime_resume, so only need to enable clock in probe.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:42:03 +08:00
Shengjiu Wang c2641e1974 MLK-23618-9: ASoC: fsl_sai: Don't bind clock with regmap
The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
      - clk_pm_runtime_get()

Cause the power domain of lpcg clock always be enabled.
which impact the power consumption.

So we can't bind clock with regmap, then explicitly enable
clock when using. As we already enable all clock in
pm_runtime_resume, so only need to enable clock in probe.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:58 +08:00
Shengjiu Wang 45db541836 MLK-23618-8: ASoC: fsl_audmix: Don't bind clock with regmap
The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
      - clk_pm_runtime_get()

Cause the power domain of lpcg clock always be enabled.
which impact the power consumption.

So we can't bind clock with regmap, then explicitly enable
clock when using. As we already enable all clock in
pm_runtime_resume, so only need to enable clock in probe.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:54 +08:00
Shengjiu Wang 1d46a32f50 MLK-23618-7: ASoC: fsl_asrc: Don't bind clock with regmap
The call flow:
devm_regmap_init_mmio_clk
   - clk_prepare()
     - clk_pm_runtime_get()

Cause the power domain of lpcg clock always be enabled.
which impact the power consumption.

So we can't bind clock with regmap, then explicitly enable
clock when using. As we already enable all clock in
pm_runtime_resume, so only need to enable clock in probe.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:50 +08:00
Shengjiu Wang ee1a47b87f MLK-23618-6: ASoC: fsl_dsp: refine handling of multi power domain
The attached multi power domain is enabled by device_link_add
So we need to disable them in probe, otherwise it may impact
the power consumption.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:46 +08:00
Shengjiu Wang c43a9a158c MLK-23618-5: Revert "ASoC: cs42xx8: support multi power domain"
This reverts commit 62e2861cf0.

The power domain of clock should be controlled by clock driver,
We don't need to control it in audio driver, so we don't
need to support multi power domain in audio driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:41 +08:00
Shengjiu Wang 529a1cb73d MLK-23618-4: Revert "ASoC: fsl_spdif:Support multi power domains"
This reverts commit bd7b26036e.

The power domain of clock should be controlled by clock driver,
We don't need to control it in audio driver, so we don't
need to support multi power domain in audio driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:36 +08:00
Shengjiu Wang b1024cf8bb MLK-23618-3: Revert "ASoC: fsl_asrc: support multi power domain"
This reverts commit 442ad6fd0c.

The power domain of clock should be controlled by clock driver,
We don't need to control it in audio driver, so we don't
need to support multi power domain in audio driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:31 +08:00
Shengjiu Wang 6ee466819d MLK-23618-2: Revert "ASoC: fsl_esai: support multi power domain"
This reverts commit 4058ef0bb8.

The power domain of clock should be controlled by clock driver,
We don't need to control it in audio driver, so we don't
need to support multi power domain in audio driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:26 +08:00
Shengjiu Wang 1fe9eac911 MLK-23618-1: Revert "ASoC: fsl_sai: support multi power domain"
This reverts commit 53915e7ea9.

The power domain of clock should be controlled by clock driver,
We don't need to control it in audio driver, so we don't
need to support multi power domain in audio driver.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
2020-03-18 15:41:20 +08:00
Fugang Duan d1359d9382 MLK-23409 net: stmmac: correctly handle mdio bus reset error path
Correctly handle mdio bus reset error path.

Tested-by: Jian Li <jian.li@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2020-03-18 15:29:07 +08:00
Jacky Bai 91a988106b MLK-23622-02 arm64: dts: imx8mp: Add active-wakeup property for hsiomix
The HSIOMIX domain need to be on if usb wakeup is enabled for system
wakeup source, so add the 'active-wakeup' property for this domain.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
2020-03-18 14:12:02 +08:00
Jacky Bai c545e706e4 MLK-23622-01 soc: imx: Add active wakeup flag for domain with active-wakeup property
Add the active wakeup flag if a power domain has such requirement.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
2020-03-18 14:11:54 +08:00
Jacky Bai 46814fb05c arm64: dts: imx8mp: Add power domain property for vpu nodes
Add power domain property for vpu node to enable power domain
off when module entering runtime PM.

BuildInfo:
         - ATF 13de44f73

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Zhou Peng <eagle.zhou@nxp.com>
2020-03-18 11:11:59 +08:00
Anson Huang d1236dcacf MLK-23621 arm64: dts: imx8dxl: Add A35 cpu-freq support
Add A35 cpu-freq support, 900MHz and 1.2GHz are supported.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
2020-03-18 10:45:40 +08:00
Li Jun 9998366273 MLK-23596-2 ARM64: dtsi: imx8mp: add soft-itp-sync property for usb
SOFITPSYNC
If this bit is set to '0' operating in host mode, the core keeps the
UTMI/ULPI PHY on the first port in a non-suspended state whenever there
is a SuperSpeed port that is not in Rx.Detect, SS.Disable and U3.
If this bit is set to '1' operating in host mode, the core keeps the
UTMI/ULPI PHY on the first port in a non-suspended state whenever the
other non-SuperSpeed ports are not in a suspended state. This feature is
useful because it saves power by suspending UTMI/ULPI when SuperSpeed
only is active, and it helps resolve when the PHY does not transmit a
host resume unless it is placed in suspend state. This bit must be
programmed as a part of initialization at power-on reset, and must not
be dynamically changed afterwards.

with this property specified, this bit is set to be 1.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
2020-03-17 19:38:52 +08:00
Li Jun abb33607ed MLK-23596-1 usb: dwc3:host: add soft ITP sync support
On some platforms, if the ITP counter clock is from utmi_clk, and
the usb2 suspended firstly, then the ITP clock will miss, to resolve
this, we can use soft ITP sync to make dwc3 core use ref_clk for ITP
counter.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
2020-03-17 19:38:44 +08:00
Viorel Suman d550cd7a1e MLK-23586: dts: arm64: imx8mp-ab2: disable busfreq node
Disable busfreq node for AB2 as currently it is
causing "underrun" errors.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2020-03-17 13:13:41 +02:00
Li Jun 52237fc29c MLK-16013-14 usb: typec: tcpci: handle fault event
We need clear any fault alerts to make tcpci controller to recover
from fault.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
2020-03-17 11:07:10 +08:00
Guoniu.zhou 5a740a3218 MLK-23578-2: arm64: dts: add ISI m2m device node for i.MX865
Add ISI m2m device node in dts for i.MX865 platform

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
2020-03-16 17:43:24 +08:00
Guoniu.zhou 3fb05200e0 MLK-23578-1: media: m2m: enable ISI m2m feature for i.MX865
Enable ISI m2m feature for i.MX865. For i.MX8QXP and QM, ISI
use port 5 as image source port from memory, but for i.MX865,
it change to port 2, so add this info as platform data and
configure image source port selection according to the data.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
Reviewed-by: Sandor Yu <Sandor.yu@nxp.com>
2020-03-16 17:43:16 +08:00
Li Jun 2304d8ebe9 MLK-23587-2 usb: dwc3: drd: don't free_irq for role switch
As role switch class does not use otg irq like edev, so don't
do free irq for it.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit fd263a3edd95dfe812397fabf1059b5f99bba2ab)
2020-03-15 17:51:02 +08:00
Li Jun 9cc87b55a4 MLK-23587-1 usb: dwc3: imx8mp: keep runtime active when remove driver
As driver removal will do clocks disable, we don't need runtime
suspend to disable clocks, so keep runtime resume when driver
remove.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Reviewed-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit 24b9a59b32127af6e217e56490d643f39ca6ff60)
2020-03-15 17:51:02 +08:00
Li Jun 1ead578c33 MLK-23531 usb: dwc3: gadget: add skip_remain_trbs flag
If we're in the middle of series of chained TRBs and we
receive a short transfer along the way, DWC3 will skip
through all TRBs including the last TRB in the chain, DWC3
will avoid clearing HWO bit and SW has to do it manually.
but currect code can't hit the condition when loop sgs of
request in dwc3_gadget_ep_reclaim_trb_sg() if short packet
received for one chained trb, because it only check the HWO
bit of all trbs and then break if it's 1, so the remain trbs
has no chance to be handled by dwc3_gadget_ep_reclaim_completed_trb(),
this patch adds a flag if received a short packet in a chained
trb, and let dwc3_gadget_ep_reclaim_trb_sg() continue handle
all trbs and give back to function driver.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
2020-03-15 17:47:58 +08:00
Han Xu ad81692901 MLK-23588: arm64: dts: enable usbotg on imx8qxp lpddr4 val board for uuu download
Enabled the usbotg ports on imx8qxp lpddr4 val board for uuu download
NAND image.

Signed-off-by: Han Xu <han.xu@nxp.com>
Reviewed-by: Frank Li <frank.li@nxp.com>
2020-03-13 15:32:19 -05:00
Silvano di Ninno 7753837330 arm64: dts: imx8dxl Add caam node
8DXL have a different IRQ mapping compare to
8QM and 8QxP.

Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
2020-03-13 22:44:22 +01:00