Commit Graph

7152 Commits

Author SHA1 Message Date
0c7ac2010d MLK-19511-2 ARM64: dts: freescale: imx8qm: move cm4_intmux early_power_on to board dtb
When early_power_on is present in power domain dtb node, it
will be powered on during resume regardless of whether the
related module is enabled or NOT, this will cause cm4_intmux
always power ON after first time resume when cm4_intmux is
NOT enabled.

So move this early_power_on property to board level dtb, ONLY
when cm4_intmux is enabled, then this property is added.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
2019-02-12 10:33:48 +08:00
e59720b4f2 MLK-19511-1 ARM64: dts: freescale: imx8dx: move cm4_intmux early_power_on to board dtb
When early_power_on is present in power domain dtb node, it
will be powered on during resume regardless of whether the
related module is enabled or NOT, this will cause cm4_intmux
always power ON after first time resume when cm4_intmux is
NOT enabled.

So move this early_power_on property to board level dtb, ONLY
when cm4_intmux is enabled, then this property is added.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
2019-02-12 10:33:48 +08:00
e1bb567bf4 MLK-19450-2 ARM64: dts: 8qm: support cm41 rpmsg with DomU
1. Dom0 dts include fsl-imx8qm-mek.dtsi
2. Add /memreserve/ according to reserved-memory no-map node, then
   xen will not use these memory. The memory region are used by
   vpu/dsp/rpmsg, so xen should not touch them.
3. correct dom0 cma area, CM4 has limitation that the max access address
   is 0xE0000000, so the alloc-ranges should consider the limitation,
   otherwise rpmsg dma allocation will alloc memory higher than
   0xE0000000 and M4 will crash.
4. Hook CM41 with SMMU, added the addresses the CM41 will access, then
   after SMMU enabled, CM41 could access the address. To support
   Rear-View Camera, CM41 is kicked off by SCU at very early stage,
   DomU memory almost has no chance to have machine address 0x90000000
   included which is the vring desc buffer. So we have to enable SMMU
   to let CM41 access the memory.
5. Since DomU Guest RAM0 base is moved to 0x80000000, Let's change DomU
   ip address space to their machine address, since there is no conflict
   now.
6. Add reserved-memory in DomU dts, we enabled xen xl to copy that
   to DomU dtb.
7. Mark PCI/VPU as xen,passthrough, but not supported in DomU now.
8. Add Pixel_combiner2 passthrough to make dpu2 display work.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Anson Huang <Anson.Huang@nxp.com>
2019-02-12 10:33:48 +08:00
e0590df39c MLK-19450-1 ARM64: dts: 8qm: create dtsi for mek board
Rename fsl-imx8qm-mek.dts to fsl-imx8qm-mek.dtsi and keep /dts-v1/ in
fsl-imx8qm-mek.dts, then let fsl-imx8qm-mek.dts include
fsl-imx8qm-mek.dtsi.

This is to prepare adding /memreserve/ for mek dom0 dts.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Anson Huang <Anson.Huang@nxp.com>
2019-02-12 10:33:48 +08:00
a559336c20 MLK-19504: Add missing device tree nodes for QXP
Add missing device tree nodes necessary for display
to probe correctly.

Signed-off-by: Teo Hall <teo.hall@nxp.com>
2019-02-12 10:33:48 +08:00
f7cb0aa216 MLK-19080 ARM64: dts: freescale: imx8x: adjust passive trip point setting
Adjust passive trip point temperature to be 20 degree C
below than the critical trip point temperature on i.MX8X
platforms.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit cefa63c1b9)
2019-02-12 10:33:47 +08:00
d53410c893 MLK-19464 ARM64: defconfig: build in IPv6
For mfgtool (UUU) requirement, it needs to build in IPv6 for nfs
rootfs mount.

Generated with the following commands:
make defconfig
make savedefconfig
cp defconfig arch/arm64/configs/defconfig

