summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/tegra20-trimslice.dts
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-21 03:30:54 +0400
committerKevin Hilman <khilman@linaro.org>2013-08-21 03:30:54 +0400
commit1fa5fcdafc14c2e684da146ac2ed95aa4a11a2aa (patch)
tree9be99f3650a7be083e21895110d14c5059a19ef8 /arch/arm/boot/dts/tegra20-trimslice.dts
parent4cb635d705a32f3592f420c92ba4ccd4b177b860 (diff)
parent8af3bbec752902c0480c84613d7f10e22f485977 (diff)
downloadlinux-1fa5fcdafc14c2e684da146ac2ed95aa4a11a2aa.tar.xz
Merge tag 'tegra-for-3.12-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt
From: Stephen Warren: ARM: tegra: device tree changes for 3.12 This branch contains all *.dts (device tree) changes for Tegra. New features enabled are: * PMICs on Dalmore * CPU power-gating on Dalmore * HDMI output on Beaver * LP1 system suspend mode on almost all boards * PCIe support on numerous Tegra20/30 boards * USB support on Tegra30/114 boards * Audio capture on Beaver and Dalmore * Temperature sensor on Cardhu. ... along with a few DT cleanups. * tag 'tegra-for-3.12-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (25 commits) ARM: tegra: add Mic Jack to Dalmore device tree ARM: tegra: add Mic Jack to Beaver device tree ARM: tegra: add USB DT entries for Tegra114, Dalmore ARM: tegra: add USB DT entries for Tegra30 ARM: dts: tegra: Increase prefetchable PCI memory space ARM: tegra: Fix Beaver's PCIe lane configuration ARM: tegra: Enable PCIe controller on Beaver ARM: tegra: Enable PCIe controller on Cardhu ARM: tegra: Add Tegra30 PCIe support ARM: tegra: trimslice: Initialize PCIe from DT ARM: tegra: harmony: Initialize PCIe from DT ARM: tegra: tec: Add PCIe support ARM: tegra: tamonten: Add PCIe support ARM: tegra: Add Tegra20 PCIe support to DT ARM: tegra: enable LP1 suspend mode ARM: tegra: beaver: Enable HDMI output ARM: tegra: use TEGRA_GPIO() in a couple more places ARM: tegra: dalmore: fix the irq trigger type of Palmas MFD device ARM: tegra: define valid function names in DT document ARM: tegra: dalmore: add PM configurations for PMC ...
Diffstat (limited to 'arch/arm/boot/dts/tegra20-trimslice.dts')
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts32
1 files changed, 30 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index ed4b901b0227..22e227f87e4c 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -302,7 +302,7 @@
};
pmc {
- nvidia,suspend-mode = <2>;
+ nvidia,suspend-mode = <1>;
nvidia,cpu-pwr-good-time = <5000>;
nvidia,cpu-pwr-off-time = <5000>;
nvidia,core-pwr-good-time = <3845 3845>;
@@ -310,6 +310,16 @@
nvidia,sys-clock-req-active-high;
};
+ pcie-controller {
+ status = "okay";
+ pex-clk-supply = <&pci_clk_reg>;
+ vdd-supply = <&pci_vdd_reg>;
+
+ pci@1,0 {
+ status = "okay";
+ };
+ };
+
usb@c5000000 {
status = "okay";
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
@@ -411,7 +421,25 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
- gpio = <&gpio 170 0>; /* PV2 */
+ gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
+ };
+
+ pci_clk_reg: regulator@3 {
+ compatible = "regulator-fixed";
+ reg = <3>;
+ regulator-name = "pci_clk";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ pci_vdd_reg: regulator@4 {
+ compatible = "regulator-fixed";
+ reg = <4>;
+ regulator-name = "pci_vdd";
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ regulator-always-on;
};
};