Merge tag 'tegra-for-3.17-pcie-regulators' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Merge "ARM: tegra: rework PCIe regulators" from Thierry Reding:

This branch reworks the set of regulators that the Tegra PCIe driver
uses, so that the driver and DT bindings more correctly model what's
really going on in HW. For backwards-compatibility the driver will
fallback to using the old set of regulators if the new ones can't be
found.

I've made this a separate branch in case it needs to be pulled into the
PCIe tree to resolve any conflicts.

* tag 'tegra-for-3.17-pcie-regulators' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Remove legacy PCIe power supply properties
  PCI: tegra: Remove deprecated power supply properties
  PCI: tegra: Implement accurate power supply scheme
  ARM: tegra: Add new PCIe regulator properties
  PCI: tegra: Overhaul regulator usage

Signed-off-by: Olof Johansson <olof@lixom.net>

5 files changed, 34 insertions, 12 deletions

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index f45aad688d9b..a37279af687c 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -562,10 +562,14 @@
         };
 
         pcie-controller@80003000 {
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
                 status = "okay";
 
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
+
                 pci@1,0 {
                         status = "okay";
                 };
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index a1b0d965757f..a4914bba1a39 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -473,8 +473,11 @@
         };
 
         pcie-controller@80003000 {
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
         };
 
         usb@c5008000 {
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 216fa6d50c65..5ad87979ab13 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -318,8 +318,12 @@
 
         pcie-controller@80003000 {
                 status = "okay";
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
+
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
 
                 pci@1,0 {
                         status = "okay";
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 3189791a9289..cee8f2246fdb 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -17,9 +17,15 @@
 
         pcie-controller@00003000 {
                 status = "okay";
-                pex-clk-supply = <&sys_3v3_pexs_reg>;
-                vdd-supply = <&ldo1_reg>;
-                avdd-supply = <&ldo2_reg>;
+
+                avdd-pexa-supply = <&ldo1_reg>;
+                vdd-pexa-supply = <&ldo1_reg>;
+                avdd-pexb-supply = <&ldo1_reg>;
+                vdd-pexb-supply = <&ldo1_reg>;
+                avdd-pex-pll-supply = <&ldo1_reg>;
+                avdd-plle-supply = <&ldo1_reg>;
+                vddio-pex-ctl-supply = <&sys_3v3_reg>;
+                hvdd-pex-supply = <&sys_3v3_pexs_reg>;
 
                 pci@1,0 {
                         status = "okay";
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 0cf0848a82d8..206379546244 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -38,9 +38,14 @@
 
         pcie-controller@00003000 {
                 status = "okay";
-                pex-clk-supply = <&pex_hvdd_3v3_reg>;
-                vdd-supply = <&ldo1_reg>;
-                avdd-supply = <&ldo2_reg>;
+
+                /* AVDD_PEXA and VDD_PEXA inputs are grounded on Cardhu. */
+                avdd-pexb-supply = <&ldo1_reg>;
+                vdd-pexb-supply = <&ldo1_reg>;
+                avdd-pex-pll-supply = <&ldo1_reg>;
+                hvdd-pex-supply = <&pex_hvdd_3v3_reg>;
+                vddio-pex-ctl-supply = <&sys_3v3_reg>;
+                avdd-plle-supply = <&ldo2_reg>;
 
                 pci@1,0 {
                         nvidia,num-lanes = <4>;