Reviewed-by: Frank Li <frank.li@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-02-12 10:33:47 +08:00
5f8fa6ff38 MLK-19432-2: ARM64: dts: imx8mq-evk: MQ specific ak5558 compatible
Use MQ specific ak5558 sound card compatible string in order to
handle properly 1:2 bclk:mclk SAI ratio.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 20d6d65c330a1560407bc99e0a7f90225ceaf7d8)
2019-02-12 10:33:45 +08:00
7532512ddf MLK-19413-7 arm64: dts: fsl-imx8qxp-mek: Enable pixel combiner
This patch enables pixel combiner for the i.MX8qxp MEK platform.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:42 +08:00
987510ecf2 MLK-19413-6 arm64: dts: fsl-imx8qm-mek: Enable pixel combiners
This patch enables pixel combiners for the i.MX8qm MEK platform.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:42 +08:00
2c150b0710 MLK-19413-5 arm64: fsl-imx8x-arm2.dtsi: Enable pixel combiner
This patch enables pixel combiner for the i.MX8x ARM2 platform.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:41 +08:00
f2136e1081 MLK-19413-4 arm64: fsl-imx8q-arm2.dtsi: Enable pixel combiners
This patch enables pixel combiners for the i.MX8qm ARM2 platform.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:41 +08:00
2d37352105 MLK-19413-3 arm64: fsl-imx8dx.dtsi: Add pixel combiner node
This patch adds pixel combiner node support for i.MX8dx DT
file and hooks the pixel combiner node to the DPU node.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:41 +08:00
199c54f8f5 MLK-19413-2 arm64: fsl-imx8qm.dtsi: Add pixel combiner support
This patch adds pixel combiner nodes support for i.MX8qm DT
file and hooks the pixel combiner nodes to the DPU nodes.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-02-12 10:33:40 +08:00
944fedd3a0 MLK-19258-6 ARM64: dts: fsl-imx8mm-evk: add two parameters for picophy tuning
With these two parameters tuning, it can pass USB eye diagram at evk board.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-02-12 10:33:38 +08:00
5e95dffa63 MLK-19258-4 ARM64: dts: fsl-imx8mq.dtsi: enable USB2.1 LPM support
With these two properties enabled, the dwc3 driver at 850D can ACk
LPM packet from host, and the later suspend/resume signals are correct.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-02-12 10:33:38 +08:00
c301badb90 MLK-19258-2 ARM64: dts: fsl-imx8qm-device.dtsi: change name of device mode
To satisfy grep "usb" for some scripts in all i.mx platforms.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-02-12 10:33:38 +08:00
a9d40785eb MLK-19258-1 ARM64: dts: fsl-imx8dx: change name of device mode
To satisfy grep "usb" for some scripts in all i.mx platforms.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-02-12 10:33:38 +08:00
57ab0010f0 MLK-19408: ARM64: dts: freescale: add timer stop in suspend flag on imx8mm
When system enter suspend, the system counter timer will stop counting.
So need to add "arm,no-tick-in-suspend" flag. Otherwise, the system
timekeeping will be wrong.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 1e15dda8c50a474891ccd1cb7fa7b41a8abbadc2)
2019-02-12 10:33:37 +08:00
3e151eefeb MLK-19323 ARM64: dts: imx8qxp: change back usdhc clock parent to PLL0
According to IC reply, 8QXP B0 still has some issue on its DPLL.
Though we still not find any issue when usdhc use PLL0(DPLL), but better
to change back to PLL1(APLL) just in case any problem. So this patch change
back the usdhc clock parent to PLL1.

To track the history, refer to commit 7834eee6df ("MLK-17188-2
ARM64: dts: imx8qxp: assign usdhc clock parent") and commit 0611d9138e
("MLK-18003 ARM64: dts: imx8qxp: change back usdhc clock parent to PLL0").

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2019-02-12 10:33:37 +08:00
1f4c947246 MGS-4192 dts: gpu: add board compatible string
add board compatible string for imx7ulp and m845s

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
2019-02-12 10:33:37 +08:00
47b207fe30 MLK-19243: arm64: dts: fsl-imx8mq-evk: fix adv7535 i2c master
Since the rev. B4 of the 8MQ EVK board, the i2c of the DSI was moved
from i2c1 to i2c3. Since ADV7535 needs these i2c lines, it was the only
one affected by this change.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
2019-02-12 10:33:37 +08:00
81fcafdbda MLK-19395 ARM64: dts: freescale: imx8qxp-ddr3l-val: correct model name
i.MX8QXP DDR3L board includes i.MX8QXP LPDDR4 ARM2 board's dts,
but need to overwrite the model name accordingly.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Robin Gong <yibin.gong@nxp.com>
2019-02-12 10:33:37 +08:00
012b278079 MLK-19381 ARM64: dts: freescale: imx8qm: increase CMA size
Increase i.MX8QM CMA size to 960MB to meet 4K video requirement.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
2019-02-12 10:33:37 +08:00
b6d3b6b5ed MLK-19227-3: arm64:dts:imx8qm-lpddr4-arm2-hdmi: Remove fsl,cec
CEC and EDID are not supported by lpddr4 arm4 board.
So remove fsl,cec and add fsl,no_edid properity.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit fbf7da4423c74e59830cf460e8f06cbd174d7be8)
2019-02-12 10:33:36 +08:00
e1d66450e3 MLK-19227-1: arm64:dts:imx8qm: Add HDMI/DP HPD interrupter
Add HDMI/DP HPD interrupter.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit 36ae1b30f8a2128128698f6496b28549a90721ee)
2019-02-12 10:33:35 +08:00
9b02da214c MLK-19114-1 arm64: fsl-imx8qm.dtsi: Add aux prg for dpr1/3_channel2
With the updated i.MX8QM silicon, prg1/10 may be shared bewteen
dpr1/3_channel1 and dpr1/3_channel2 respectively with appropriate
mux configurations in SCU firmware.  If prg1/10 are attached to
dpr1/3_channel2, then they act as the auxiliary prg to process
chroma pixels for SC_R_DC_0/1_BLIT1.  Otherwise, they act as the
primary prg to process RGB pixels for SC_R_DC_0/1_BLIT0.
Let's reflect this update in the device tree file.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit dab218c3c4)
2019-02-12 10:33:34 +08:00
448c4894f9 MLK-19166-6 arm64: dts: imx8qm: add flexcan support
Add flexcan 1, 2 ,3 support for imx8qm.

Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2019-02-12 10:33:33 +08:00
9e56920c81 MLK-19166-5 arm64: dts: imx8qm: delete flexcan node for domus
For add flexcan node in dtsi and xen doesn't support can, add "delete
flexcan node" for DomUs now.
Change interrupt-parent to gic, for xen does not support "wu"
interrupt controller.

Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2019-02-12 10:33:33 +08:00
c462f1159c MLK-19349 ARM64: dts: freescale: add i.mx8qxp ddr3l validation board dtb
This patch adds device tree support for i.MX8QXP DDR3L validation
board, it ONLY has 1GB memory, so CMA size needs to be reduced
when including the i.MX8QXP LPDDR4 ARM2 board device tree file.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit 3005f91cef3057aa6eeb168415ec42e57fc993f9)
2019-02-12 10:33:33 +08:00
26ff426d44 MLK-19359 arm64: dts: imx8qm-mek: set enet IO voltage to 1.8v
By default, imx8qm b0 silicon set the IO voltage to 2.5v, but the arm2
board is designed as 1.8v voltage for enet IO, so force the IO voltage
to 1.8 by setting COMP_CTL_GPIO_1V8_3V3 pins like:
For ENET0: SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB
For ENET1: SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA
The pin setting:
    1.8V/3.3V : bit4=0,  bit[30]=1, bit[2:0]=000
    2.5V      : bit4=1,  bit[30]=1, bit[2:0]=010

