arm64: tegra210: add device node xusb_padctl

Rename the node from padctl to xusb_padctl and add properties:

nvidia,lane-map: assign lanes for PCIE driver
nvidia,enable-sata-port: specify if SATA driver will use lane or not

Add power rails necessary for UPHY.

Bug 200068549

Change-Id: Ib02b5551840c33ba853949477e5e3c8333d41e34
Signed-off-by: TW Chiu <twchiu@nvidia.com>
Reviewed-on: http://git-master/r/746213
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
Tested-by: Ashutosh Jha <ajha@nvidia.com>
Reviewed-on: http://git-master/r/810579
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra132-soc-base.dtsi b/arch/arm64/boot/dts/tegra132-soc-base.dtsi
index ec08388d5488839c876839ebd9206670ea1fe64c..ecd8babea830e969ed041d6c2879eb75cd6b62d4 100644 (file)
--- a/arch/arm64/boot/dts/tegra132-soc-base.dtsi
+++ b/arch/arm64/boot/dts/tegra132-soc-base.dtsi
@@ -788,7 +788,7 @@
                              0 49 0x04
                              0 97 0x04
                              0 21 0x04>;
-               status = "disable";
+               status = "disabled";
        };
 
        mipical {

diff --git a/arch/arm64/boot/dts/tegra132-soc-shield.dtsi b/arch/arm64/boot/dts/tegra132-soc-shield.dtsi
index b6199bb26a68a506b3612f2e2c6d490265bca83d..05b802364a68bab2889b0287753700c768c08aac 100644 (file)
--- a/arch/arm64/boot/dts/tegra132-soc-shield.dtsi
+++ b/arch/arm64/boot/dts/tegra132-soc-shield.dtsi
@@ -308,7 +308,7 @@
        };
 
        xusb@70090000 {
-               status = "disable";
+               status = "disabled";
        };
 
        mipical {

diff --git a/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts b/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
index e6ff601c06e5fbd3b5a4001b48361d7e8bcc4a15..d8b3dd8586fe57b7871d4ae2de6ce2204e295cc9 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
+++ b/arch/arm64/boot/dts/tegra210-ers-e2190-1100-a00-00.dts
@@ -307,6 +307,11 @@
                };
        };
 
+       xusb_padctl {
+               status = "okay";
+               nvidia,enable-sata-port;
+       };
+
         sata@70020000 {
                 status = "okay";
                 nvidia,pexp-gpio = <&pca9539_76 11 0>, <&pca9539_76 12 0>;

diff --git a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e00-00.dts b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e00-00.dts
index 07a8f650d1bd78728844ea639a34bdd94e992440..720956cec0daf78ddbc7c8134290a6f403fcfb82 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e00-00.dts
+++ b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e00-00.dts
@@ -32,6 +32,10 @@
                fastboot-instructions = "Tap on power button to navigate menu options.\nHold down power button for 2 sec and release for selecting an option.\nOem unlock may take upto 2 hours.\n";
        };
 
