1
0
Fork 0
Commit Graph

58742 Commits (3ad8cc16ef8fb409e787afcc4b33129253a72ade)

Author SHA1 Message Date
Fugang Duan 3ad8cc16ef ARM: dts: imx6: enable Murata 1MW M.2 card for imx6 legacy platforms
Enable Murata 1MW M.2 card for i.MX6 legacy platforms. Plug in
Murata 1MW M.2 into SD slot by using Murata uSD-to-M.2 Adapter.

Below i.MX6 legacy platforms will be supported:
- i.MX6Q/QP/DL SDB, SD2 slot
- i.MX6SX SDB, SD2 slot
- i.MX6SLL EVK, SD3 slot
- i.MX6UL/ULL/ULZ EVK, SD1 slot

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:09:09 +08:00
Fugang Duan 56d26191f3 MLK-18675-23 ARM: dts: imx7d-sdb: add wifi bcm4339 support with fmac driver
Add wifi bcm4339 support with fmac driver.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>
2019-11-25 16:09:08 +08:00
Robby Cai 355e11eebf ARM: dts: imx6ull-14x14-evk: enable csi and ov5640
enable csi and ov5640

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:50 +08:00
Robby Cai e5ce0ffcb6 ARM: dts: imx6ul-14x14-evk: add new dts file for CSI support
add new dts file for CSI support, as there's pin conflict with SIM2

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:49 +08:00
Robby Cai 4a462be0ff ARM: dts: imx6qdl-sabreauto: use internal version of adv7180 driver
change compatible string to use internal version of adv7180 driver

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:49 +08:00
Haibo Chen 7380ea70ff arm: dts: imx: add emmc support on imx6ulz
eMMC on EVK board share the same USDHC with Micro-SD.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2019-11-25 16:08:48 +08:00
Robin Gong 714b71358e ARM: dts: imx7d-sdb: add syscon-poweroff
Add syscon-poweroff device node for i.mx7d.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2019-11-25 16:08:48 +08:00
Joakim Zhang 6738f1d9e1 arch: arm: dts: add dts file to enable can1
Add dts file to enbale can1 which is pin conflict with fec on
i.MX6Q/QP/DL sabreauto board.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2019-11-25 16:08:48 +08:00
Sandor Yu ac9bc21178 dts: arm: imx6qdl auto: set hdmi to disp_id 1
set hdmi to disp_id 1.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
2019-11-25 16:08:46 +08:00
Fugang Duan 1e60413b77 ARM: dts: imx7d-sdb: move pin LPSR_GPIO1_IO04 to iomuxc_lpsr
PIN LPSR_GPIO1_IO04 is LPSR pin, then move it to iomuxc_lpsr
node. And remove the dummy pin group for the PIN.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2019-11-25 16:08:45 +08:00
Han Xu 57101fca3c arm: dts: move the sai3 pinctrl to the correct group
one of the sai3 pinctrl should be in lpsr iomux group rather than
in iomux group, which messes up the QSPI iomux control.

Signed-off-by: Han Xu <han.xu@nxp.com>
2019-11-25 16:08:44 +08:00
Han Xu f88b8eac9a arm: dts: enabled qspi on imx7d
change the dts description to adapt to spi-mem and disable the
conflict epdc module.

Signed-off-by: Han Xu <han.xu@nxp.com>
2019-11-25 16:08:42 +08:00
Shengjiu Wang dcf5630d5f ARM: dts: imx6sx: Support audio sound card for sabreauto board
Support audio sound card for sabreauto board

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
2019-11-25 16:08:41 +08:00
Horia Geantă 1a76277d9d MLKU-25-2-fix ARM: dts: imx: add secure memory for 6qdl
-add missing secure memory node for 6qdl
-fix register size for 6ul and 6sx

Fixes: 069951d3976d ("MLKU-25-2 ARM: dts: imx: add secure memory")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
2019-11-25 16:08:40 +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
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
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
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
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
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
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
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 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
Anson Huang ce2a37362b ARM: dts: imx6qdl: Disable cnm,coda960 VPU driver
Disable cnm,coda960 VPU driver and use MXC VPU driver instead.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2019-11-25 16:08:03 +08:00
Liu Ying 509983c208 arm: imx6qdl-sabreauto.dtsi: Enable mxc_v4l2_output
This patch enables mxc_v4l2_output device tree support for
the i.MX6qdl Sabreauto platforms.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:08:03 +08:00
Liu Ying 794b452181 arm: imx6qdl-sabresd.dtsi: Enable mxc_v4l2_output
This patch enables mxc_v4l2_output device tree support for
the i.MX6qdl Sabresd platforms.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
2019-11-25 16:08:02 +08:00
Robby Cai b7ce0a73b2 arm: dts: imx6qdl-sabresd: add V4L2 capture support
use internal version and resolve conflict with upstreaming code.
add the nodes for v4l2 capture, mipi csi, and ov5460 cameras.

Signed-off-by: Robby Cai <robby.cai@nxp.com>
2019-11-25 16:08:02 +08:00
Joakim Zhang 1146dff374 arch: arm: imx6ull-9x9: add the missing CAN node
Add the missing CAN node.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2019-11-25 16:08:00 +08:00