For 2.5v IO timing test, HW board need to do some rework:
    - Force PHY work at 2.5v mode
    - Supply 2.5v voltage to VDD_ENETx

Tested-by: Sandor Yu <Sandor.yu@nxp.com>
Tested-by: Jason Liu <jason.hui.liu@nxp.com>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-02-12 10:33:33 +08:00
cd461c1c74 MLK-19358 VPU: Enable VPU driver for 8qm mek B0
Enable VPU driver for 8qm mek B0 by changing fsl-imx8qm-mek.dts

Signed-off-by: Huang Chaofan <chaofan.huang@nxp.com>
(cherry picked from commit 78ac6d510298c6add57d4d8d457c8064fe31bb04)
2019-02-12 10:33:33 +08:00
a1525573fc MLK-18898-5: ARM64: dts: imx8mq: change the sdma script for SAI
The IMX_DMATYPE_SAI(24) performance is not enough to support high
sample rate/channels of audio case, there is a lot of underrun and
the sound is noise, the reason is that with this script, sdma copy data
through a long path (SDMA->pl301_audio -> pl301_display -> … ->
pl301_wakeup -> AIPS1 -> SPBA2 -> SAI).

The IMX_DMATYPE_SSI_SP(2) performance is better, which go through a shorter
path (SDMA -> SPBA2 -> SAI).

So we switch to use the IMX_DMATYPE_SSI_SP script, then 384k/32b/16c is
supported well.