+       xusb_padctl {
+               nvidia,enable-sata-port;
+       };
+
        sata@70020000 {
                status = "okay";
                nvidia,sata-connector-type=<E_SATA_P>;

diff --git a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e01-00.dts b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e01-00.dts
index 3495f3efc4222dbc15410054e5925e340783ebe7..27a458b983ad1ba7a55be21b17f63ce78b4bbd0e 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e01-00.dts
+++ b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e01-00.dts
@@ -28,6 +28,10 @@
        nvidia,dtsfilename = __FILE__;
        nvidia,fastboot-usb-pid = <0xb422>;
 
+       xusb_padctl {
+               nvidia,enable-sata-port;
+       };
+
        sata@70020000 {
                status = "okay";
                nvidia,sata-connector-type=<E_SATA_P>;

diff --git a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e02-00.dts b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e02-00.dts
index c7bb26b7c7dbcf0905252e07d58a64fcb0018225..2693022b8b60e5d58e4df263a22bac6e3224b4c7 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e02-00.dts
+++ b/arch/arm64/boot/dts/tegra210-foster-e-hdd-p2530-0932-e02-00.dts
@@ -35,6 +35,10 @@
                fastboot-instructions = "Tap on power button to navigate menu options.\nHold down power button for 2 sec and release for selecting an option.\nOem unlock may take upto 2 hours.\n";
        };
 
+       xusb_padctl {
+               nvidia,enable-sata-port;
+       };
+
        sata@70020000 {
                status = "okay";
                nvidia,enable-sata-port;

diff --git a/arch/arm64/boot/dts/tegra210-foster-e-hdd-rpmb-p2530-0931-e02-00.dts b/arch/arm64/boot/dts/tegra210-foster-e-hdd-rpmb-p2530-0931-e02-00.dts
index e0d5020dd5b4bf9ccb866a9dfd4fe852ef655e2d..9f9396a1b58e5dabd0161fd18499a82139540349 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-foster-e-hdd-rpmb-p2530-0931-e02-00.dts
+++ b/arch/arm64/boot/dts/tegra210-foster-e-hdd-rpmb-p2530-0931-e02-00.dts
@@ -32,6 +32,10 @@
        nvidia,dtsfilename = __FILE__;
        nvidia,fastboot-usb-pid = <0xb422>;
 
+       xusb_padctl {
+               nvidia,enable-sata-port;
+       };
+
        sata@70020000 {
                status = "okay";
                nvidia,enable-sata-port;

diff --git a/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi b/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi
index 8a0916f154100bd5e0db064b491a18867f2331a9..d939534f2ba4140fb9e24eb386d7d9454746635a 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-foster-e-p2530-common.dtsi
@@ -136,7 +136,7 @@
        };
 
        /* Put common control config here */
-       xusb_pad_ctl: padctl@0 {
+       xusb_pad_ctl: xusb_padctl {
                nvidia,ss_portmap = <0x0321>;
                nvidia,lane_owner = <0xF056>; /* Use 0xF to disable lane assign */
                nvidia,otg_portmap = <0x0100>;

diff --git a/arch/arm64/boot/dts/tegra210-grenada.dts b/arch/arm64/boot/dts/tegra210-grenada.dts
index 9a11c5153f54c403c4e787d8b25a38b0394e8371..37b8dfef2292ca3bb54653bd731846899e34e2ee 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-grenada.dts
+++ b/arch/arm64/boot/dts/tegra210-grenada.dts
@@ -1177,10 +1177,10 @@
        };
 
        /* Put common control config here */
-       xusb_pad_ctl: padctl@0 {
+       xusb_pad_ctl: xusb_padctl {
                nvidia,ss_portmap = <0x3210>;
                nvidia,lane_owner = <0x8456>; /* Use 0xF to disable lane assign */
-               statuc = "okay";
+               status = "okay";
        };
 
        xusb@70090000 {

diff --git a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
index b269f7b98b453e486b9223870c4b92ecace35830..66fcd91ad7e76dac526b328df12de2afe1aca64c 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts
@@ -420,9 +420,11 @@
                status = "okay";
        };
 
-       xusb_pad_ctl: padctl@0 { /* Put common control config here */
+       xusb_pad_ctl: xusb_padctl { /* Put common control config here */
                nvidia,ss_portmap = <0x21>;
                nvidia,lane_owner = <0xff56>; /* Use 0xF to disable lane assign */
+               nvidia,lane-map = <0x14>;
+               nvidia,enable-sata-port;
                status = "okay";
        };
 

diff --git a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
index 9c3f49e659a2f365b84cde87619e7aa1e86549dc..e60432ba586815807a612264be03c7c160fbf1c1 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
@@ -437,9 +437,11 @@
                status = "okay";
        };
 
-       xusb_pad_ctl: padctl@0 { /* Put common control config here */
+       xusb_pad_ctl: xusb_padctl { /* Put common control config here */
                nvidia,ss_portmap = <0x21>;
                nvidia,lane_owner = <0xff56>; /* Use 0xF to disable lane assign */
+               nvidia,lane-map = <0x14>;
+               nvidia,enable-sata-port;
                status = "okay";
        };
 

diff --git a/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi b/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi
index 16458bd1e86e4431d416d5428a6695bfc87a803f..bf36ac6d71f3eef9902202004328a65312eb00fc 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-loki-e-p2530-common.dtsi
@@ -372,7 +372,7 @@
        };
 
        /* Put common control config here */
-       xusb_pad_ctl: padctl@0 {
+       xusb_pad_ctl: xusb_padctl {
                nvidia,ss_portmap = <0x7770>;
                nvidia,lane_owner = <0xFFFF>; /* Use 0xF to disable lane assign */
                status = "okay";

diff --git a/arch/arm64/boot/dts/tegra210-loki-vcm30t210.dts b/arch/arm64/boot/dts/tegra210-loki-vcm30t210.dts
index b7661cdedd6d12e1607d79d5d4dc682f81a14760..dbf495a6c4fc08075ad1284554adcae5c6258c4b 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-loki-vcm30t210.dts
+++ b/arch/arm64/boot/dts/tegra210-loki-vcm30t210.dts
@@ -625,8 +625,9 @@
        };
 
        /* Disable XUSB3 to make PCIe both ports work */
-       xusb_pad_ctl: padctl@0 {
+       xusb_pad_ctl: xusb_padctl {
                nvidia,lane_owner = <0xFF56>; /* Use 0xF to disable lane assign */
+               nvidia,lane-map = <0x14>;
        };
 
        tegra-aotag {

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
index 955e5b1af2c9d07389034fb5c69aae46e2cd838f..f5c0aec3075f79c129c9246eac5a316ac61dfe3e 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
@@ -278,6 +278,18 @@
                usb_vbus-supply = <&usb0_vbus>;
        };
 
+       xusb_padctl {
+               avdd_pll_uerefe-supply = <&max77620_ldo7>;
+               hvdd_pex_pll_e-supply = <&max77620_sd3>;
+               dvdd_pex_pll-supply = <&max77620_ldo1>;
+               hvddio_pex-supply = <&max77620_sd3>;
+               dvddio_pex-supply = <&max77620_ldo1>;
+               hvdd_sata-supply = <&max77620_sd3>;
+               dvdd_sata_pll-supply = <&max77620_ldo8>;
+               hvddio_sata-supply = <&max77620_sd3>;
+               dvddio_sata-supply = <&max77620_ldo8>;
+       };
+
         sata@70020000 {
                dvdd_sata_pll-supply = <&max77620_ldo8>;
                hvdd_sata-supply = <&max77620_sd3>;

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-foster-e-power-tree-p2530-0932-e00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-foster-e-power-tree-p2530-0932-e00.dtsi
index 8931cb600ad652142ea0f4ded09777d187a3c192..d248a48b6615345e6557e6f6d906457ce9c0cf03 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-foster-e-power-tree-p2530-0932-e00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-foster-e-power-tree-p2530-0932-e00.dtsi
@@ -274,6 +274,18 @@
                usb_vbus-supply = <&battery_reg>;
        };
 
+       xusb_padctl {
+               avdd_pll_uerefe-supply = <&max77620_ldo7>;
+               hvdd_pex_pll_e-supply = <&max77620_sd3>;
+               dvdd_pex_pll-supply = <&max77620_ldo1>;
+               hvddio_pex-supply = <&max77620_sd3>;
+               dvddio_pex-supply = <&max77620_ldo1>;
+               hvdd_sata-supply = <&max77620_sd3>;
+               dvdd_sata_pll-supply = <&max77620_ldo8>;
+               hvddio_sata-supply = <&max77620_sd3>;
+               dvddio_sata-supply = <&max77620_ldo8>;
+       };
+
        otg@7d000000 {
                usb_vbus-supply = <&battery_reg>;
        };

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
index f70defb9e01dd693f03b72983202c69580037d79..0e2ae2575dd2d9c7b6d3f508fcfada215a7fb9fa 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-jetson-common-power-tree-p2530-0930-e03.dtsi
@@ -274,6 +274,18 @@
                usb_vbus-supply = <&battery_reg>;
        };
 
+       xusb_padctl {
+               avdd_pll_uerefe-supply = <&max77620_ldo7>;
+               hvdd_pex_pll_e-supply = <&max77620_sd3>;
+               dvdd_pex_pll-supply = <&max77620_ldo1>;
+               hvddio_pex-supply = <&max77620_sd3>;
+               dvddio_pex-supply = <&max77620_ldo1>;
+               hvdd_sata-supply = <&max77620_sd3>;
+               dvdd_sata_pll-supply = <&max77620_ldo8>;
+               hvddio_sata-supply = <&max77620_sd3>;
+               dvddio_sata-supply = <&max77620_ldo8>;
+       };
+
        otg@7d000000 {
                usb_vbus-supply = <&battery_reg>;
        };

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-vcm31-power-tree-e2580-0631-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-vcm31-power-tree-e2580-0631-a00.dtsi
index f7d00f8a10fcd980130f45b4950908c6f1235c06..71d176f2f1d286b734fbd2bdc313cc498787d712 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-vcm31-power-tree-e2580-0631-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-vcm31-power-tree-e2580-0631-a00.dtsi
@@ -276,6 +276,18 @@
                usb_vbus-supply = <&battery_reg>;
        };
 
+       xusb_padctl {
+               avdd_pll_uerefe-supply = <&max77620_ldo7>;
+               hvdd_pex_pll_e-supply = <&max77620_sd3>;
+               dvdd_pex_pll-supply = <&max77620_ldo1>;
+               hvddio_pex-supply = <&max77620_sd3>;
+               dvddio_pex-supply = <&max77620_ldo1>;
+               hvdd_sata-supply = <&max77620_sd3>;
+               dvdd_sata_pll-supply = <&max77620_ldo8>;
+               hvddio_sata-supply = <&max77620_sd3>;
+               dvddio_sata-supply = <&max77620_ldo8>;
+       };
+
        otg@7d000000 {
                usb_vbus-supply = <&battery_reg>;
        };

diff --git a/arch/arm64/boot/dts/tegra210-soc-base.dtsi b/arch/arm64/boot/dts/tegra210-soc-base.dtsi
index 25600eeef3d7f346516c0c61db6ed27d6aa88d03..e359234a25c3226545830c0989fc0ae5f23e92d5 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-soc-base.dtsi
+++ b/arch/arm64/boot/dts/tegra210-soc-base.dtsi
@@ -427,6 +427,11 @@
                status = "disabled";
        };
 
+       xusb_padctl {
+               compatible = "nvidia,tegra210-padctl";
+               status = "disabled";
+       };
+
        xusb@70090000 {
                compatible = "nvidia,tegra210-xhci";
                power-domains = <&mc_clk_pd>;
@@ -1392,7 +1397,7 @@
                        <0x0 0x7009f000 0x0 0x1000>;
                interrupts = <0 44 0x4
                                0 49 0x4>;
-               status = "disable";
+               status = "disabled";
        };
 
        soctherm: soctherm@0x700E2000 {

diff --git a/arch/arm64/boot/dts/tegra210-soc-shield.dtsi b/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
index 0555881d664b1b112fde1944c8fadfb8187af270..a2abc9c39c5c0e04eb1eff2d38ca2c93a4ff14a2 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
+++ b/arch/arm64/boot/dts/tegra210-soc-shield.dtsi
@@ -475,11 +475,11 @@
        };
 
        xudc@700d0000 {
-               status = "disable";
+               status = "disabled";
        };
 
        xotg {
-               status = "disable";
+               status = "disabled";
        };
 
        soctherm@0x700E2000 {
@@ -526,7 +526,7 @@
        };
 
        mselect {
-               status = "disable";
+               status = "disabled";
        };
 
        bthrot_cdev {

diff --git a/arch/arm64/boot/dts/tegra210-vcm31-e2580-common.dtsi b/arch/arm64/boot/dts/tegra210-vcm31-e2580-common.dtsi
index 6f0e76377b21237e3d027b1ef7756ac315f63457..4081b5ae7fcce89f8e86fd8de4a0fdf03f0e9450 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-vcm31-e2580-common.dtsi
+++ b/arch/arm64/boot/dts/tegra210-vcm31-e2580-common.dtsi
@@ -655,10 +655,12 @@
                };
        };
 
-       xusb_pad_ctl: padctl@0 {
+       xusb_pad_ctl: xusb_padctl {
                nvidia,ss_portmap = <0x0277>;
                nvidia,lane_owner = <0x43FF>; /* Use 0xF to disable lane assign */
                nvidia,otg_portmap = <0x0100>;
+               nvidia,lane-map = <0x12>;
+               nvidia,enable-sata-port;
                status = "okay";
        };