diff options
author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:25 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:25 +0800 |
commit | 3e8c4bdbf7919947566636e4b8738f712ebd5322 (patch) | |
tree | 5aa144c8a7c52f6c4dca5c7458175cc438f4f63f /arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts | |
parent | dbdab14cb09df1e96010b9863c5da3a0cc56e63a (diff) | |
parent | 79a2871019d2590882af2e7852de4a079b733650 (diff) |
Merge branch 'dts/next' into next
* dts/next: (765 commits)
arm64: dts: fsl: ls1028a: Disable eno3 and make swp5 the Felix CPU port
arm64: dts: fsl: ls1028a: Specify that the Felix port 4 runs at 2.5Gbps
arm64: dts: fsl: Drop "compatible" string from Felix switch
arm64: dts: fsl: Specify phy-mode for CPU ports
LF-261: arm64: dts: imx8mq: Set parent clock for IMX8MQ_CLK_AUDIO_AHB
...
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts new file mode 100644 index 000000000000..9a1f453551d6 --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-14x14-evk-csi.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2015 Freescale Semiconductor, Inc. + +#include "imx6ul-14x14-evk.dts" + + +&csi { + status = "okay"; +}; + +&ov5640 { + status = "okay"; +}; + +&sim2 { + status = "disabled"; +}; |