From 94da7bdc489ba686d868bcf80678a37cae22673e Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Thu, 3 Jan 2019 18:50:30 +0800 Subject: [PATCH] MLK-20674 ARM64: dts: imx8mq: enable uart2 clock and disable caam Enable uart2 clk to let inmate could access uart And disable CAAM for inmate Signed-off-by: Peng Fan Reviewed-by: Jun Li (cherry picked from commit 59e4096c1bf0ef39e94b2b3ea81629f8862b59ec) --- arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-inmate.dts | 4 ++-- arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-root.dts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-inmate.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-inmate.dts index 0914012d016d..135a90498fa7 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-inmate.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-inmate.dts @@ -170,8 +170,8 @@ /delete-node/ &vpu; /delete-node/ &ddr_pmu0; /delete-node/ &imx_rpmsg; -/*/delete-node/ &crypto;*/ -/*/delete-node/ &caam_sm;*/ +/delete-node/ &crypto; +/delete-node/ &caam_sm; /delete-node/ &caam_snvs; /delete-node/ &irq_sec_vio; /delete-node/ &dma_apbh; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-root.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-root.dts index 9badfbf2b34d..5e1d6688b139 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-root.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-root.dts @@ -32,6 +32,8 @@ IMX8MQ_CLK_MAIN_AXI IMX8MQ_CLK_A53_CG IMX8MQ_CLK_AUDIO_AHB IMX8MQ_CLK_TMU_ROOT IMX8MQ_CLK_DRAM_APB + IMX8MQ_CLK_UART2_ROOT + IMX8MQ_CLK_UART2 IMX8MQ_CLK_NAND_USDHC_BUS>; };