Commit 0683e598 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.7-xusb-no-defconfig' of... 

Merge tag 'tegra-for-4.7-xusb-no-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/late

Merge "ARM: tegra: Enable the XUSB controller" from Thierry Reding:

These changes add support for the XUSB controller on Tegra124. It is an
XHCI compatible controller that replaces the existing EHCI controllers.
Support is enabled on Venice2, Jetson TK1 and Nyan-based Chromebooks.

* tag 'tegra-for-4.7-xusb-no-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Enable XUSB on Nyan
  ARM: tegra: Enable XUSB on Jetson TK1
  ARM: tegra: Enable XUSB on Venice2
  ARM: tegra: Add Tegra124 XUSB controller
  ARM: tegra: Move Tegra124 to the new XUSB pad controller binding
parents 43419b09 1333ce4d

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+102 −14
Original line number Diff line number Diff line
@@ -30,11 +30,17 @@ 
		vddio-pex-ctl-supply = <&vdd_3v3_lp0>;

		avdd-pll-erefe-supply = <&avdd_1v05_run>;



		/* Mini PCIe */

		pci@1,0 {

			phys = <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-4}>;

			phy-names = "pcie-0";

			status = "okay";

		};



		/* Gigabit Ethernet */

		pci@2,0 {

			phys = <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-2}>;

			phy-names = "pcie-0";

			status = "okay";

		};

	};
@@ -1647,6 +1653,9 @@ 
	sata@0,70020000 {

		status = "okay";



		phys = <&{/padctl@0,7009f000/pads/sata/lanes/sata-0}>;

		phy-names = "sata-0";



		hvdd-supply = <&vdd_3v3_lp0>;

		vddio-supply = <&vdd_1v05_run>;

		avdd-supply = <&vdd_1v05_run>;
@@ -1659,28 +1668,107 @@ 
		status = "okay";

	};



	usb@0,70090000 {

		phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* Micro A/B */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Mini PCIe */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* USB3 */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>; /* USB3 */

		phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0";



		avddio-pex-supply = <&vdd_1v05_run>;

		dvddio-pex-supply = <&vdd_1v05_run>;

		avdd-usb-supply = <&vdd_3v3_lp0>;

		avdd-pll-utmip-supply = <&vddio_1v8>;

		avdd-pll-erefe-supply = <&avdd_1v05_run>;

		avdd-usb-ss-pll-supply = <&vdd_1v05_run>;

		hvdd-usb-ss-supply = <&vdd_3v3_lp0>;

		hvdd-usb-ss-pll-e-supply = <&vdd_3v3_lp0>;



		status = "okay";

	};



	padctl@0,7009f000 {

		pinctrl-0 = <&padctl_default>;

		pinctrl-names = "default";

		status = "okay";



		padctl_default: pinmux {

			usb3 {

				nvidia,lanes = "pcie-0", "pcie-1";

				nvidia,function = "usb3";

				nvidia,iddq = <0>;

		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";

					};

				};

			};



			pcie {

				nvidia,lanes = "pcie-2", "pcie-3",

					       "pcie-4";

				status = "okay";



				lanes {

					pcie-0 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};



					pcie-2 {

						nvidia,function = "pcie";

				nvidia,iddq = <0>;

						status = "okay";

					};



					pcie-4 {

						nvidia,function = "pcie";

						status = "okay";

					};

				};

			};



			sata {

				nvidia,lanes = "sata-0";

				status = "okay";



				lanes {

					sata-0 {

						nvidia,function = "sata";

				nvidia,iddq = <0>;

						status = "okay";

					};

				};

			};

		};



		ports {

			/* Micro A/B */

			usb2-0 {

				status = "okay";

				mode = "otg";

			};



			/* Mini PCIe */

			usb2-1 {

				status = "okay";

				mode = "host";

			};



			/* USB3 */

			usb2-2 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_usb3_vbus>;

			};



			usb3-0 {

				nvidia,usb2-companion = <2>;

				status = "okay";

			};

		};

	};

