Commit c661d66c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.7-arm64-dt' of... 

Merge tag 'tegra-for-5.7-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

arm64: tegra: Device tree changes for v5.7-rc1

These changes add support for the XUSB pad controller, as well as the
XUSB controller on Tegra194. Furthermore, USB device mode is supported
across Tegra210 and Tegra186 boards. PCIe endpoint mode support is added
for the Jetson AGX Xavier platform.

Various minor fixes eliminate warnings on boot related to missing power
supplies for some devices.

* tag 'tegra-for-5.7-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Add support for PCIe endpoint mode in P2972-0000 platform
  arm64: tegra: Add PCIe endpoint controllers nodes for Tegra194
  arm64: tegra: Add ethernet alias on Jetson TX1
  arm64: tegra: Populate LP8557 backlight regulator
  arm64: tegra: Fix Tegra186 SOR supply
  arm64: tegra: Add EEPROM supplies
  arm64: tegra: Enable I2C controller for EEPROM
  arm64: tegra: smaug: Change clk_out_2 provider to PMC
  arm64: tegra: Add clock-cells property to Tegra PMC node
  arm64: tegra: Enable XUDC node on Jetson Nano
  arm64: tegra: Update OTG port entries for Jetson Nano
  arm64: tegra: Enable XUDC node on Jetson TX2
  arm64: tegra: Add XUDC node for Tegra186
  arm64: tegra: Enable XUDC on Jetson TX1
  arm64: tegra: Add XUDC node for Tegra210
  arm64: tegra: Update OTG port entries for Jetson TX2
  arm64: tegra: Update OTG port entries for Jetson TX1
  arm64: tegra: Enable XUSB host in P2972-0000 board
  arm64: tegra: Add XUSB and pad controller on Tegra194
  arm64: tegra: Fix Tegra194 PCIe compatible string

Link: https://lore.kernel.org/r/20200313165848.2915133-8-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eccbb5e7 84eaaf75

Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ Tegra194: 
--------



	pcie@14180000 {

		compatible = "nvidia,tegra194-pcie", "snps,dw-pcie";

		compatible = "nvidia,tegra194-pcie";

		power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8B>;

		reg = <0x00 0x14180000 0x0 0x00020000   /* appl registers (128K)      */

		       0x00 0x38000000 0x0 0x00040000   /* configuration space (256K) */

arch/arm64/boot/dts/nvidia/tegra132.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/thermal/tegra124-soctherm.h>

#include <dt-bindings/soc/tegra-pmc.h>



/ {

	compatible = "nvidia,tegra132", "nvidia,tegra124";
@@ -577,11 +578,12 @@ 
		clock-names = "rtc";

	};



	pmc@7000e400 {

	tegra_pmc: pmc@7000e400 {

		compatible = "nvidia,tegra124-pmc";

		reg = <0x0 0x7000e400 0x0 0x400>;

		clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;

		clock-names = "pclk", "clk32k_in";

		#clock-cells = <1>;

	};



	fuse@7000f800 {

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+23 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
				status = "okay";



				lanes {

					usb2-0 {

					micro_b: usb2-0 {

						nvidia,function = "xusb";

						status = "okay";

					};
@@ -174,8 +174,20 @@ 
			usb2-0 {

				status = "okay";

				mode = "otg";



				vbus-supply = <&vdd_usb0>;



				usb-role-switch;

				connector {

					compatible = "usb-b-connector",

						     "gpio-usb-b-connector";

					label = "micro-USB";

					type = "micro";

					vbus-gpio = <&gpio

						     TEGRA186_MAIN_GPIO(X, 7)

						     GPIO_ACTIVE_LOW>;

					id-gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;

				};



			};



			usb2-1 {
@@ -201,12 +213,20 @@ 
		phy-names = "usb2-0", "usb2-1", "usb3-0";

	};



	usb@3550000 {

		status = "okay";



		phys = <&micro_b>;

		phy-names = "usb2-0";

	};



	i2c@c250000 {

		/* carrier board ID EEPROM */

		eeprom@57 {

			compatible = "atmel,24c02";

			reg = <0x57>;



			vcc-supply = <&vdd_1v8>;

			address-bits = <8>;

			page-size = <8>;

			size = <256>;
@@ -258,7 +278,7 @@ 
			status = "okay";



			avdd-io-hdmi-dp-supply = <&vdd_hdmi_1v05>;

			vdd-hdmi-dp-pll = <&vdd_1v8_ap>;

			vdd-hdmi-dp-pll-supply = <&vdd_1v8_ap>;



			nvidia,dpaux = <&dpaux>;

		};

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
			compatible = "atmel,24c02";

			reg = <0x50>;



			vcc-supply = <&vdd_1v8>;

			address-bits = <8>;

			page-size = <8>;

			size = <256>;

arch/arm64/boot/dts/nvidia/tegra186.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -572,6 +572,25 @@ 
		nvidia,xusb-padctl = <&padctl>;

	};



	usb@3550000 {

		compatible = "nvidia,tegra186-xudc";

		reg = <0x0 0x03550000 0x0 0x8000>,

		      <0x0 0x03558000 0x0 0x1000>;

		reg-names = "base", "fpci";

		interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&bpmp TEGRA186_CLK_XUSB_CORE_DEV>,

			 <&bpmp TEGRA186_CLK_XUSB_SS>,

			 <&bpmp TEGRA186_CLK_XUSB_CORE_SS>,

			 <&bpmp TEGRA186_CLK_XUSB_FS>;

		clock-names = "dev", "ss", "ss_src", "fs_src";

		iommus = <&smmu TEGRA186_SID_XUSB_DEV>;

		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_XUSBB>,

				<&bpmp TEGRA186_POWER_DOMAIN_XUSBA>;

		power-domain-names = "dev", "ss";

		nvidia,xusb-padctl = <&padctl>;

		status = "disabled";

	};



	fuse@3820000 {

		compatible = "nvidia,tegra186-efuse";

		reg = <0x0 0x03820000 0x0 0x10000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE