From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 5/6] arm64: tegra: Enable XUSB on P2771 Date: Fri, 25 Jan 2019 12:30:12 +0100 Message-ID: <20190125113013.11447-5-thierry.reding@gmail.com> References: <20190125113013.11447-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190125113013.11447-1-thierry.reding@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Greg Kroah-Hartman Cc: Mathias Nyman , Jon Hunter , JC Kuo , linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-tegra@vger.kernel.org From: Thierry Reding Enable the relevant pads for XUSB support on P2771-0000 and hook up the USB supply voltage regulators to the ports. Signed-off-by: Thierry Reding --- .../boot/dts/nvidia/tegra186-p2771-0000.dts | 115 ++++++++++++++++++ .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 19 ++- 2 files changed, 130 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts index 65487eee2ce6..ab9e4e42b4dc 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts @@ -55,6 +55,93 @@ status = "okay"; }; + padctl@3520000 { + status = "okay"; + + avdd-pll-erefeut-supply = <&vdd_1v8_pll>; + avdd-usb-supply = <&vdd_3v3_sys>; + dvdd-pex-supply = <&vdd_pex>; + dvdd-pex-pll-supply = <&vdd_pex>; + hvdd-pex-supply = <&vdd_1v8>; + hvdd-pex-pll-supply = <&vdd_1v8>; + vclamp-usb-supply = <&vdd_1v8>; + vddio-hsic-supply = <&gnd>; + + pads { + usb2 { + status = "okay"; + + lanes { + usb2-0 { + nvidia,function = "xusb"; + status = "okay"; + }; + + usb2-1 { + nvidia,function = "xusb"; + status = "okay"; + }; + + usb2-2 { + nvidia,function = "xusb"; + status = "okay"; + }; + }; + }; + + usb3 { + status = "okay"; + + lanes { + usb3-0 { + nvidia,function = "xusb"; + status = "okay"; + }; + + usb3-1 { + nvidia,function = "xusb"; + status = "okay"; + }; + + usb3-2 { + nvidia,function = "xusb"; + status = "okay"; + }; + }; + }; + }; + + ports { + usb2-0 { + status = "okay"; + mode = "otg"; + + vbus-supply = <&vdd_usb0>; + }; + + usb2-1 { + status = "okay"; + mode = "host"; + + vbus-supply = <&vdd_usb1>; + }; + + usb3-0 { + nvidia,usb2-companion = <1>; + status = "okay"; + }; + }; + }; + + usb@3530000 { + status = "okay"; + + phys = <&{/padctl@3520000/pads/usb2/lanes/usb2-0}>, + <&{/padctl@3520000/pads/usb2/lanes/usb2-1}>, + <&{/padctl@3520000/pads/usb3/lanes/usb3-0}>; + phy-names = "usb2-0", "usb2-1", "usb3-0"; + }; + pcie@10003000 { status = "okay"; @@ -177,5 +264,33 @@ vin-supply = <&vdd_5v0_sys>; }; + + vdd_usb0: regulator@102 { + compatible = "regulator-fixed"; + reg = <102>; + + regulator-name = "VDD_USB0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio TEGRA_MAIN_GPIO(L, 4) GPIO_ACTIVE_HIGH>; + enable-active-high; + + vin-supply = <&vdd_5v0_sys>; + }; + + vdd_usb1: regulator@103 { + compatible = "regulator-fixed"; + reg = <103>; + + regulator-name = "VDD_USB1"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio TEGRA_MAIN_GPIO(L, 5) GPIO_ACTIVE_HIGH>; + enable-active-high; + + vin-supply = <&vdd_5v0_sys>; + }; }; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi index b539561e7877..eb64d9be3231 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi @@ -289,7 +289,7 @@ regulator-boot-on; }; - ldo0 { + vdd_1v8_pll: ldo0 { regulator-name = "VDD_1V8_AP_PLL"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -358,10 +358,21 @@ #address-cells = <1>; #size-cells = <0>; - vdd_5v0_sys: regulator@0 { + gnd: regulator@0 { compatible = "regulator-fixed"; reg = <0>; + regulator-name = "GND"; + regulator-min-microvolt = <0>; + regulator-max-microvolt = <0>; + regulator-always-on; + regulator-boot-on; + }; + + vdd_5v0_sys: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "VDD_5V0_SYS"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -369,9 +380,9 @@ regulator-boot-on; }; - vdd_1v8_ap: regulator@1 { + vdd_1v8_ap: regulator@2 { compatible = "regulator-fixed"; - reg = <1>; + reg = <2>; regulator-name = "VDD_1V8_AP"; regulator-min-microvolt = <1800000>; -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [5/6] arm64: tegra: Enable XUSB on P2771 From: Thierry Reding Message-Id: <20190125113013.11447-5-thierry.reding@gmail.com> Date: Fri, 25 Jan 2019 12:30:12 +0100 To: Greg Kroah-Hartman Cc: Mathias Nyman , Jon Hunter , JC Kuo , linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkVuYWJsZSB0aGUgcmVs ZXZhbnQgcGFkcyBmb3IgWFVTQiBzdXBwb3J0IG9uIFAyNzcxLTAwMDAgYW5kIGhvb2sgdXAgdGhl ClVTQiBzdXBwbHkgdm9sdGFnZSByZWd1bGF0b3JzIHRvIHRoZSBwb3J0cy4KClNpZ25lZC1vZmYt Ynk6IFRoaWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogLi4uL2Jvb3QvZHRz L252aWRpYS90ZWdyYTE4Ni1wMjc3MS0wMDAwLmR0cyAgIHwgMTE1ICsrKysrKysrKysrKysrKysr KwogLi4uL2FybTY0L2Jvb3QvZHRzL252aWRpYS90ZWdyYTE4Ni1wMzMxMC5kdHNpIHwgIDE5ICsr LQogMiBmaWxlcyBjaGFuZ2VkLCAxMzAgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL252aWRpYS90ZWdyYTE4Ni1wMjc3MS0wMDAw LmR0cyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvbnZpZGlhL3RlZ3JhMTg2LXAyNzcxLTAwMDAuZHRz CmluZGV4IDY1NDg3ZWVlMmNlNi4uYWI5ZTRlNDJiNGRjIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0 L2Jvb3QvZHRzL252aWRpYS90ZWdyYTE4Ni1wMjc3MS0wMDAwLmR0cworKysgYi9hcmNoL2FybTY0 L2Jvb3QvZHRzL252aWRpYS90ZWdyYTE4Ni1wMjc3MS0wMDAwLmR0cwpAQCAtNTUsNiArNTUsOTMg QEAKIAkJc3RhdHVzID0gIm9rYXkiOwogCX07CiAKKwlwYWRjdGxAMzUyMDAwMCB7CisJCXN0YXR1 cyA9ICJva2F5IjsKKworCQlhdmRkLXBsbC1lcmVmZXV0LXN1cHBseSA9IDwmdmRkXzF2OF9wbGw+ OworCQlhdmRkLXVzYi1zdXBwbHkgPSA8JnZkZF8zdjNfc3lzPjsKKwkJZHZkZC1wZXgtc3VwcGx5 ID0gPCZ2ZGRfcGV4PjsKKwkJZHZkZC1wZXgtcGxsLXN1cHBseSA9IDwmdmRkX3BleD47CisJCWh2 ZGQtcGV4LXN1cHBseSA9IDwmdmRkXzF2OD47CisJCWh2ZGQtcGV4LXBsbC1zdXBwbHkgPSA8JnZk ZF8xdjg+OworCQl2Y2xhbXAtdXNiLXN1cHBseSA9IDwmdmRkXzF2OD47CisJCXZkZGlvLWhzaWMt c3VwcGx5ID0gPCZnbmQ+OworCisJCXBhZHMgeworCQkJdXNiMiB7CisJCQkJc3RhdHVzID0gIm9r YXkiOworCisJCQkJbGFuZXMgeworCQkJCQl1c2IyLTAgeworCQkJCQkJbnZpZGlhLGZ1bmN0aW9u ID0gInh1c2IiOworCQkJCQkJc3RhdHVzID0gIm9rYXkiOworCQkJCQl9OworCisJCQkJCXVzYjIt MSB7CisJCQkJCQludmlkaWEsZnVuY3Rpb24gPSAieHVzYiI7CisJCQkJCQlzdGF0dXMgPSAib2th eSI7CisJCQkJCX07CisKKwkJCQkJdXNiMi0yIHsKKwkJCQkJCW52aWRpYSxmdW5jdGlvbiA9ICJ4 dXNiIjsKKwkJCQkJCXN0YXR1cyA9ICJva2F5IjsKKwkJCQkJfTsKKwkJCQl9OworCQkJfTsKKwor CQkJdXNiMyB7CisJCQkJc3RhdHVzID0gIm9rYXkiOworCisJCQkJbGFuZXMgeworCQkJCQl1c2Iz LTAgeworCQkJCQkJbnZpZGlhLGZ1bmN0aW9uID0gInh1c2IiOworCQkJCQkJc3RhdHVzID0gIm9r YXkiOworCQkJCQl9OworCisJCQkJCXVzYjMtMSB7CisJCQkJCQludmlkaWEsZnVuY3Rpb24gPSAi eHVzYiI7CisJCQkJCQlzdGF0dXMgPSAib2theSI7CisJCQkJCX07CisKKwkJCQkJdXNiMy0yIHsK KwkJCQkJCW52aWRpYSxmdW5jdGlvbiA9ICJ4dXNiIjsKKwkJCQkJCXN0YXR1cyA9ICJva2F5IjsK KwkJCQkJfTsKKwkJCQl9OworCQkJfTsKKwkJfTsKKworCQlwb3J0cyB7CisJCQl1c2IyLTAgewor CQkJCXN0YXR1cyA9ICJva2F5IjsKKwkJCQltb2RlID0gIm90ZyI7CisKKwkJCQl2YnVzLXN1cHBs eSA9IDwmdmRkX3VzYjA+OworCQkJfTsKKworCQkJdXNiMi0xIHsKKwkJCQlzdGF0dXMgPSAib2th eSI7CisJCQkJbW9kZSA9ICJob3N0IjsKKworCQkJCXZidXMtc3VwcGx5ID0gPCZ2ZGRfdXNiMT47 CisJCQl9OworCisJCQl1c2IzLTAgeworCQkJCW52aWRpYSx1c2IyLWNvbXBhbmlvbiA9IDwxPjsK KwkJCQlzdGF0dXMgPSAib2theSI7CisJCQl9OworCQl9OworCX07CisKKwl1c2JAMzUzMDAwMCB7 CisJCXN0YXR1cyA9ICJva2F5IjsKKworCQlwaHlzID0gPCZ7L3BhZGN0bEAzNTIwMDAwL3BhZHMv dXNiMi9sYW5lcy91c2IyLTB9PiwKKwkJICAgICAgIDwmey9wYWRjdGxAMzUyMDAwMC9wYWRzL3Vz YjIvbGFuZXMvdXNiMi0xfT4sCisJCSAgICAgICA8JnsvcGFkY3RsQDM1MjAwMDAvcGFkcy91c2Iz L2xhbmVzL3VzYjMtMH0+OworCQlwaHktbmFtZXMgPSAidXNiMi0wIiwgInVzYjItMSIsICJ1c2Iz LTAiOworCX07CisKIAlwY2llQDEwMDAzMDAwIHsKIAkJc3RhdHVzID0gIm9rYXkiOwogCkBAIC0x NzcsNSArMjY0LDMzIEBACiAKIAkJCXZpbi1zdXBwbHkgPSA8JnZkZF81djBfc3lzPjsKIAkJfTsK KworCQl2ZGRfdXNiMDogcmVndWxhdG9yQDEwMiB7CisJCQljb21wYXRpYmxlID0gInJlZ3VsYXRv ci1maXhlZCI7CisJCQlyZWcgPSA8MTAyPjsKKworCQkJcmVndWxhdG9yLW5hbWUgPSAiVkREX1VT QjAiOworCQkJcmVndWxhdG9yLW1pbi1taWNyb3ZvbHQgPSA8NTAwMDAwMD47CisJCQlyZWd1bGF0 b3ItbWF4LW1pY3Jvdm9sdCA9IDw1MDAwMDAwPjsKKworCQkJZ3BpbyA9IDwmZ3BpbyBURUdSQV9N QUlOX0dQSU8oTCwgNCkgR1BJT19BQ1RJVkVfSElHSD47CisJCQllbmFibGUtYWN0aXZlLWhpZ2g7 CisKKwkJCXZpbi1zdXBwbHkgPSA8JnZkZF81djBfc3lzPjsKKwkJfTsKKworCQl2ZGRfdXNiMTog cmVndWxhdG9yQDEwMyB7CisJCQljb21wYXRpYmxlID0gInJlZ3VsYXRvci1maXhlZCI7CisJCQly ZWcgPSA8MTAzPjsKKworCQkJcmVndWxhdG9yLW5hbWUgPSAiVkREX1VTQjEiOworCQkJcmVndWxh dG9yLW1pbi1taWNyb3ZvbHQgPSA8NTAwMDAwMD47CisJCQlyZWd1bGF0b3ItbWF4LW1pY3Jvdm9s dCA9IDw1MDAwMDAwPjsKKworCQkJZ3BpbyA9IDwmZ3BpbyBURUdSQV9NQUlOX0dQSU8oTCwgNSkg R1BJT19BQ1RJVkVfSElHSD47CisJCQllbmFibGUtYWN0aXZlLWhpZ2g7CisKKwkJCXZpbi1zdXBw bHkgPSA8JnZkZF81djBfc3lzPjsKKwkJfTsKIAl9OwogfTsKZGlmZiAtLWdpdCBhL2FyY2gvYXJt NjQvYm9vdC9kdHMvbnZpZGlhL3RlZ3JhMTg2LXAzMzEwLmR0c2kgYi9hcmNoL2FybTY0L2Jvb3Qv ZHRzL252aWRpYS90ZWdyYTE4Ni1wMzMxMC5kdHNpCmluZGV4IGI1Mzk1NjFlNzg3Ny4uZWI2NGQ5 YmUzMjMxIDEwMDY0NAotLS0gYS9hcmNoL2FybTY0L2Jvb3QvZHRzL252aWRpYS90ZWdyYTE4Ni1w MzMxMC5kdHNpCisrKyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvbnZpZGlhL3RlZ3JhMTg2LXAzMzEw LmR0c2kKQEAgLTI4OSw3ICsyODksNyBAQAogCQkJCQkJcmVndWxhdG9yLWJvb3Qtb247CiAJCQkJ CX07CiAKLQkJCQkJbGRvMCB7CisJCQkJCXZkZF8xdjhfcGxsOiBsZG8wIHsKIAkJCQkJCXJlZ3Vs YXRvci1uYW1lID0gIlZERF8xVjhfQVBfUExMIjsKIAkJCQkJCXJlZ3VsYXRvci1taW4tbWljcm92 b2x0ID0gPDE4MDAwMDA+OwogCQkJCQkJcmVndWxhdG9yLW1heC1taWNyb3ZvbHQgPSA8MTgwMDAw MD47CkBAIC0zNTgsMTAgKzM1OCwyMSBAQAogCQkjYWRkcmVzcy1jZWxscyA9IDwxPjsKIAkJI3Np emUtY2VsbHMgPSA8MD47CiAKLQkJdmRkXzV2MF9zeXM6IHJlZ3VsYXRvckAwIHsKKwkJZ25kOiBy ZWd1bGF0b3JAMCB7CiAJCQljb21wYXRpYmxlID0gInJlZ3VsYXRvci1maXhlZCI7CiAJCQlyZWcg PSA8MD47CiAKKwkJCXJlZ3VsYXRvci1uYW1lID0gIkdORCI7CisJCQlyZWd1bGF0b3ItbWluLW1p Y3Jvdm9sdCA9IDwwPjsKKwkJCXJlZ3VsYXRvci1tYXgtbWljcm92b2x0ID0gPDA+OworCQkJcmVn dWxhdG9yLWFsd2F5cy1vbjsKKwkJCXJlZ3VsYXRvci1ib290LW9uOworCQl9OworCisJCXZkZF81 djBfc3lzOiByZWd1bGF0b3JAMSB7CisJCQljb21wYXRpYmxlID0gInJlZ3VsYXRvci1maXhlZCI7 CisJCQlyZWcgPSA8MT47CisKIAkJCXJlZ3VsYXRvci1uYW1lID0gIlZERF81VjBfU1lTIjsKIAkJ CXJlZ3VsYXRvci1taW4tbWljcm92b2x0ID0gPDUwMDAwMDA+OwogCQkJcmVndWxhdG9yLW1heC1t aWNyb3ZvbHQgPSA8NTAwMDAwMD47CkBAIC0zNjksOSArMzgwLDkgQEAKIAkJCXJlZ3VsYXRvci1i b290LW9uOwogCQl9OwogCi0JCXZkZF8xdjhfYXA6IHJlZ3VsYXRvckAxIHsKKwkJdmRkXzF2OF9h cDogcmVndWxhdG9yQDIgewogCQkJY29tcGF0aWJsZSA9ICJyZWd1bGF0b3ItZml4ZWQiOwotCQkJ cmVnID0gPDE+OworCQkJcmVnID0gPDI+OwogCiAJCQlyZWd1bGF0b3ItbmFtZSA9ICJWRERfMVY4 X0FQIjsKIAkJCXJlZ3VsYXRvci1taW4tbWljcm92b2x0ID0gPDE4MDAwMDA+Owo=