Cloned from commit d5b70e9232 ("MLK-18643: ARM64: dts: imx8mm: change the
sdma script for SAI").

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 390620091748db98216c2f95fe95fb4ac3284564)
2019-02-12 10:33:33 +08:00
f109eae29e MLK-18898-4: ARM64: dts: imx8mq-evk: add SAI1 pcm_b2m pinctrl state
Add SAI1 pcm_b2m pinctrl state needed to map SAI1 BCLK to codec
MCLK pin.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 63c362c8c6cbe1e3a6b752ada828418e3c3e4363)
2019-02-12 10:33:32 +08:00
57bb20134b MLK-18898-3: ARM64: dts: fsl-imx8mq-evk-audio-tdm: remove redundant config
Remove redundant configuration already present in fsl-imx8mq-evk.dts.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 45545e75ca9cc29418d9674d22c8c6310ccdd0cd)
2019-02-12 10:33:32 +08:00
1048e32e14 MLK-18898-2: ASoC: imx-ak4458: refine mclk rate calculation
The existing implementation calculates mclk rate as function
of audio sample rate multiplied to multiplier taken from Table 5.
However this is not accurate for Manual Setting Mode - tables 3 & 4 from
AK4458 RM defines rate (LRCK/FS) and frame width (MCLK/16fs..1152fs) ranges
as parameters to calculate mclk frequency. Aside of this - adjust
bclk:mclk ratio from machine driver as function of "compatible" id.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 527b8b7032dcb75c14bb2790330ab96743d83b16)
2019-02-12 10:33:32 +08:00
d8e28bae8b MLK-19166-3 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>
2019-02-12 10:33:32 +08:00
1420422420 MLK-19166-1 arm64: dts: add flexcan device in DTS
Add flexcan device in dts file to enable base function on imx8qxp both
mek and arm2 board

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2019-02-12 10:33:32 +08:00
3f4294a8c7 MLK-19338 ARM64: dts: freescale: imx8qm: move mu interrupt controller to gic
To support lowest power mode for suspend, if no wakeup source
from non-secure partition is enabled, IRQSTEER can be powered
off when suspend, so non-secure linux OS needs to pass WU
irqchip wakeup source info to ATF, as MU is always enabled
as wakeup source, and it is a system level resource, so no
need to have it in WU domain.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit d45b2fd47417cc1c4e03616007271e07834cf415)
2019-02-12 10:33:31 +08:00
9140333d00 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)
2019-02-12 10:33:30 +08:00
8212a03fcd MLK-19154-5: ARM64: dts: imx8mm-evk: specify spdif pll8k and pll11k clocks
In imx8mm-evk DTS both AUDIO PLL rates are configured, so SPDIF1
pll8k and pll11k clocks can be set accordingly.

Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 4ee8ed7f91ebc96ee398ec1382fac738d79cfe6c)
2019-02-12 10:33:28 +08:00
cf8e914872 MLK-19222 ARM64: dts: fsl-imx8mm-evk: enable USBOTG2
Enable USBOTG2 port, there are some limitations for USB port usage
from hardware engineer:

USBOTG2 port must be connected to Host or Charger at anytime as the
power supply.
USBOTG1 port can be connected to Host, device or charger only after
USBOTG2 port is connected.
This limitation is caused by SIP team's load switch, the debouce time
is too long, so when power supply switches from one port to another,
system might lose power and reboot.

Acked-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-02-12 10:33:28 +08:00
648b068a90 MLK-19226 VPU: Add support for i.MX8QM B0 vpu decoder and encoder
Add support for i.MX8QM B0 vpu decoder and encoder and it is compatiable
with i.MX8QXP B0 VPU.

Signed-off-by: Huang Chaofan <chaofan.huang@nxp.com>
(cherry picked from commit f2d7823da29c55644299eea84a2e866ea188c698)
2019-02-12 10:33:27 +08:00
c52d0179d1 MLK-19228 ARM64: dts: qxp: introduce xen dtsi
xen does not support wu interrupt controller, it will cause dom0
boot failure, modify the nodes that use wu to use gic and remove wu.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Anson Huang <anson.huang@nxp.com>
2019-02-12 10:33:27 +08:00
1a1148ed54 MLK-19168-8: ARM64: dts: add new dts for m4 audio playback.
add new dts for m4 audio playback

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 7343c0bd256d7ade1152f83bd0eb395d29e03620)
2019-02-12 10:33:23 +08:00
e26f8fc2fd MLK-19118-4: ARM: dts: add supply for audio codec on audio board
There is a change in imx8mm evk revb board, which is to add a i2c
control for power enablement of audio board, that software can
control the power of audio board, which can resolve the issue that
with audio board the cpu board can't reboot issue.

In this patch add power supply for each AK series codecs

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 1d3d7e6d6ecd0ab62fb9bb568a5afeb2fbeda1ca)
2019-02-12 10:33:22 +08:00
0160bc5f89 MLK-19067-2: ARM64: dts: only support playback on imx8mm evk
only support playback for rpmsg device on imx8mm evk.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit a6e9ff5efc814fa08f7e4664f584861b4a4d5792)
2019-02-12 10:33:22 +08:00
4c3b97bf85 MLK-19042-6: ARM64: dts: enable sound-rpmsg in fsl-imx8mm-evk-m4
enable sound-rpmsg in fsl-imx8mm-evk-m4

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 195a79896f105e5537ae4dfde97e87a9e198cbbd)
2019-02-12 10:33:21 +08:00
017cbf791c MLK-19042-5: ARM64: defconfig: enable i2s over rpmsg
enable i2s over rpmsg

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
(cherry picked from commit 0ee32296ec540e5c11c627012656f0373317eaac)
2019-02-12 10:33:21 +08:00
68d80484fd Revert "MLK-15052-6: ARM64: config: Disable the setting CONFIG_MTD_SPI_NOR_USE_4K_SECTORS"
This reverts commit 735d90236c.

The change has already integrated to 4.14 kernel.
2019-02-12 10:33:20 +08:00