0f7de49fa3
Old bootloader (same ones which have DT disabled) don't perform any PCIe initialization. The consequence is a freeze during PCIe bring-up on these old u-boot. Same kernel with a newer bootloaders works fine as they contain the corresponding PCIe init code. In this change, we'll add the missing init and make sure the kernel doesn't rely on some preexisting init to get PCIe to work. That includes the following changes: *GPIOs: set function & drive strength *Clocks: add init code for aux & ref clocks *PCIe driver: additional init of the hardware controller Tested 3.18 and 4.1 on an AP148 with bootloader branch 0.0.1 Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 46557
265 lines
7.0 KiB
Diff
265 lines
7.0 KiB
Diff
From 5b40516b2f5fb9b2a7d6d3e2e924f12ec9d183a8 Mon Sep 17 00:00:00 2001
|
|
From: Mathieu Olivari <mathieu@codeaurora.org>
|
|
Date: Tue, 21 Apr 2015 19:01:42 -0700
|
|
Subject: [PATCH 8/9] ARM: dts: qcom: add pcie nodes to ipq806x platforms
|
|
|
|
qcom-pcie driver now supports version 0 of the controller. This change
|
|
adds the corresponding entries to the IPQ806x dtsi file and
|
|
corresponding platform (AP148).
|
|
|
|
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
|
---
|
|
arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 30 ++++++++
|
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 124 +++++++++++++++++++++++++++++++
|
|
2 files changed, 154 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
|
|
@@ -35,6 +35,24 @@
|
|
bias-disable;
|
|
};
|
|
|
|
+ pcie0_pins: pcie0_pinmux {
|
|
+ mux {
|
|
+ pins = "gpio3";
|
|
+ function = "pcie1_rst";
|
|
+ drive-strength = <12>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ pcie1_pins: pcie1_pinmux {
|
|
+ mux {
|
|
+ pins = "gpio48";
|
|
+ function = "pcie2_rst";
|
|
+ drive-strength = <12>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
spi_pins: spi_pins {
|
|
mux {
|
|
pins = "gpio18", "gpio19", "gpio21";
|
|
@@ -114,5 +132,19 @@
|
|
sata@29000000 {
|
|
status = "ok";
|
|
};
|
|
+
|
|
+ pcie0: pci@1b500000 {
|
|
+ status = "ok";
|
|
+ reset-gpio = <&qcom_pinmux 3 0>;
|
|
+ pinctrl-0 = <&pcie0_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
+
|
|
+ pcie1: pci@1b700000 {
|
|
+ status = "ok";
|
|
+ reset-gpio = <&qcom_pinmux 48 0>;
|
|
+ pinctrl-0 = <&pcie1_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064-db149.dts
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064-db149.dts
|
|
@@ -30,6 +30,33 @@
|
|
bias-disable;
|
|
};
|
|
|
|
+ pcie0_pins: pcie0_pinmux {
|
|
+ mux {
|
|
+ pins = "gpio3";
|
|
+ function = "pcie1_rst";
|
|
+ drive-strength = <12>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ pcie1_pins: pcie1_pinmux {
|
|
+ mux {
|
|
+ pins = "gpio48";
|
|
+ function = "pcie2_rst";
|
|
+ drive-strength = <12>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ pcie2_pins: pcie2_pinmux {
|
|
+ mux {
|
|
+ pins = "gpio63";
|
|
+ function = "pcie3_rst";
|
|
+ drive-strength = <12>;
|
|
+ bias-disable;
|
|
+ };
|
|
+ };
|
|
+
|
|
spi_pins: spi_pins {
|
|
mux {
|
|
pins = "gpio18", "gpio19", "gpio21";
|
|
@@ -128,5 +155,26 @@
|
|
usb30@1 {
|
|
status = "ok";
|
|
};
|
|
+
|
|
+ pcie0: pci@1b500000 {
|
|
+ status = "ok";
|
|
+ reset-gpio = <&qcom_pinmux 3 0>;
|
|
+ pinctrl-0 = <&pcie0_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
+
|
|
+ pcie1: pci@1b700000 {
|
|
+ status = "ok";
|
|
+ reset-gpio = <&qcom_pinmux 48 0>;
|
|
+ pinctrl-0 = <&pcie1_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
+
|
|
+ pcie2: pci@1b900000 {
|
|
+ status = "ok";
|
|
+ reset-gpio = <&qcom_pinmux 63 0>;
|
|
+ pinctrl-0 = <&pcie2_pins>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
@@ -4,6 +4,8 @@
|
|
#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
|
|
#include <dt-bindings/clock/qcom,lcc-ipq806x.h>
|
|
#include <dt-bindings/soc/qcom,gsbi.h>
|
|
+#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
|
|
+#include <dt-bindings/interrupt-controller/arm-gic.h>
|
|
|
|
/ {
|
|
model = "Qualcomm IPQ8064";
|
|
@@ -329,5 +331,127 @@
|
|
#reset-cells = <1>;
|
|
};
|
|
|
|
+ pcie0: pci@1b500000 {
|
|
+ compatible = "qcom,pcie-v0";
|
|
+ reg = <0x1b500000 0x1000
|
|
+ 0x1b502000 0x80
|
|
+ 0x1b600000 0x100
|
|
+ 0x0ff00000 0x100000>;
|
|
+ reg-names = "dbi", "elbi", "parf", "config";
|
|
+ device_type = "pci";
|
|
+ linux,pci-domain = <0>;
|
|
+ bus-range = <0x00 0xff>;
|
|
+ num-lanes = <1>;
|
|
+ #address-cells = <3>;
|
|
+ #size-cells = <2>;
|
|
+
|
|
+ ranges = <0x81000000 0 0 0x0fe00000 0 0x00100000 /* downstream I/O */
|
|
+ 0x82000000 0 0x00000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */
|
|
+
|
|
+ interrupts = <GIC_SPI 35 IRQ_TYPE_NONE>;
|
|
+ interrupt-names = "msi";
|
|
+ #interrupt-cells = <1>;
|
|
+ interrupt-map-mask = <0 0 0 0x7>;
|
|
+ interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
|
|
+ <0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
|
|
+ <0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
|
+ <0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
|
|
+
|
|
+ clocks = <&gcc PCIE_A_CLK>,
|
|
+ <&gcc PCIE_H_CLK>,
|
|
+ <&gcc PCIE_PHY_CLK>;
|
|
+ clock-names = "core", "iface", "phy";
|
|
+
|
|
+ resets = <&gcc PCIE_ACLK_RESET>,
|
|
+ <&gcc PCIE_HCLK_RESET>,
|
|
+ <&gcc PCIE_POR_RESET>,
|
|
+ <&gcc PCIE_PCI_RESET>,
|
|
+ <&gcc PCIE_PHY_RESET>;
|
|
+ reset-names = "axi", "ahb", "por", "pci", "phy";
|
|
+
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ pcie1: pci@1b700000 {
|
|
+ compatible = "qcom,pcie-v0";
|
|
+ reg = <0x1b700000 0x1000
|
|
+ 0x1b702000 0x80
|
|
+ 0x1b800000 0x100
|
|
+ 0x31f00000 0x100000>;
|
|
+ reg-names = "dbi", "elbi", "parf", "config";
|
|
+ device_type = "pci";
|
|
+ linux,pci-domain = <1>;
|
|
+ bus-range = <0x00 0xff>;
|
|
+ num-lanes = <1>;
|
|
+ #address-cells = <3>;
|
|
+ #size-cells = <2>;
|
|
+
|
|
+ ranges = <0x81000000 0 0 0x31e00000 0 0x00100000 /* downstream I/O */
|
|
+ 0x82000000 0 0x00000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */
|
|
+
|
|
+ interrupts = <GIC_SPI 57 IRQ_TYPE_NONE>;
|
|
+ interrupt-names = "msi";
|
|
+ #interrupt-cells = <1>;
|
|
+ interrupt-map-mask = <0 0 0 0x7>;
|
|
+ interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
|
|
+ <0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
|
|
+ <0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
|
+ <0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
|
|
+
|
|
+ clocks = <&gcc PCIE_1_A_CLK>,
|
|
+ <&gcc PCIE_1_H_CLK>,
|
|
+ <&gcc PCIE_1_PHY_CLK>;
|
|
+ clock-names = "core", "iface", "phy";
|
|
+
|
|
+ resets = <&gcc PCIE_1_ACLK_RESET>,
|
|
+ <&gcc PCIE_1_HCLK_RESET>,
|
|
+ <&gcc PCIE_1_POR_RESET>,
|
|
+ <&gcc PCIE_1_PCI_RESET>,
|
|
+ <&gcc PCIE_1_PHY_RESET>;
|
|
+ reset-names = "axi", "ahb", "por", "pci", "phy";
|
|
+
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ pcie2: pci@1b900000 {
|
|
+ compatible = "qcom,pcie-v0";
|
|
+ reg = <0x1b900000 0x1000
|
|
+ 0x1b902000 0x80
|
|
+ 0x1ba00000 0x100
|
|
+ 0x35f00000 0x100000>;
|
|
+ reg-names = "dbi", "elbi", "parf", "config";
|
|
+ device_type = "pci";
|
|
+ linux,pci-domain = <2>;
|
|
+ bus-range = <0x00 0xff>;
|
|
+ num-lanes = <1>;
|
|
+ #address-cells = <3>;
|
|
+ #size-cells = <2>;
|
|
+
|
|
+ ranges = <0x81000000 0 0 0x35e00000 0 0x00100000 /* downstream I/O */
|
|
+ 0x82000000 0 0x00000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */
|
|
+
|
|
+ interrupts = <GIC_SPI 71 IRQ_TYPE_NONE>;
|
|
+ interrupt-names = "msi";
|
|
+ #interrupt-cells = <1>;
|
|
+ interrupt-map-mask = <0 0 0 0x7>;
|
|
+ interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
|
|
+ <0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
|
|
+ <0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
|
+ <0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
|
|
+
|
|
+ clocks = <&gcc PCIE_2_A_CLK>,
|
|
+ <&gcc PCIE_2_H_CLK>,
|
|
+ <&gcc PCIE_2_PHY_CLK>;
|
|
+ clock-names = "core", "iface", "phy";
|
|
+
|
|
+ resets = <&gcc PCIE_2_ACLK_RESET>,
|
|
+ <&gcc PCIE_2_HCLK_RESET>,
|
|
+ <&gcc PCIE_2_POR_RESET>,
|
|
+ <&gcc PCIE_2_PCI_RESET>,
|
|
+ <&gcc PCIE_2_PHY_RESET>;
|
|
+ reset-names = "axi", "ahb", "por", "pci", "phy";
|
|
+
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
};
|