Robert Chiras [Fri, 1 Mar 2019 08:39:19 +0000 (10:39 +0200)]
MLK-20718-4: arm64: dts: imx8qm: Use DSI PHY_REF clk
Until now, the DSI PHY_REF clock was by default ON in SCFW, which made
this clock unusable in kernel, therefore, this clock was set as
CLK_DUMMY in DSI device nodes.
Sinnce this clock was set to OFF in SCFW, now it can be used from
kernel, so add it to device nodes so that the driver can use it
properly.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Robert Chiras [Fri, 1 Mar 2019 08:35:32 +0000 (10:35 +0200)]
MLK-20718-3: arm64: dts: imx8dx: Use DSI PHY_REF clk
Until now, the DSI PHY_REF clock was by default ON in SCFW, which made
this clock unusable in kernel, therefore, this clock was set as
CLK_DUMMY in DSI device nodes.
Sinnce this clock was set to OFF in SCFW, now it can be used from
kernel, so add it to device nodes so that the driver can use it
properly.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Robert Chiras [Fri, 1 Mar 2019 08:30:02 +0000 (10:30 +0200)]
MLK-20718-2: clk: imx8qxp: Add DSI phy_ref clk for second instance
The DSI PHY_REF clock for the second DSI instance was missing from the
clock driver, so add it now.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Robert Chiras [Fri, 1 Mar 2019 08:27:25 +0000 (10:27 +0200)]
MLK-20718-1: clk: imx8qm: Add DSI phy_ref clock
Add the missing clocks for the DSI PHY_REF:
IMX8QM_MIPI0_DSI_PHY_CLK and IMX8QM_MIPI1_DSI_PHY_CLK.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>
Robby Cai [Thu, 6 Dec 2018 10:17:35 +0000 (18:17 +0800)]
MLK-20558 media: camera: add QVGA 30fps support for ov5640
Add QVGA @30fps support for ov5640
Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit
c2dd4525e766355076e8fb8f0ae40fe98c27130a)
Mirela Rabulea [Wed, 12 Sep 2018 08:50:54 +0000 (11:50 +0300)]
MLK-19362: media: csi: Fix "Hresponse" and "Rx fifo overflow" camera errors
When the register setting for fifo_send_level is set to high, some residual
data of a frame which cannot fill up to the send_level, will be sent with
the next frame data. In this case, for CSI receive dma, sometimes,
the vertical blanking is too short to finish the storage of the previous
frame before the next frame start, depending on the system bandwidth.
Tested on imx8mq-evk rev B4 and B3, with OV5640 camera.
This patch was proposed by Tom Zheng <haidong.zheng@nxp.com>
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit
12f811f934b53008a445c3af67f1f22baea98a86)
Robby Cai [Tue, 11 Sep 2018 07:01:10 +0000 (15:01 +0800)]
MLK-19537-2 media: mipi_csi: use PHY slave reset for MIPI CSI
Remove PHY master reset and only need to use PHY slave reset for MIPI CSI.
Use regmap framework for cleanup.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit
6968f84ad8ee1613ff90d90e19e7434d5dd95126)
(cherry picked from commit
8a93a78c9bee1b456961a6d611f31d7708089798)
Robby Cai [Mon, 11 Jun 2018 02:38:43 +0000 (10:38 +0800)]
MLK-18552-2 media: mipi_csi: enable disp_axi and disp_apb before the access
On i.MX8MM, IC design uses registers from CSI to do MIPI PHY reset. Need enable
disp_axi and disp_apb before the access, otherwise meet hang issue.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit
86ff2008b5a33d4233c33c2e662f8391cc474db2)
Robby Cai [Wed, 23 May 2018 13:03:27 +0000 (21:03 +0800)]
MLK-18362-2 midea: mipi_csi: add mipi phy reset on imx8mm
on imx8mm, use different way rather than via SRC. so use different
device id to distinguish different MIPI-PHY reset method.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit
59e5fa6d4e8ad5c3d4fcd54aa8fa0a0d98e148b6)
Gao Pan [Mon, 4 Jun 2018 07:47:21 +0000 (15:47 +0800)]
MLK-18485 emvsim: enable CWT for ATR
Enable CWT for ATR, and switch to RX_DATA_IM to detect receiving data
in fifo.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
(cherry pick from:
d6807ed26c531ef50c23fb8575ff07dd778de2df)
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Gao Pan [Fri, 19 Jan 2018 03:12:15 +0000 (11:12 +0800)]
MLK-17416 imx8: sim: add usleep_range() before reading SPDP Bit
Card Presence Detect Status Bit SPDP in EMV_SIM_PCSR is
synchronized by two posedge of low_ref_clk which is 32KHz.
So there should be 1.5 low_ref_clk cycles(about 90us) before
reading SPDP Bit.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
(cherry pick from:
42a733a62525725d145ce6b55dfc94f1f5ff0a9d)
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Gao Pan [Thu, 18 Apr 2019 05:38:57 +0000 (13:38 +0800)]
MLK-17319-3 defconfig: enable EMVSIM in defconfig
enable EMVSIM in defconfig
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry pick from:
497b081ed407c592ea68f7b988629c10fafa1734)
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Gao Pan [Mon, 8 Jan 2018 09:10:31 +0000 (17:10 +0800)]
MLK-17319-1 imx8: sim: add driver to support EMVSIM module
The EMVSIM module is designed to facilitate communication to
Smart Cards compatible to the EMV ver4.3 standard and compatible
with ISO/IEC 7816-3 Standard.
This patch adds driver to support EMVSIM module for imx8.
Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry pick from:
2cac9c1e36676af7e3964d93b2aaea4991bc3c53)
(Fixed conflicts and added "#include <linux/pinctrl/consumer.h>")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Thu, 18 Apr 2019 08:54:34 +0000 (16:54 +0800)]
MLK-21415 can: flexcan: add Tx support for variable payload size
Now the FlexCAN driver always use last mailbox for TX, it will work well when
MB payload size is 8/16 bytes. TX mailbox would change to 13 when MB payload
size is 64 bytes to support CANFD. So we may need to set iflag register to add
support for variable payload size.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 06:55:19 +0000 (14:55 +0800)]
MLK-21414 can: flexcan: use callback for mailbox read/write function
Add callback for mailbox read/write function and clean up the code.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 05:04:32 +0000 (13:04 +0800)]
MLK-21413 can: flexcan: use CBT register to set bitrate for normal mode on i.MX8
We need to add property in DTS node before when we want to use normal
mode on i.MX8 platform. Check in RM, we also can use CBT register not
must CTRL1 register to set bitrate for normal mode.
This patch intends to use CBT register to set bitrate for normal mode on
i.MX8. After this, we don't need to modify the DTS node to support
normal mode.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 04:56:35 +0000 (12:56 +0800)]
MLK-21412 can: flexcan: add ISO CAN FD feature support
ISO CAN FD is introduced to increase the failture detection capability
than non-ISO CAN FD. The non-ISO CAN FD is still supported by FlexCAN so
that it can be used mainly during an intermediate phase, for evaluation
and development purposes.
Therefore, it is strongly recommended to configure FlexCAN to the ISO
CAN FD protocol by setting the ISOCANFDEN field in the CTRL2 register.
Test Command:
ISO FD MODE:
ip link set can0 type can bitrate
1000000 dbitrate
4000000 fd on
fd-non-iso off
non-ISO FD MODE:
ip link set can0 type can bitrate
1000000 dbitrate
4000000 fd on
fd-non-iso on
NOTE: if you only set fd on, driver will use ISO FD MODE by default.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 05:32:28 +0000 (13:32 +0800)]
MLK-21411 can: flexcan: fix CAN can't suspend/resume when CAN is only capable of wakeup
When dev->power.can_wakeup set to true, device_prepare() may runtime resume the device:
dpm_suspend_start()
dpm_prepare(state);
dev->driver->pm->prepare()
pm_genpd_prepare()
if (resume_needed(dev, genpd))
pm_runtime_resume(dev);
And imx8qm/qxp power domain driver don't implement the active_wakeup() callback, then
resume_needed() always return "true" when dev->power.can_wakeup is true.
Once CAN device is runtime active status, then CAN's clock's count is 1 during system
suspend. And CAN0/CAN1/CAN2 share the same module clock, so we can say all CAN's module
clock is enabled during system suspended.
flexcan_runtime_resume()
flexcan_clks_enable(priv);
i.MX8QM/QXP SCU code clock logic requires linux kernel clocks should be disabled during
suspend, otherwise SCU don't enable them after system resume back.
There are two ways to fix the issue:
1. CAN driver should check the runtime status to ensure all clocks are disabled during
system suspend.
2. Don't set CAN wakeup capability during probe, move it into flexcan_open().
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 04:50:28 +0000 (12:50 +0800)]
MLK-21410 can: flexcan: add CAN wakeup function for MX8
This patch is to add CAN wakeup function on MX8 platforms and update the
binding file fsl-flexcan.txt.
For MX8, the function "flexcan_irq()" should not call "flexcan_exit_stop_mode()"
due to firmware(SCU) cannot make SC IPC calls from an interrupt context.
If not exit stop mode in ISR, it will continuously enter wakeup ISR for the reason
that system will respond IRQ before call CAN system resume.
To fix the issue, we can exit stop mode during noirq resume stage.
For wakeup case, it should not set pinctrl to sleep state by
pinctrl_pm_select_sleep_state.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 04:31:53 +0000 (12:31 +0800)]
MLK-21409 can: flexcan: enable flexcan driver for i.MX8
Add support flexcan on imx8 platforms, mailbox as default
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 05:55:12 +0000 (13:55 +0800)]
MLK-21408-2 can: flexcan: enable flexcan defconfig
Add support in defconfig file to enable flexcan module on imx8qm/qxp boards
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Joakim Zhang [Mon, 8 Apr 2019 05:53:48 +0000 (13:53 +0800)]
MLK-21408-1 can: flexcan: enable flexcan support for arm64
Modify Kconfig file to enable flexcan support for arm64
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Fugang Duan [Thu, 18 Apr 2019 08:21:20 +0000 (16:21 +0800)]
MLK-21493 brcmfmac: move .brcmf_bus_preinit() after changing bus state
Moving the brcmf_bus_preinit() call allows the bus code to do some
required initialization before handling firmware control messages.
.brcmf_bus_preinit() already is called in .brcmf_bus_started() when
bus is ready. So remove it from .brcmf_c_preinit_dcmds().
Fixes:
383c26d2ea2f(MLK-18675-20 brcmfmac: Support wake on ping packet)
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Thu, 18 Apr 2019 06:50:34 +0000 (14:50 +0800)]
MLK-21492 brcmfmac: remove func0 that is not provied by mmc stack
func0 is not provided by the mmc stack as a function when probing.
commit
99d7b6fdfc8c(brcmfmac: Remove func0 from function array)
already remove the func0.
But commit
c37fa19e0128(brcmfmac: Remove array of functions) add
fun0 again. That cause NULL pointer issue.
Fixes:
c37fa19e0128(brcmfmac: Remove array of functions)
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Wed, 17 Apr 2019 12:44:44 +0000 (20:44 +0800)]
MLK-21491 serial: imx: add pm_qos to interact with cpu idle
Add pm_qos to prevent cpuidle from entering low level idles
for uart DMA mode when the uart port is active.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Wed, 17 Apr 2019 07:12:20 +0000 (15:12 +0800)]
MLK-21490 arm64: dts: imx8qxp: use power-on-gpio to power on EP device
Pcie driver power-on-gpio pin to control EP device's power,
firstly power down, then power up when it registers pcie port.
So using the pin for PCIe wlan EP device is better.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Fugang Duan [Tue, 16 Apr 2019 06:58:32 +0000 (14:58 +0800)]
MLK-21357 arm64: dts: imx8qm/imx8qxp: remove the 32KHz pin config
No need to set the 32KHz PIN except pcie brcmfmac driver
is loaded that requires to reserve these pin groups for
pin->init_state and pin->idle_state to support multiple
differents wlan cards.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Viorel Suman [Tue, 16 Apr 2019 11:25:55 +0000 (14:25 +0300)]
MLK-21460: ASoC: imx-audmix: fix dummy device DMA ops
The device is not created from a device tree node, so arch_setup_dma_ops
is not called, thus leaving the device with dummy DMA ops. Fix this by
calling of_dma_configure() with a NULL node to set default DMA ops.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Haibo Chen [Tue, 16 Apr 2019 11:03:09 +0000 (19:03 +0800)]
MLK-21473-3 Documentation: fsl-imx-esdhc: Add new compatible string for imx8mm
Add "fsl, imx8mm-usdhc" for imx8mm
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Tue, 16 Apr 2019 10:54:43 +0000 (18:54 +0800)]
MLK-21473-2 ARM64: dts: fsl-imx8mm: change to use new compatible for usdhc
Use the new compatible "fsl, imx8mm-usdhc" for imx8mm SoC.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Haibo Chen [Tue, 16 Apr 2019 10:48:50 +0000 (18:48 +0800)]
MLK-21473-1 mmc: sdhci-esdhc-imx: add esdhc_soc_data for i.MX8MM
i.MX8MM contains USDHC which support eMMC V5.1 (including CMDQ and
HS400ES), besides i.MX8MM also support bus frequency, so add a new
esdhc_soc_data for i.MX8MM.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Shengjiu Wang [Tue, 16 Apr 2019 07:17:06 +0000 (15:17 +0800)]
MLK-21461: ASoC: fsl_rpmsg_i2s: clear buffer pointer in i2s_send_message
Reset the buffer pointer to be zero in i2s_send_message, actully we have
set the buffer pointer to be zero in imx_rpmsg_terminate_all.
But if there is timer task (I2S_TX_POINTER) queued in queue, after it is
executed the buffer pointer will be changed, this is timing issue that
the task in the queue is delayed. so need to reset it with TERMINATE
command.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit
0a07dd454cbf85744677812e53fc5e86a48706bf)
Mirela Rabulea [Tue, 16 Apr 2019 14:36:28 +0000 (17:36 +0300)]
MLK-21459: mxc-jpeg: Jpeg encoder/decoder multi-instance crash
Reserve a slot for each context and allocate the slot data at open,
deallocate slot data at release and free that slot.
The device was already holding the array of slots.
The maximum number of slots allowed per device is currently limited to 1
for encoder and 1 for decoder, but the hardware supports 4+4.
Use GFP_ATOMIC for dma_zalloc_coherent, as we are holding a lock.
Also fix potential decoder bug when stm_ctrl is not properly cleared before
setting a new image format. This could be observed when decoding an
yuv420 image (img_fmt=0000b) after an yuv444 image (0011b), but only if
the descriptor is being reused.
Removed some debug logs and updated a comment.
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Robert Chiras <robert.chiras@nxp.com>
Andy Duan [Wed, 2 Jan 2019 09:55:44 +0000 (17:55 +0800)]
MLK-20684 PCI: Disable MSI on CYW4356 and CYW4359 chips
MSI is broken on CYW4356/4359 chips. This causes CYW4356 1CX not
work on i.MX8x platforms with bandwidth test. It is known issue
that i.MX8x PCIe host driver MSI interrupt lost.
Disable MSI completely for this chipset to let wifi can stable work
until PCIe RC driver fix the issue.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
d99766187fb99d4a6655a1e0fdf5dc9451a8e4a0)
Stefan Wahren [Wed, 12 Dec 2018 19:20:06 +0000 (20:20 +0100)]
brcmfmac: Fix access point mode
commit
861cb5eb467f ("brcmfmac: Fix access point mode") upstream.
Since commit
1204aa17f3b4 ("brcmfmac: set WIPHY_FLAG_HAVE_AP_SME flag")
the Raspberry Pi 3 A+ (BCM43455) isn't able to operate in AP mode with
hostapd (device_ap_sme=1 use_monitor=0):
brcmfmac: brcmf_cfg80211_stop_ap: setting AP mode failed -52
So add the missing mgmt_stypes for AP mode to fix this.
Fixes:
1204aa17f3b4 ("brcmfmac: set WIPHY_FLAG_HAVE_AP_SME flag")
Suggested-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Wright Feng [Mon, 18 Mar 2019 05:09:44 +0000 (13:09 +0800)]
MLK-21161-04 brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode
This patch fixes 43455 CRC error while running throughput test with
suspend/resume stress test.
The continuous failure messages before system crash:
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 25600 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 24576 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
d6e37c2eb0f6fc2b50172321a464337073038228)
Wright Feng [Thu, 7 Mar 2019 07:37:27 +0000 (01:37 -0600)]
MLK-21161-03 brcmfmac: add sleep in bus suspend and cfg80211 resume functions
With asynchronous suspend/resume feature, suspend and resume callbacks to
be executed in parallel with each other. It makes bus changes the state to
BRCMF_BUS_DOWN before all brcmf_cfg80211_suspend IOVAR executions.
The same situation also happens in resume procedure and causes PM mode
keeps in PM_MAX after resume. In order to fix the race condition, We add
one second sleep in bus suspend and cfg80211 resume function.
Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
fdb676ce002039d7359b200b6c2cc728f41c05fa)
Wright Feng [Wed, 21 Nov 2018 09:16:55 +0000 (03:16 -0600)]
MLK-21161-02 brcmfmac: validate ifp pointer in brcmf_txfinalize
We got ifp null pointer kernel panic in brcmf_txfinalize after removing
Wi-Fi USB dongle when data was transmitting, The root cause is that
interface was removed before calling brcmf_txfinalize in
brcmf_fws_dequeue_worker and finally caused kernel panic.
Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
3f94bfe6febc9762e340a69b6520242f27d20c85)
Raveendran Somu [Tue, 13 Nov 2018 02:32:11 +0000 (20:32 -0600)]
MLK-21161-01 brcmfmac: To fix kernel crash on out of boundary access
To trunkcate the addtional bytes, if extra bytes are received.
Current code only have a warning and proceed without handling it.
But in one crash dump reported by DVT, these causes the
crash intermittently. So the processing is limit to the skb->len.
Signed-off-by: Raveendran Somu <raveendran.somu@cypress.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
f7112c027e0c7447b05474b72934589bbbb8e298)
Andy Duan [Fri, 4 Jan 2019 06:48:59 +0000 (14:48 +0800)]
MLK-20681 brcmfmac: add brcmfmac platform device pinctrl state support
Add brcmfmac platform device pinctrl state support. That is useful
for dynamically configurate pin group for different wlan chips.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
88f2834cd5b8cb8864af68d265b5bdee3000c4bf)
Andy Duan [Wed, 2 Jan 2019 10:05:00 +0000 (18:05 +0800)]
MLK-20680 brcmfmac: add time delay for pcie device exit D3 mode
- The current timeout value is not enough for MB transaction read
when modem enter D3 mode, so increase the timeout value to match
the D3 mode timing requirement.
- Add 10 ms delay for pcie device to exit D3 state and enter D0 state.
- Remove the duplicated code for SBMBX register access.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
05601af462145e27142e3d140e10a66d4a493d40)
Wright Feng [Mon, 3 Dec 2018 09:39:33 +0000 (17:39 +0800)]
MLK-20679 brcmfmac: reset two D11 cores if chip has two D11 cores
There are two D11 cores in RSDB chips like 4359. We have to reset two
D11 cores simutaneously before firmware download, or the firmware may
not be initialized correctly and cause "fw initialized failed" error.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked commit from
8f50bea9357af3088dba0103f0017d56763b0ae9)
Andy Duan [Mon, 24 Dec 2018 04:50:14 +0000 (12:50 +0800)]
MLK-20678 brcmfmac: avoid the error log print when get the wowl_wakeind failed
Not all chips support wowlan, then get wowlan wakeup event failed.
Change the log into debug level.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
47b205952ca6be6216e19a121f1fb400c5fcf7e7)
Li Jun [Wed, 17 Apr 2019 01:51:45 +0000 (09:51 +0800)]
MLK-21478-23 arm64: defconfig: add imx8mq usb phy and typec driver
This patch enable imx8mq usb phy driver and typec related drivers.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:51:09 +0000 (13:51 +0800)]
MLK-21478-22 arm64: dts: imx8qxp-mek-rpmsg: use typec connector sub-node
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:50:24 +0000 (13:50 +0800)]
MLK-21478-21 arm64: dts: imx8qxp-mek: use connector sub-node for typec
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:49:19 +0000 (13:49 +0800)]
MLK-21478-20 arm64: dts: imx8qm-mek: use connector sub-node for typec
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:48:26 +0000 (13:48 +0800)]
MLK-21478-19 arm64: dts: imx8qm-mek-domu: use typec connector sub-node
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:47:14 +0000 (13:47 +0800)]
MLK-21478-18 arm64: dts: imx8qm-mek-domu-dpu1: use connector sub-node
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 05:46:09 +0000 (13:46 +0800)]
MLK-21478-17 arm64: imx8mm-ddr4-val: use connector sub-node for typec
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Mon, 15 Apr 2019 12:03:42 +0000 (20:03 +0800)]
MLK-21478-16 arm64: dts: imx8mq-evk: use connector sub-node for typec
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 10 Apr 2019 05:18:02 +0000 (13:18 +0800)]
MLK-21478-15 arm64: dts: imx8mm-evk: use connector sub-node for typec
As the new kernel introduces the standard usb connector properties,
so use connector sub-node for typec.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Mon, 15 Apr 2019 12:10:40 +0000 (20:10 +0800)]
MLK-21478-14 arm64: dts: fsl-imx8mq-ddr4-arm2: remove deprecated usb node
As we don't need 2 nodes for usb controller, so remove the nodes not
required.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Mon, 15 Apr 2019 12:02:39 +0000 (20:02 +0800)]
MLK-21478-13 arm64: dts: imx8mq-evk: remove deprecated node for usb
As we don't need 2 nodes for usb controller, so remove the nodes not
required.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Mon, 15 Apr 2019 11:59:30 +0000 (19:59 +0800)]
MLK-21478-12 arm64: dtsi: imx8mq: use one node for usb dwc3 controller
New dwc3 driver force to use one node for controller node, so switch
to use one node for dwc3 controller.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Tue, 16 Apr 2019 06:02:38 +0000 (14:02 +0800)]
MLK-21478-11 usb: dwc3: use suspend clock from dt to set power down scale
Since the new dwc3 use bulk clks including the suspend clk, so we can
use it to calculate the power down scale value.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 04:03:50 +0000 (12:03 +0800)]
MLK-21478-2 usb: typec: tcpci: disable typec irq before register port
Disable tcpci irq before tcpci_register_port() to make sure resource
ready before irq hanlding.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Wed, 17 Apr 2019 04:31:06 +0000 (12:31 +0800)]
MLK-21478-1 usb: typec: tcpci: use correct driver data
As the driver data is tcpci_chip in new kernel, so correct this.
Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Li Jun [Thu, 15 Nov 2018 14:12:47 +0000 (15:12 +0100)]
phy: add driver for Freescale i.MX8MQ USB3 PHY
This is a cleaned up port of the downstream i.MX8MQ USB3 PHY driver.
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
(cherry picked from commit
efe81bea891586680a928ea5dde40eb1fff34be2)
Lucas Stach [Thu, 15 Nov 2018 14:12:46 +0000 (15:12 +0100)]
dt-bindings: phy: add binding for Freescale i.MX8MQ USB3 PHY
This adds the binding for the USB3 PHY found on the i.MX8M SoC.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
(cherry picked from commit
3c2ce40b2fbb52b5e861f8664f5422d39f11b39e)
Leonard Crestez [Tue, 16 Apr 2019 13:25:51 +0000 (16:25 +0300)]
MLK-21118 arm64: defconfig: Enable CONFIG_VIDEO_MXC_CSI_CAMERA
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Richard Zhu [Wed, 17 Apr 2019 07:02:53 +0000 (15:02 +0800)]
MLK-21479 PCI: imx: refine the power on gpio manipulation
Turn on the power on gpio once is enough and this pin shouldn't be
re-configured in resume procedure again and again.
Thus, move the turn on operation of the power_on_gpio to the proper
place.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
Leonard Crestez [Tue, 16 Apr 2019 14:47:14 +0000 (17:47 +0300)]
MLK-21474-2 arm64: defconfig: Enable MXC_MLB150
Missed during initial porting due to Kconfig logic
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
Leonard Crestez [Tue, 16 Apr 2019 14:45:47 +0000 (17:45 +0300)]
MLK-21474-1 mxc mlb: Allow compilation on imx8
Upstream rejected ARCH_FSL_IMX8QM so just depend on ARCH_MXC or
COMPILE_TEST.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Fugang Duan <fugang.duan@nxp.com>
Peng Fan [Wed, 6 Mar 2019 05:56:13 +0000 (13:56 +0800)]
MLK-21063 ARM64: dts: imx8qm-domu-car: fix lvds-pwm usage
Fix lvds-pwm usage, it needs to be under vehicle_rpmsg_m4 node for
android auto.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
31db2776c4cf4b27417c57f3c7c013085cee1528)
(cherry picked from commit
24f984a95e5043a50aea24f35b02d3737355b4e2)
Peng Fan [Tue, 26 Feb 2019 11:42:57 +0000 (19:42 +0800)]
MLK-20990 ARM64: dts: imx8qm: domu: switch to use rpmsg i2c
Switch to use rpmsg i2c to support android auto, because
android auto change to use rpmsg i2c.
Also add the alias node to let m4 could use it successfully, because
M4 side use the alias id as the BUSID.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
d67968b6d6a583590a9e737f4a3d732dca5b078f)
Peng Fan [Mon, 25 Feb 2019 13:25:37 +0000 (21:25 +0800)]
MLK-20977-3 ARM64: dts: imx8qm: update domu car
Update domu car dts according to android auto changes.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
8c3bc5b19ddc3fbac9fe04c504a7f0282b82beeb)
Peng Fan [Thu, 28 Feb 2019 10:36:51 +0000 (18:36 +0800)]
MLK-21013 ARM64: dts: imx8qm: passthrough lvds pwm
Passthrough lvds pwm, otherwise dom0 will panic when reboot if
domu started and shutdown, because LVDS_1_PWM_0 is assigned
to domu and when domu shutdown, the resource will be powered
off, however dom0 still think it is powered on.
since lvds1_pwm is expected for domu, so let's passthrough it.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
abb243aba12a6649fad8114e298ff075b0a8399d)
(cherry picked from commit
9644178aeb4fc2a5b04824e7f6fb9cd9b5f7477f)
Peng Fan [Tue, 26 Feb 2019 08:07:39 +0000 (16:07 +0800)]
MLK-20977-5 ARM64: dts: remove MIPI for m4
The resources are wrongly added.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
af14fdef3b810f436582f3ff70822ebf05b8d361)
Peng Fan [Tue, 26 Feb 2019 01:19:42 +0000 (09:19 +0800)]
MLK-20977-4 ARM64: dts: cleanup resources for SMMU
Cleanup the resources that not could be set SID and remove the UNUSED
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
e9d5d3b1056082b7eb1d8a6e1628c38d78c33933)
Peng Fan [Mon, 25 Feb 2019 07:02:54 +0000 (15:02 +0800)]
MLK-20977-2 ARM64: dts: add resources for M41 usage
When resources are owned by M41, we need to handle that correctly in
xen.
Also drop power doamins for xen,shared gpio, xen will power up the gpio.
gpio1 is owned by M41, so we also need to check its power status in xen.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
0c75f57c8fe13005e9c1c28940cc1f66fc613fdd)
Peng Fan [Mon, 25 Feb 2019 06:57:11 +0000 (14:57 +0800)]
MLK-20977-1 ARM64: dts: remove cm41 from smmu
CM41 runs before CortexA, we should not use smmu to restrict it, because
smmu is owned by xen. Also remove MU_13/12 which is wrongly added
before.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>
(cherry picked from commit
25c3a75e1566fe3c53002ed3fee698840e207245)
Peng Fan [Fri, 29 Mar 2019 09:09:52 +0000 (17:09 +0800)]
MLK-21292 ARM64: dts: imx8mm: introduce inamte linux
Introduce inmate linux support for jailhouse, we need to benchmark
inmate OS, so choose linux. The clock/pin are preconfigured by 1st
root cell linux.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
00bf8b5eea2213896acf4e244ef1b63fb7abea85)
Han Xu [Tue, 16 Apr 2019 19:28:41 +0000 (14:28 -0500)]
MLK-21121-2: arm64: config: enable flexspi in defconfig
enabled the flexspi driver by default in defconfig
Signed-off-by: Han Xu <han.xu@nxp.com>
Han Xu [Tue, 16 Apr 2019 19:26:00 +0000 (14:26 -0500)]
MLK-21121-1: mtd: flexspi: enable quad_only quirk
enable the quad_only quirk for the platforms only support up to Quad
I/O.
Signed-off-by: Han Xu <han.xu@nxp.com>
Anson Huang [Tue, 16 Oct 2018 03:17:36 +0000 (11:17 +0800)]
MLK-19947-2 soc: imx: select CLKSRC_IMX_GPT for i.MX8QXP
Select CLKSRC_IMX_GPT for i.MX8QXP by default.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit
73f73e4d11292f0342cdeb747b8c440806f464f1)
Anson Huang [Tue, 16 Oct 2018 03:15:06 +0000 (11:15 +0800)]
MLK-19947-1 clocksource: gpt: add i.MX8QXP support
i.MX8QXP will use GPT timer as platform broadcast time for waking
up CPUs when cluster is off, GPT timer needs to be probed after
clock driver ready, and GPT suspend is at syscore suspend phase,
to make the clock & power management as well as GPT save/restore
easy, all these things are done in TF-A.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit
567a017241e1fe68be096d556c1088296f8d2068)
Anson Huang [Thu, 23 Aug 2018 03:13:48 +0000 (11:13 +0800)]
MLK-19305-3 arm64: enable gpio PAD wakeup for i.MX8 platforms
Select gpio PAD wakeup for those i.MX8 platforms with
system controller present.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit
61f3cc34747e5c8db1578c8aba5bd9592533cede)
(cherry picked from commit
9140333d00ff27da34b4e5abd6cf8cf6a3a0db6c)
Leonard Crestez [Fri, 12 Apr 2019 16:26:54 +0000 (19:26 +0300)]
MLK-21455-3 arm64: defconfig: Enable NVMEM_IMX_OCOTP for imx8m fuses
The NVMEM_IMX_OCOTP driver can be used for fuse access on imx8m*
platforms but was missed during initial porting.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Lucas Stach [Thu, 28 Feb 2019 07:01:37 +0000 (08:01 +0100)]
MLK-21455-2 nvmem: imx-ocotp: broaden Kconfig dependency
The i.MX OCOTP controller is used in numerous Freescale/NXP
SoCs from the MXC family, so the strict dependency on the
i.MX6 SoC is too narrow. Broaden it to cover all the MXC
familiy members.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
(cherry picked from commit
af6e0fd10a116fa8756171a2fe53e00b1d55ae96)
Stefan Agner [Sun, 3 Feb 2019 09:43:37 +0000 (09:43 +0000)]
MLK-21455-1 nvmem: allow to select i.MX nvmem driver for i.MX 7D
The imx-ocotp nvmem driver supports the i.MX 7D SoC too. Allow to select
the imx-ocotp driver even if only the i.MX 7D SoC has been selected.
Fixes:
711d45477931 ("nvmem: octop: Add i.MX7D support")
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
9f23379c67fa20b367ea53cfd989da5212316e6f)
Peng Fan [Fri, 18 Aug 2017 03:19:08 +0000 (11:19 +0800)]
MLK-16204-4 nvmem: imx-ocotp: add i.mx8mq support and fix read
Add i.MX8MQ support and Fix read.
When offset is not 4 bytes aligned, directly shift righty by 2 bits
will cause reading out wrong data. Since imx ocotp only supports
4 bytes reading once, we need handle offset is not 4 bytes aligned
and enlarge the bytes to 4 bytes aligned. After finished reading,
copy the needed data from buffer to caller and free buffer.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
23bcfaac856f3f0de9f3113c9c447a6133157019)
Anson Huang [Fri, 14 Sep 2018 02:59:21 +0000 (10:59 +0800)]
ARM: dts: imx6ul: use nvmem-cells for cpu speed grading
On i.MX6UL, accessing OCOTP directly is wrong because the ocotp clock
needs to be enabled first, so use the nvmem-cells binding instead.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit
44dca5db09efe6e03e5c50e2e093d823d9f0ffee)
Arulpandiyan Vadivel [Tue, 16 Apr 2019 06:10:05 +0000 (11:40 +0530)]
cpufreq: imx6sx/imx6q: read OCOTP through nvmem for imx6sx/imx6q
On i.MX6SX/i.MX6Q, accessing OCOTP directly is wrong because
the ocotp clock needs to be enabled first. Add support for reading
OCOTP through the nvmem API, and keep the old method there to
support old dtb.
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit
766bc770f5fc12dd85aa8b26c53ac310afb9e24b)
Anson Huang [Mon, 8 Oct 2018 06:07:34 +0000 (14:07 +0800)]
cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull
On i.MX6UL/i.MX6ULL, accessing OCOTP directly is wrong because
the ocotp clock needs to be enabled first. Add support for reading
OCOTP through the nvmem API, and keep the old method there to
support old dtb.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit
ef800b8b7eed1363b662477b134b489f44410530)
Arulpandiyan Vadivel [Tue, 16 Apr 2019 06:08:27 +0000 (11:38 +0530)]
ARM: dts: imx6sx: use nvmem-cells for cpu speed grading
On i.MX6SX, accessing OCOTP directly is wrong because the ocotp clock
needs to be enabled first, so use the nvmem-cells binding instead.
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit
b98f7d8b72a7fce275c078a1a9c9dc12184500b5)
Vipul Kumar [Mon, 1 Apr 2019 06:58:46 +0000 (12:28 +0530)]
nvmem: imx-ocotp: add support for imx6ull
Enable ocotp driver support for imx6ull SoC.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
762d03271d6eed397ab76a3bb6f14bdb26cb7957)
Vipul Kumar [Mon, 1 Apr 2019 07:02:51 +0000 (12:32 +0530)]
dt-bindings: nvmem: imx-ocotp: add compatible string for imx6ull
Add new compatible string for i.MX6ULL SOC.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
33b8d7a98f51b2084aaf419d6407f2a7d33cb18f)
Vipul Kumar [Mon, 1 Apr 2019 06:51:13 +0000 (12:21 +0530)]
ARM: imx_v7_defconfig: Disable CONFIG_FSL_OTP
This patch disable OTP driver. Now, we are using CONFIG_NVMEM_IMX_OCOTP
driver. Due to CONFIG_FSL_OTP config, thermal_zone0 sub directory was not
created under /sys/devices/virtual/thermal/.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
8f79efc11275c187b7caf553ef78291c33ed34e4)
Vipul Kumar [Mon, 1 Apr 2019 05:31:53 +0000 (11:01 +0530)]
ARM: imx_v7_defconfig: Select CONFIG_NVMEM_IMX_OCOTP
Select the i.mx ocotp driver.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
c0dcdbc28f22d9a8427edef4858b64fa0deccbbe)
Arulpandiyan Vadivel [Thu, 28 Mar 2019 09:13:02 +0000 (14:43 +0530)]
can: flexcan: remove duplicate entry of mailbox
Remove duplicate mailbox register entry from hardware register structure.
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit
0fb8da2c4060fa5c43cb9fd2fef6aee58a0d9235)
Vipul Kumar [Fri, 22 Mar 2019 10:27:29 +0000 (15:57 +0530)]
arm: dts: imx6ul: removing dependency from imx6ul-14x14-evk.dtsi
This patch remove dependency from imx6ul-14x14-evk.dtsi. By including this
file, getting duplicate enteries for multiple nodes.
To fix the compilation error, added some nodes in imx6ul-14x14-evk.dts.
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
35bdde32c22154caba585d295b4a6c327045981c)
Vipul Kumar [Fri, 22 Mar 2019 05:52:14 +0000 (11:22 +0530)]
clk: imx6ul: Remove the duplicate code
This patch remve the duplicate code. Due to this code, getting following
logs at boot time:
failed to set rate of clk ahb to
99000000: -16
failed to set parent of clk periph to periph_clk2: -16
failed to set parent of clk periph_pre to pll2_bus: -16
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit
a0e0c60b7ba99bcd2e308c51326bf92b21a894b8)
Haibo Chen [Tue, 16 Apr 2019 08:50:00 +0000 (16:50 +0800)]
MLK-21472 drm: downgrade the drm/imx probe
Some driver under drm/imx depends on panel and bridge, but all these
driver use the same module_init() to register the driver, so the
default probe sequence will depends on the list in Makefile. Here
downgrade the drm/imx under the panel and bridge, otherwise will
meet the following during system boot:
[drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[drm] No driver support for vblank timestamp query.
imx-drm display-subsystem: bound imx-lcdif-crtc.0 (ops lcdif_crtc_ops)
imx_sec_dsim_drv
32e10000.mipi_dsi: version number is 0x1060200
imx_sec_dsim_drv
32e10000.mipi_dsi: Failed to attach bridge:
32e10000.mipi_dsi
imx_sec_dsim_drv
32e10000.mipi_dsi: failed to bind sec dsim bridge: -517
imx-drm display-subsystem: failed to bind
32e10000.mipi_dsi (ops imx_sec_dsim_ops): -517
imx-drm display-subsystem: master bind failed: -517
This patch can make MIPI DSI panel probe successfully at the first
time, rather than depends on the PROBE_DEFER.
Besides, for the MIPI DSI panel used on imx8mm/imx8mq, the panel and
touch share one RST pin, touch need the panel do the RST first to wake
up the touch chip, so also need to make sure the MIPI DSI panel probe
successfully before touch.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Acked-by: Fancy Fang <chen.fang@nxp.com>
Haibo Chen [Tue, 16 Apr 2019 02:53:41 +0000 (10:53 +0800)]
MLK-21457 mmc: block: delete the duplicate calling of mmc_cleanup_queue()
Fix Mentor back porting issue. According to community log, need to
first backport the commit
57678e5a3d51 ("mmc: block: Delete gendisk
before cleaning up the request queue"), then can back porting the
commit
be2ad281466f ("mmc: block: Prevent new req entering queue
after its cleanup"). But Mentor wrongly handle the sequence, and
wrongly handle the conflict, causing the mmc_cleanup_queue() is
called twice. When do sd hot plug test, will meet the following dump:
:~# mmc0: card aaaa removed
------------[ cut here ]------------
WARNING: CPU: 0 PID: 152 at block/blk-core.c:813 blk_cleanup_queue+0x140/0x144
Modules linked in:
CPU: 0 PID: 152 Comm: kworker/0:4 Not tainted
4.19.30-04275-gd0b5d3f8b43d #43
Hardware name: Freescale i.MX7ULP (Device Tree)
Workqueue: events_freezable mmc_rescan
[<
8010f998>] (unwind_backtrace) from [<
8010bbd8>] (show_stack+0x10/0x14)
[<
8010bbd8>] (show_stack) from [<
80a473d4>] (dump_stack+0x78/0x8c)
[<
80a473d4>] (dump_stack) from [<
8012f29c>] (__warn+0xdc/0xf4)
[<
8012f29c>] (__warn) from [<
8012f3cc>] (warn_slowpath_null+0x40/0x48)
[<
8012f3cc>] (warn_slowpath_null) from [<
803e3ec8>] (blk_cleanup_queue+0x140/0x144)
[<
803e3ec8>] (blk_cleanup_queue) from [<
8073f1b0>] (mmc_cleanup_queue+0x28/0x3c)
[<
8073f1b0>] (mmc_cleanup_queue) from [<
8073cec4>] (mmc_blk_remove_req.part.5+0x2c/0x90)
[<
8073cec4>] (mmc_blk_remove_req.part.5) from [<
8073d9fc>] (mmc_blk_remove+0xe8/0x1b0)
[<
8073d9fc>] (mmc_blk_remove) from [<
8072e57c>] (mmc_bus_remove+0x18/0x20)
[<
8072e57c>] (mmc_bus_remove) from [<
80534930>] (device_release_driver_internal+0x178/0x220)
[<
80534930>] (device_release_driver_internal) from [<
8053357c>] (bus_remove_device+0xcc/0xf8)
[<
8053357c>] (bus_remove_device) from [<
80530bc4>] (device_del+0x120/0x358)
[<
80530bc4>] (device_del) from [<
8072ebf0>] (mmc_remove_card+0x78/0x9c)
[<
8072ebf0>] (mmc_remove_card) from [<
80734044>] (mmc_sd_detect+0x3c/0x6c)
[<
80734044>] (mmc_sd_detect) from [<
8072dfa8>] (mmc_rescan+0xcc/0x3f4)
[<
8072dfa8>] (mmc_rescan) from [<
80146454>] (process_one_work+0x1f0/0x400)
[<
80146454>] (process_one_work) from [<
801471d8>] (worker_thread+0x44/0x580)
[<
801471d8>] (worker_thread) from [<
8014c014>] (kthread+0x148/0x150)
[<
8014c014>] (kthread) from [<
801010e8>] (ret_from_fork+0x14/0x2c)
Exception stack(0xb095bfb0 to 0xb095bff8)
bfa0:
00000000 00000000 00000000 00000000
bfc0:
00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
bfe0:
00000000 00000000 00000000 00000000 00000013 00000000
---[ end trace
5bcff5fbec8eea08 ]---
Unable to handle kernel paging request at virtual address
3e700004
pgd =
5bbecc7f
[
3e700004] *pgd=
00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0 PID: 152 Comm: kworker/0:4 Tainted: G W
4.19.30-04275-gd0b5d3f8b43d #43
Hardware name: Freescale i.MX7ULP (Device Tree)
Workqueue: events_freezable mmc_rescan
PC is at __srcu_read_lock+0x1c/0x38
LR is at hctx_lock+0x1c/0x2c
pc : [<
8017d91c>] lr : [<
803eedd4>] psr:
20010093
sp :
b095bdf8 ip :
20010013 fp :
bf682d80
r10:
b083d008 r9 :
b083e810 r8 :
00000034
r7 :
00000001 r6 :
00000001 r5 :
b09b8400 r4 :
b095be00
r3 :
00000004 r2 :
00000001 r1 :
b095be00 r0 :
3e700000
Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none
Control:
10c53c7d Table:
90c9006a DAC:
00000051
Process kworker/0:4 (pid: 152, stack limit = 0x37b997f7)
Stack: (0xb095bdf8 to 0xb095c000)
bde0:
81004d08 803ef16c
be00:
bf682d80 bd071de2 0000001c 00000000 b0415820 00000001 00000000 803ef278
be20:
b08b1c0c b0415820 b083e800 8073f1a8 b08b1c00 b08b1c0c b083e800 8073cedc
be40:
b083e800 b08b1c00 b083e808 8073d9fc 60010013 00000034 bf682d80 b083e808
be60:
b083e83c 8104db84 00000000 00000034 b083e810 8072e57c b083e808 80534930
be80:
b0141a30 b083e808 8104d598 81004d08 810fbf40 8053357c b083e800 b083e808
bea0:
b083e860 80530bc4 bf686200 00000000 b083d268 00000000 bf682d80 80172038
bec0:
80db2040 bd071de2 bf686200 b083e800 b083e808 b083d000 bf686200 00000000
bee0:
b083d268 00000000 bf682d80 8072ebf0 b083d000 ffffff85 b083d000 80734044
bf00:
b083d264 b083d200 b083d000 8072dfa8 b083d264 b096b080 bf682d80 bf686200
bf20:
00000000 80146454 81003d00 bf682d98 b096b080 bf682d80 b096b094 81003d00
bf40:
bf682d98 ffffe000 00000008 801471d8 b08e3a70 8109d940 80d256d0 b095a000
bf60:
b0968b1c b0968b00 b0968ac0 00000000 b095a000 b096b080 80147194 b0081ea4
bf80:
b0968b1c 8014c014 00000000 b0968ac0 8014becc 00000000 00000000 00000000
bfa0:
00000000 00000000 00000000 801010e8 00000000 00000000 00000000 00000000
bfc0:
00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
bfe0:
00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000
[<
8017d91c>] (__srcu_read_lock) from [<
803eedd4>] (hctx_lock+0x1c/0x2c)
[<
803eedd4>] (hctx_lock) from [<
803ef16c>] (blk_mq_run_hw_queue+0x28/0xfc)
[<
803ef16c>] (blk_mq_run_hw_queue) from [<
803ef278>] (blk_mq_run_hw_queues+0x38/0x4c)
[<
803ef278>] (blk_mq_run_hw_queues) from [<
8073f1a8>] (mmc_cleanup_queue+0x20/0x3c)
[<
8073f1a8>] (mmc_cleanup_queue) from [<
8073cedc>] (mmc_blk_remove_req.part.5+0x44/0x90)
[<
8073cedc>] (mmc_blk_remove_req.part.5) from [<
8073d9fc>] (mmc_blk_remove+0xe8/0x1b0)
[<
8073d9fc>] (mmc_blk_remove) from [<
8072e57c>] (mmc_bus_remove+0x18/0x20)
[<
8072e57c>] (mmc_bus_remove) from [<
80534930>] (device_release_driver_internal+0x178/0x220)
[<
80534930>] (device_release_driver_internal) from [<
8053357c>] (bus_remove_device+0xcc/0xf8)
[<
8053357c>] (bus_remove_device) from [<
80530bc4>] (device_del+0x120/0x358)
[<
80530bc4>] (device_del) from [<
8072ebf0>] (mmc_remove_card+0x78/0x9c)
[<
8072ebf0>] (mmc_remove_card) from [<
80734044>] (mmc_sd_detect+0x3c/0x6c)
[<
80734044>] (mmc_sd_detect) from [<
8072dfa8>] (mmc_rescan+0xcc/0x3f4)
[<
8072dfa8>] (mmc_rescan) from [<
80146454>] (process_one_work+0x1f0/0x400)
[<
80146454>] (process_one_work) from [<
801471d8>] (worker_thread+0x44/0x580)
[<
801471d8>] (worker_thread) from [<
8014c014>] (kthread+0x148/0x150)
[<
8014c014>] (kthread) from [<
801010e8>] (ret_from_fork+0x14/0x2c)
Exception stack(0xb095bfb0 to 0xb095bff8)
bfa0:
00000000 00000000 00000000 00000000
bfc0:
00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
bfe0:
00000000 00000000 00000000 00000000 00000013 00000000
Code:
f10c0080 e590307c ee1d0f90 e0833102 (
e7931000)
---[ end trace
5bcff5fbec8eea09 ]---
FAT-fs (mmcblk0p1): FAT read failed (blocknr 8)
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Daniel Baluta [Mon, 15 Apr 2019 19:39:01 +0000 (22:39 +0300)]
arm64: defconfig: Enable DSP config
This pulls in code for talking with DSP.
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Daniel Baluta [Mon, 15 Apr 2019 19:35:47 +0000 (22:35 +0300)]
MLK-20940: arm64: defconfig: Remove direct selection of CONFIG_RPMSG
This is already selected by others symbols e.g HAVE_IMX_RPMSG.
Fixes:
ad284b230391bae ("MLK-20940-4 ARM64: defconfig: Add RPBUS and RPMSG config")
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Shengjiu Wang [Mon, 15 Apr 2019 10:38:42 +0000 (18:38 +0800)]
MLK-21450-2: ARM64: defconfig: enable HDMI audio
enable CONFIG_SND_SOC_IMX_CDNHDMI=y
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Shengjiu Wang [Mon, 15 Apr 2019 10:30:20 +0000 (18:30 +0800)]
MLK-21450-1: ASoC: imx-cdnhdmi: replace codec with component
Fix the compile issue for snd_pcm_codec is removed
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Viorel Suman [Mon, 15 Apr 2019 12:46:47 +0000 (15:46 +0300)]
MLK-21441: ASoC: imx-audmix: register the card on a proper dev
Register the card on a proper dev pointer.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>