From: Thierry Reding <thierry.reding@gmail.com>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Jason Cooper <jason@lakedaemon.net>,
linux-tegra@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH v6 04/14] ARM: tegra: harmony: Initialize PCIe from DT
Date: Fri, 9 Aug 2013 16:49:22 +0200 [thread overview]
Message-ID: <1376059772-16669-5-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1376059772-16669-1-git-send-email-treding@nvidia.com>
From: Thierry Reding <thierry.reding@avionic-design.de>
With the device tree support in place, probe the PCIe controller from
the device tree and remove the corresponding workaround in the board
file.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
arch/arm/boot/dts/tegra20-harmony.dts | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index d9f89cd..8724dc7 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -335,7 +335,7 @@
regulator-always-on;
};
- ldo0 {
+ pci_clk_reg: ldo0 {
regulator-name = "vdd_ldo0,vddio_pex_clk";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -425,6 +425,20 @@
nvidia,sys-clock-req-active-high;
};
+ pcie-controller {
+ pex-clk-supply = <&pci_clk_reg>;
+ vdd-supply = <&pci_vdd_reg>;
+ status = "okay";
+
+ pci@1,0 {
+ status = "okay";
+ };
+
+ pci@2,0 {
+ status = "okay";
+ };
+ };
+
usb@c5000000 {
status = "okay";
};
@@ -643,7 +657,7 @@
enable-active-high;
};
- regulator@3 {
+ pci_vdd_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_1v05";
@@ -651,8 +665,6 @@
regulator-max-microvolt = <1050000>;
gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
enable-active-high;
- /* Hack until board-harmony-pcie.c is removed */
- status = "disabled";
};
regulator@4 {
--
1.8.3.4
next prev parent reply other threads:[~2013-08-09 14:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-09 14:49 [PATCH v6 00/14] Rewrite Tegra PCIe driver Thierry Reding
2013-08-09 14:49 ` [PATCH v6 01/14] PCI: tegra: Move PCIe driver to drivers/pci/host Thierry Reding
2013-08-09 14:49 ` [PATCH v6 02/14] ARM: tegra: tamonten: Add PCIe support Thierry Reding
2013-08-09 14:49 ` [PATCH v6 03/14] ARM: tegra: tec: " Thierry Reding
2013-08-09 14:49 ` Thierry Reding [this message]
2013-08-09 14:49 ` [PATCH v6 05/14] ARM: tegra: trimslice: Initialize PCIe from DT Thierry Reding
2013-08-09 14:49 ` [PATCH v6 06/14] PCI: tegra: Add Tegra 30 PCIe support Thierry Reding
2013-08-09 14:49 ` [PATCH v6 07/14] PCI: tegra: set up PADS_REFCLK_CFG1 Thierry Reding
2013-08-09 14:49 ` [PATCH v6 08/14] ARM: tegra: Add Tegra30 PCIe support Thierry Reding
2013-08-09 14:49 ` [PATCH v6 09/14] ARM: tegra: Enable PCIe controller on Cardhu Thierry Reding
2013-08-09 14:49 ` [PATCH v6 10/14] ARM: tegra: Enable PCIe controller on Beaver Thierry Reding
2013-08-09 14:49 ` [PATCH v6 11/14] ARM: tegra: Fix Beaver's PCIe lane configuration Thierry Reding
2013-08-09 14:49 ` [PATCH v6 12/14] ARM: tegra: Update default configuration (PCIe) Thierry Reding
2013-08-09 14:49 ` [PATCH v6 13/14] ARM: dts: tegra: Increase prefetchable PCI memory space Thierry Reding
2013-08-09 14:49 ` [PATCH v6 14/14] MAINTAINERS: Add myself as Tegra PCIe maintainer Thierry Reding
2013-08-09 14:56 ` Bjorn Helgaas
2013-08-09 15:08 ` [PATCH v6 00/14] Rewrite Tegra PCIe driver Jason Cooper
2013-08-12 16:16 ` Thierry Reding
2013-08-12 16:22 ` Jason Cooper
2013-08-12 21:19 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376059772-16669-5-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=bhelgaas@google.com \
--cc=jason@lakedaemon.net \
--cc=linux-pci@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).