summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Xu <han.xu@nxp.com>2017-11-10 15:29:36 -0600
committerHan Xu <han.xu@nxp.com>2017-11-10 20:28:44 -0600
commitc21c017ab4e908680834f09aa936858993ce311a (patch)
treeb272f5a3e61de9070cf3aab87141f35c02a85c73
parent67cf0badcd80480edbea13fae45b5f7431a89b50 (diff)
MLK-16799-1: arm64: dts: remove the unnecessary clock for flexspi
flexspi only need one clock source, removed the redundant one from device tree. BuildInfo: - SCFW 15d20cde, IMX-MKIMAGE ff9860c5, ATF 0 - U-Boot 2017.03-00003-gd09f5db Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit d7edc828554e7b447d0a0e961ba1b7bd2543f970)
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi7
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi7
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
index 916a89442c4d..e68ec5994c89 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
@@ -2892,10 +2892,9 @@
<0x0 0x08000000 0x0 0x19ffffff>;
reg-names = "FlexSPI", "FlexSPI-memory";
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clk IMX8QM_FSPI0_CLK>,
- <&clk IMX8QM_FSPI0_CLK>;
- assigned-clock-rates = <29000000>,<29000000>;
- clock-names = "qspi_en", "qspi";
+ clocks = <&clk IMX8QM_FSPI0_CLK>;
+ assigned-clock-rates = <29000000>;
+ clock-names = "fspi";
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
index f9a346686aa4..616e7619712e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
@@ -2201,10 +2201,9 @@
reg = <0x0 0x5d120000 0x0 0x10000>, <0x0 0x08000000 0x0 0x19ffffff>;
reg-names = "FlexSPI", "FlexSPI-memory";
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clk IMX8QXP_LSIO_FSPI0_CLK>,
- <&clk IMX8QXP_LSIO_FSPI0_CLK>;
- assigned-clock-rates = <29000000>,<29000000>;
- clock-names = "qspi_en", "qspi";
+ clocks = <&clk IMX8QXP_LSIO_FSPI0_CLK>;
+ assigned-clock-rates = <29000000>;
+ clock-names = "fspi";
status = "disabled";
};