arch/arm/boot/dts/tegra124-nyan.dtsi

+94 −28
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
					regulator-always-on;

				};



				ldo0 {

				avdd_1v05_run: ldo0 {

					regulator-name = "+1.05V_RUN_AVDD";

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1050000>;
@@ -364,6 +364,99 @@ 
		status = "okay";

	};



	usb@0,70090000 {

		phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */

		phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0", "usb3-1";



		avddio-pex-supply = <&vdd_1v05_run>;

		dvddio-pex-supply = <&vdd_1v05_run>;

		avdd-usb-supply = <&vdd_3v3_lp0>;

		avdd-pll-utmip-supply = <&vddio_1v8>;

		avdd-pll-erefe-supply = <&avdd_1v05_run>;

		avdd-usb-ss-pll-supply = <&vdd_1v05_run>;

		hvdd-usb-ss-supply = <&vdd_3v3_lp0>;

		hvdd-usb-ss-pll-e-supply = <&vdd_3v3_lp0>;



		status = "okay";

	};



	padctl@0,7009f000 {

		status = "okay";



		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";

					};

				};

			};



			pcie {

				status = "okay";



				lanes {

					pcie-0 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};



					pcie-1 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};

				};

			};

		};



		ports {

			usb2-0 {

				vbus-supply = <&vdd_usb1_vbus>;

				status = "okay";

				mode = "otg";

			};



			usb2-1 {

				vbus-supply = <&vdd_run_cam>;

				status = "okay";

				mode = "host";

			};



			usb2-2 {

				vbus-supply = <&vdd_usb3_vbus>;

				status = "okay";

				mode = "host";

			};



			usb3-0 {

				nvidia,usb2-companion = <0>;

				status = "okay";

			};



			usb3-1 {

				nvidia,usb2-companion = <1>;

				status = "okay";

			};

		};

	};



	sdhci0_pwrseq: sdhci0_pwrseq {

		compatible = "mmc-pwrseq-simple";
@@ -410,33 +503,6 @@ 
		};

	};



	usb@0,7d000000 { /* Rear external USB port. */

		status = "okay";

	};



	usb-phy@0,7d000000 {

		status = "okay";

		vbus-supply = <&vdd_usb1_vbus>;

	};



	usb@0,7d004000 { /* Internal webcam. */

		status = "okay";

	};



	usb-phy@0,7d004000 {

		status = "okay";

		vbus-supply = <&vdd_run_cam>;

	};



	usb@0,7d008000 { /* Left external USB port. */

		status = "okay";

	};



	usb-phy@0,7d008000 {

		status = "okay";

		vbus-supply = <&vdd_usb3_vbus>;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

arch/arm/boot/dts/tegra124-venice2.dts

+100 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ 
					regulator-always-on;

				};



				ldo0 {

				avdd_1v05_run: ldo0 {

					regulator-name = "+1.05V_RUN_AVDD";

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1050000>;
@@ -895,6 +895,105 @@ 
		status = "okay";

	};



	usb@0,70090000 {

		phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */

		       <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */

		       <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */

		phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0", "usb3-1";



		avddio-pex-supply = <&vdd_1v05_run>;

		dvddio-pex-supply = <&vdd_1v05_run>;

		avdd-usb-supply = <&vdd_3v3_lp0>;

		avdd-pll-utmip-supply = <&vddio_1v8>;

		avdd-pll-erefe-supply = <&avdd_1v05_run>;

		avdd-usb-ss-pll-supply = <&vdd_1v05_run>;

		hvdd-usb-ss-supply = <&vdd_3v3_lp0>;

		hvdd-usb-ss-pll-e-supply = <&vdd_3v3_lp0>;



		status = "okay";

	};



	padctl@0,7009f000 {

		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";

					};

				};

			};



			pcie {

				status = "okay";



				lanes {

					pcie-0 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};



					pcie-1 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};



					pcie-1 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};

				};

			};

		};



		ports {

			usb2-0 {

				status = "okay";

				mode = "otg";



				vbus-supply = <&vdd_usb1_vbus>;

			};



			usb2-1 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_run_cam>;

			};



			usb2-2 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_usb3_vbus>;

			};



			usb3-0 {

				nvidia,usb2-companion = <0>;

				status = "okay";

			};



			usb3-1 {

				nvidia,usb2-companion = <2>;

				status = "okay";

			};

		};

	};



	sdhci@0,700b0400 {

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/tegra124.dtsi

+160 −7
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <dt-bindings/gpio/tegra-gpio.h>

#include <dt-bindings/memory/tegra124-mc.h>

#include <dt-bindings/pinctrl/pinctrl-tegra.h>

#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>

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

#include <dt-bindings/reset/tegra124-car.h>

#include <dt-bindings/thermal/tegra124-soctherm.h>
@@ -51,9 +50,6 @@ 
		reset-names = "pex", "afi", "pcie_x";

		status = "disabled";



		phys = <&padctl TEGRA_XUSB_PADCTL_PCIE>;

		phy-names = "pcie";



		pci@1,0 {

			device_type = "pci";

			assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
@@ -622,8 +618,6 @@ 
			 <&tegra_car 123>,

			 <&tegra_car 129>;

		reset-names = "sata", "sata-oob", "sata-cold";

		phys = <&padctl TEGRA_XUSB_PADCTL_SATA>;

		phy-names = "sata-phy";

		status = "disabled";

	};
@@ -642,13 +636,172 @@ 
		status = "disabled";

	};



	usb@0,70090000 {

		compatible = "nvidia,tegra124-xusb";

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

		      <0x0 0x70098000 0x0 0x1000>,

		      <0x0 0x70099000 0x0 0x1000>;

		reg-names = "hcd", "fpci", "ipfs";



		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;



		clocks = <&tegra_car TEGRA124_CLK_XUSB_HOST>,

			 <&tegra_car TEGRA124_CLK_XUSB_HOST_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_FALCON_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_HS_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_FS_SRC>,

			 <&tegra_car TEGRA124_CLK_PLL_U_480M>,

			 <&tegra_car TEGRA124_CLK_CLK_M>,

			 <&tegra_car TEGRA124_CLK_PLL_E>;

		clock-names = "xusb_host", "xusb_host_src",

			      "xusb_falcon_src", "xusb_ss",

			      "xusb_ss_div2", "xusb_ss_src",

			      "xusb_hs_src", "xusb_fs_src",

			      "pll_u_480m", "clk_m", "pll_e";

		resets = <&tegra_car 89>, <&tegra_car 156>,

			 <&tegra_car 143>;

		reset-names = "xusb_host", "xusb_ss", "xusb_src";



		nvidia,xusb-padctl = <&padctl>;



		status = "disabled";

	};



	padctl: padctl@0,7009f000 {

		compatible = "nvidia,tegra124-xusb-padctl";

		reg = <0x0 0x7009f000 0x0 0x1000>;

		resets = <&tegra_car 142>;

		reset-names = "padctl";



		#phy-cells = <1>;

		pads {

			usb2 {

				status = "disabled";



				lanes {

					usb2-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-2 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			ulpi {

				status = "disabled";



				lanes {

					ulpi-0 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			hsic {

				status = "disabled";



				lanes {

					hsic-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					hsic-1 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			pcie {

				status = "disabled";



				lanes {

					pcie-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-2 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-3 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-4 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			sata {

				status = "disabled";



				lanes {

					sata-0 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};

		};



		ports {

			usb2-0 {

				status = "disabled";

			};



			usb2-1 {

				status = "disabled";

			};



			usb2-2 {

				status = "disabled";

			};



			ulpi-0 {

				status = "disabled";

			};



			hsic-0 {

				status = "disabled";

			};



			hsic-1 {

				status = "disabled";

			};



			usb3-0 {

				status = "disabled";

			};



			usb3-1 {

				status = "disabled";

			};

		};

	};



	sdhci@0,700b0000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE