1
0
Fork 0
Commit Graph

873846 Commits (4acf3940c9dea18635939283dec428f2fea88626)

Author SHA1 Message Date
Shengjiu Wang 4acf3940c9 ARM64: imx8mm-evk: Move assign clocks of audio PLLs to correct place
Put assigned clocks of audio PLLs in imx8mm-evk.dts, which conflict
with the assigned clocks in imx8mm.

Fixes: 77b5daa55e63 ("ARM64: dts: imx8mm: Enable AK4497/AK4458/AK5558/SPDIF/MICFIL")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2019-11-25 16:08:36 +08:00
Leonard Crestez 55508ab478 arm64: dts: imx8mq: Disable sysctr because it breaks cpuidle
For some reason the activating the upsteam sysctr driver causes cpuidle
hangs on imx8mq.

Temporarily disable this until the root cause can be figured out. This
reverts to behavior in linux-nxp before rebase from next-20190809 to
v5.4-rc3.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:08:35 +08:00
Sandor Yu 57ad127809 arm: dts: imx6sx: Add vadc properity
Add vadc properity.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-11-25 16:08:35 +08:00
Sandor Yu 293b8f994c arm: dts: imx6: Add hdmi property to sabreauto dts files
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-11-25 16:08:34 +08:00
Peter Chen bf650f5fe5 MLK-22752-4 ARM: dts: imx7s: Add power domain for imx7d HSIC
Otherwise, the system will hang if USB driver try to access
portsc register.

Cc: André Draszik <git@andred.net>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-11-25 16:08:34 +08:00
Peter Chen 1c45d36d3d MLK-22721 ARM: dts: imx6ul-14x14-evk.dtsi: configure USBOTG1 ID pinctrl
Without configuring this pinctrl, the ID value can't be got correctly,
then, the dual-role switch can't work well.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
2019-11-25 16:08:34 +08:00
Mirela Rabulea c6e4ab93f4 arm64: dts: Add mxc-jpeg decoder/encoder nodes for imx8qxp/qm
Add jpeg decoder/encoder nodes imx8qxp & imx8qm.

At this stage, labgrid tests pass on imx8qxp/qm.
Also, basic v4l2-compliance tests pass on imx8qxp/qm.

Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:08:33 +08:00
Joakim Zhang 853c80da34 arch: arm: imx6qdl-sabreauto: add back pinctrl-assert-gpios property for CAN
pinctrl-assert-gpios, this property does not exist in upstream, need add
back.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
(cherry picked from commit 4577fefdc5bc5e7de7a0a2f904fefc8445d68ac9)
2019-11-25 16:08:33 +08:00
Joakim Zhang dc4bf2dd54 arch: arm: imx6ul14x14: add back pinctrl-assert-gpios and registers-default property for CAN
pinctrl-assert-gpios and registers-default, these properties does not exist
in upstream, need add back.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
(cherry picked from commit 8492eb228a80712059d1873c613954b180f009ae)
2019-11-25 16:08:31 +08:00
Shengjiu Wang dcadf53022 ARM: dts: imx6ull-14x14-evk: Add assigned-clocks for audio PLL
Add assigned-clocks for audio PLL

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 12727b6d7c6f47452c14da34edc9c1194ea81cde)
2019-11-25 16:08:30 +08:00
Robby Cai af572c4c9d ARM64: dts: imx8mq-evk: enable csi bridge, mipi csi and mipi camera ov5640
enable csi bridge, mipi csi and mipi camera ov5640

Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit 7f7bbb2dfb7a19381f1f6dab75110329b89dc05b)
2019-11-25 16:08:30 +08:00
Robby Cai a532ea7777 ARM64: dts: imx8mq: add csi and mipi csi node
add csi bridge and mipi csi node

Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit 7028095660d45064d7a1404c26b9a4f00d034043)
2019-11-25 16:08:29 +08:00
Sherry Sun 0aea80b560 MLK-22746-1 dts: add wifi device support in i.MX8mm device tree
Add usdhc1 node which represent wifi device.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
(cherry picked from commit ae940d9d4393b7b1fa68faf61f4755310d0f564c)
2019-11-25 16:08:29 +08:00
Liu Ying a92d83813f ARM: imx6qdl-sabreauto.dtsi: Change LDB_DI0/1_SEL clk's parent to PLL2_PFD0_352M
This patch changes LDB_DI0/1_SEL clock's parent from PLL3_USB_OTG to
PLL2_PFD0_352M so that it aligns with imx_4.19.y kernel. Also, with
this patch applied, the clock tree may provide ~64.6MHz pixel clock
rate to the Hannstar XGA LVDS panel, which is closer to the desired
65MHz(before the change, it's ~68.5MHz).

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit 142b7222bbebe521d3f4b8d3850c40bd7660a7cf)
2019-11-25 16:08:28 +08:00
Liu Ying 10cc7dba5b ARM: imx6qdl-sabresd.dtsi: Change LDB_DI0/1_SEL clk's parent to PLL2_PFD0_352M
This patch changes LDB_DI0/1_SEL clock's parent from PLL3_USB_OTG to
PLL2_PFD0_352M so that it aligns with imx_4.19.y kernel. Also, with
this patch applied, the clock tree may provide ~64.6MHz pixel clock
rate to the Hannstar XGA LVDS panel, which is closer to the desired
65MHz(before the change, it's ~68.5MHz).

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit a76d0c86ada7717c1cb556a1ac1fc4dd022db8bc)
2019-11-25 16:08:27 +08:00
Joakim Zhang f6cae0a82b arm64: dts: imx8qm: add emvsim device node
Add emvsim device node for imx8qm mek.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
(cherry picked from commit e4586a8fddc499296abc1442ff3291559fb77e97)
2019-11-25 16:08:26 +08:00
Abel Vesa 81990ba6e8 clk: imx8qxp: Add JPEG encode/decode clocks
Clocks needed by JPEG Encoder/Decoder Linux V4L2 driver.
These additions are based on linux-imx/imx_4.19.y.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Tested-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Acked-by: Leonard Crestez <leonard.crestez@nxp.com>
(cherry picked from commit 7ac4b9c761b133cfb364d269d7e64db57c4863d8)
2019-11-25 16:08:25 +08:00
Zhou Peng adc1246178 ARM64: dts: imx8mm: increase cma size to '0x28000000'
Default is only about 300MB, not enough for some multi-instance test

Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>
(cherry picked from commit 43b40a50f66d7e6e83775a9568546a92876956d1)
2019-11-25 16:08:25 +08:00
Robby Cai da6d896963 ARM: dts: imx6sx-sdb: enable ldb and lcdif2
enable ldb and lcdif2

Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit 130202618e293f273419dd4c377fc936c66bd313)
2019-11-25 16:08:25 +08:00
Robby Cai 1952772adf ARM: dts: imx6sx: add ldb node for lvds
add ldb node for lvds

Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit f7647936eae0e75614455b8e99b0a1d68a1d26b1)
2019-11-25 16:08:24 +08:00
Shengjiu Wang 0220e32be0 ARM: dts: imx6: change cpu-dai to audio-cpu
change cpu-dai to audio-cpu for alignment between
imx-wm8962 and fsl-asoc-card

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 010293d320968ac8b74ae2beff2815574efaf2a6)
2019-11-25 16:08:23 +08:00
Shengjiu Wang 3f61393166 ARM: dts: imx6sll: change compatible string for sdma
change compatible string for sdma

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 12c7a2a0fa87a09977eb5582a28f39db29b11f00)
2019-11-25 16:08:23 +08:00
Leonard Crestez b7a4e60c6b Revert "ARM: dts: Disable ov564x cameras"
This reverts commit fbfe81a9783a604226689455666abdad472e37aa.

(cherry picked from commit c4786ad992e5e48d474ee5cf15af0a292b61bc62)
2019-11-25 16:08:23 +08:00
Robby Cai f860033b77 ARM: dts: imx6qp-sabresd: adjust AVDD and DOVDD for camera ov5640
on imx6qp sabresd board, use different regulators for AVDD and DOVDD
power supply for camera ov5640 (both parallel and mipi).

Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit 2f372c5776fd84541577bc61a9501795206d1dd0)
2019-11-25 16:08:21 +08:00
Shengjiu Wang eb6281aee4 ARM64: dts: imx8mm: Add dai-tdm-slot-num and dai-tdm-slot-width
Add dai-tdm-slot-num and dai-tdm-slot-width for sound-wm8524

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 874740c7dcceb0704e68cacf57b3ea907c3b2710)
2019-11-25 16:08:20 +08:00
Anson Huang a9b28af0c8 ARM: dts: imx6ull-14x14-evk: Improve model name
Improve model name which is used as machine name in
soc driver to meet test team's auto test requirement.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit b7d8943bb1b2342a431424e7e4c3c9094d35fa5c)
2019-11-25 16:08:20 +08:00
Anson Huang 74dbce2397 ARM: dts: imx6dl: Correct cpu clocks
cpu clocks should match cpufreq's clk table, otherwise,
cpufreq driver probe will fail.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit ca2dadb6be4a30b3b8b429faa2bbbd8c86ab9eae)
2019-11-25 16:08:19 +08:00
Anson Huang e5907a9126 arm64: dts: imx8mq: Remove GPU/VPU thermal zone
Remove GPU/VPU thermal zones to make it aligned with
previous NXP internal tree.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 6bcd8249cb717c8525bd69c9ca501d378b67e0be)
2019-11-25 16:08:19 +08:00
Horia Geantă c685791ca6 MLKU-25-2 ARM: dts: imx: add secure memory
This is a rework of the following i.MX BSP commits
(rel_imx_4.19.35_1.1.0_rc2):

e16519004971 ("MLK-12339 Security: Missing caam support.")
dfc914b909cd ("ARM: dts: imx6ul: Add caam")
9d9ca7a03e3b ("MLK-11922 i.mx6: Linux 3.14.28 CAAM & SNVS enabled by default. JTAG, DS-5 attachment causes exceptions")
42993884b16f ("MLK-18082: ARM: dts: imx: Change size of caam-sm to correct size")

Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:18 +08:00
Franck LENORMAND bd7968b6f1 MLKU-25-1 dt-bindings: crypto: fsl: add secure memory
This is a rework of the following i.MX BSP commit
(rel_imx_4.19.35_1.1.0_rc2):
0adf02011a49 ("MLK-18082: defconfig: Add caam to 7ulp conf")

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:18 +08:00
Dan Douglass 2bc9a11149 MLKU-38-2 ARM: dts: imx: add caam snvs and secvio
This is a rework of the following i.MX BSP commits
(rel_imx_4.19.35_1.1.0_rc2):

8f6a17b41917 ("ENGR00289885 [iMX6Q] Add Secure Memory and SECVIO support.")
e16519004971 ("MLK-12339 Security: Missing caam support.")
dfc914b909cd ("ARM: dts: imx6ul: Add caam")
9d9ca7a03e3b ("MLK-11922 i.mx6: Linux 3.14.28 CAAM & SNVS enabled by default. JTAG, DS-5 attachment causes exceptions")
c1bf396415de ("MLK-10086-2 ARM: imx6: add dts entries for hsic controller")
34dc6980785b ("MLK-11265-1 ARM: dts: add imx7d soc dtsi support")

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:17 +08:00
Fugang Duan 606d296ae7 MLKU-38-1 dt-bindings: crypto: fsl: add snvs clock management
This is a rework of the following i.MX BSP commit
(rel_imx_4.19.35_1.1.0_rc2):
3ac6edcd92d4 ("MLK-11360-01 crypto: caam_snvs: add snvs clock management")

caam_snvs driver involves snvs HP registers access that needs to
enable snvs clock source. The patch add the clock management.

Signed-off-by: Andy Duan <fugang.duan@nxp.com>
Signed-off-by: Dan Douglass <dan.douglass@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:16 +08:00
Horia Geantă 33738b5dcd MLKU-62-1 arm64: dts: imx8qm/imx8qxp: add security subsystem
Security subsystem includes:
-caam crypto engine
-secure memory

Notes:

1. caam has 4 job rings, however only last 2 rings are accessible
from the kernel.

2. Controller DT node is added in the same power domain as the JR2
(1st jr showing in DT).
This is needed since controller driver (ctrl.c) needs first jr
(JR2 in this case) "powered", so it can access its register page
(which has some aliases for registers located in controller page,
page that is not accesible from the kernel).

Adding controller DT node to the power domain leads to SCU f/w
being instructed to "power up" JR2.
What actually happens is that:
-XRDC2 is programmed to provide access to JR2 register page
-SECO f/w is instructed to update JR2DID_LS and possibly
JR2DID_MS[USE_OUT].

USE_OUT details from Security RM:

"JRaDID_MS contains a USE_OUT field that enables a second set of ICID
and DID values.

When USE_OUT=1, this Job Ring's *data* write transactions will assert
TrustZone Non-SecureWorld, along with the OUT_DID and OUT_ICID values
from JRSDID_LS.
All other bus transactions, including all reads, descriptor write-backs
and job completion status writes will assert the PRIM_ICID, PRIM_ICID and
not PRIM_TZ values from JRaDID_MS.

When USE_OUT=0, all bus transactions performed on behalf of this Job Ring
will use the PRIM_ICID, PRIM_ICID and not PRIM_TZ values from JRSDID_MS."

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:15 +08:00
Horia Geantă 41ff3c14e4 MLKU-123-3 arm64: dts: imx8mn: Add CAAM node
Add node for CAAM - Cryptographic Acceleration and Assurance Module.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:15 +08:00
Horia Geantă d66d658f05 MLKU-123-2 arm64: dts: imx8mm: Add CAAM node
Add node for CAAM - Cryptographic Acceleration and Assurance Module.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:14 +08:00
Leonard Crestez a53b76c23b arm64: dts: imx8qxp-mek: Remove stray adma_dsp
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:08:14 +08:00
Robby Cai a95001e8f7 ARM: dts: imx6sl-evk-csi: add new dts file for csi
add new dts file for csi since csi and epdc has pin conflict

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:13 +08:00
Robby Cai aad3b65f3a ARM: dts: imx6sl: update csi node
update csi node

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:13 +08:00
Robby Cai d7e137db9d ARM64: dts: imx8mm-evk: enable mipi camera ov5640
enable csi bridge, mipi csi and mipi camera ov5640

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:12 +08:00
Robby Cai 576d7f89f2 ARM64: dts: imx8mm: add csi bridge and mipi csi node
add csi bridge and mipi csi node

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:11 +08:00
Robby Cai 8bb0316408 ARM: dts: imx7d-sdb: enable mipi camera ov5640
enable csi bridge, mipi csi, and mipi camera ov5640 on imx7d sdb

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:11 +08:00
Robby Cai 30c2ee0d48 ARM: dts: imx7d: use internal version of csi bridge/mipi csi node
use internal version of csi bridge and mipi csi node

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:10 +08:00
Robby Cai 23abe424e7 ARM: dts: add new imx6sx-sdb-lcdif1 dts file
on SDB board, LCD1_DATA07 is shared by lcdif1 and csi1, so add -lcdif1 dts
file to resovle the conflict.

[  503.947201] imx6sx-pinctrl 20e0000.iomuxc: pin MX6SX_PAD_LCD1_DATA07 already requested by 2220000.lcdif; cannot claim for 0-003c
[  503.958957] imx6sx-pinctrl 20e0000.iomuxc: pin-59 (0-003c) status -22
[  503.965560] imx6sx-pinctrl 20e0000.iomuxc: could not request pin 59 (MX6SX_PAD_LCD1_DATA07) from group csigrp-0  on device 20e0000.iomuxc

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:09 +08:00
Robby Cai c4ae264ae8 ARM: dts: imx6sx-sdb: add parallel camera ov5640 support
add parallel camera ov5640 support on imx6sx sdb

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:09 +08:00
Robby Cai f6f5339f7b ARM: dts: imx6sx: add CSI support of internal version
use internal version of CSI driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:08 +08:00
Robby Cai 8d513c754b ARM: dts: imx6ull-9x9-evk: add parallel camera ov5640 support
add parallel camera ov5640 support on imx6ull 9x9 EVK

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:07 +08:00
Robby Cai 4eb092f584 ARM: dts: imx6ul-9x9-evk: add parallel camera ov5640 support
add parallel camera ov5640 support on imx6ul 9x9 EVK

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:06 +08:00
Robby Cai 2388f37462 ARM: dts: imx6ul-14x14-evk: add parallel camera ov5640 support
add parallel camera ov5640 support on imx6ul/imx6ull 14x14 EVK.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:05 +08:00
Robby Cai 528b809ba5 ARM: dts: imx6ul: add csi node
Add csi node on imx6ul

This has different clocks versus upstream.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:08:04 +08:00
Leonard Crestez 5461070c20 ARM: dts: Disable ov564x cameras
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
2019-11-25 16:08:04 +08:00