summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Zhu <hongxing.zhu@nxp.com>2016-09-05 16:05:38 +0800
committerRichard Zhu <hongxing.zhu@nxp.com>2016-09-12 10:42:25 +0800
commitcde006010b2d436891817982144fba9927a72a61 (patch)
tree1c937b8292200646b5746be12691f2e3b7a2ea22
parent1273a895598d61b1cba698493085fb7610d28569 (diff)
MLK-13186-2 arm: imx6qp: add imx6qp standalone pcie dtb
In order to pass the pcie gen2 compliance tests on imx6qp sd revb board, add one standalone imx6qp sd ldo pcie dtb - disalbe fec/sata, because that the fec/sata can't work when pll6 is in bypass mode. NOTE: Bypass mode of pll6 is mandatory required when external oscillator is used as pcie ref clk. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> (cherry picked from commit 35cd4bdd4d8451a62475ecb922803d656f144bcf)
-rw-r--r--Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt1
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/imx6qp-sabresd-ldo-pcie-cert.dts21
3 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
index 6fbba53a309b..9078757516a3 100644
--- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
@@ -12,6 +12,7 @@ Required properties:
- "msi": The interrupt that is asserted when an MSI is received
- clock-names: Must include the following additional entries:
- "pcie_phy"
+- ext_osc: use the external oscillator or not.
Example:
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 3a1631d08b2d..c107c29c09b2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -316,6 +316,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6qp-sabresd-btwifi.dtb \
imx6qp-sabresd-hdcp.dtb \
imx6qp-sabresd-ldo.dtb \
+ imx6qp-sabresd-ldo-pcie-cert.dtb \
imx6q-sabrelite.dtb \
imx6q-sabresd.dtb \
imx6q-sabresd-btwifi.dtb \
diff --git a/arch/arm/boot/dts/imx6qp-sabresd-ldo-pcie-cert.dts b/arch/arm/boot/dts/imx6qp-sabresd-ldo-pcie-cert.dts
new file mode 100644
index 000000000000..da6b11773680
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qp-sabresd-ldo-pcie-cert.dts
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6qp-sabresd-ldo.dts"
+
+&fec {
+ status = "disabled";
+};
+
+&pcie {
+ ext_osc = <1>;
+};
+
+&sata {
+ status = "disabled";
+};