Merge branch 'for-3.5/usb-ulpi' into for-3.5/dt2-new (d9e33b59) · Commits · 戴 / test

Documentation/devicetree/bindings/usb/tegra-usb.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@ Required properties :
		- nvidia,vbus-gpio : If present, specifies a gpio that needs to be
		activated for the bus to be powered.

		Required properties for phy_type == ulpi:
		- nvidia,phy-reset-gpio : The GPIO used to reset the PHY.

		Optional properties:
		- dr_mode : dual role mode. Indicates the working mode for
		nvidia,tegra20-ehci compatible controllers. Can be "host", "peripheral",

+14 −10

Original line number	Diff line number	Diff line
		@@ -167,28 +167,28 @@
		};
		conf_ata {
		nvidia,pins = "ata", "atb", "atc", "atd", "ate",
		"cdev1", "dap1", "dtb", "gma", "gmb",
		"gmc", "gmd", "gme", "gpu7", "gpv",
		"i2cp", "pta", "rm", "slxa", "slxk",
		"spia", "spib";
		"cdev1", "cdev2", "dap1", "dtb", "gma",
		"gmb", "gmc", "gmd", "gme", "gpu7",
		"gpv", "i2cp", "pta", "rm", "slxa",
		"slxk", "spia", "spib", "uac";
		nvidia,pull = <0>;
		nvidia,tristate = <0>;
		};
		conf_cdev2 {
		nvidia,pins = "cdev2", "csus", "spid", "spif";
		nvidia,pull = <1>;
		nvidia,tristate = <1>;
		};
		conf_ck32 {
		nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
		"pmcc", "pmcd", "pmce", "xm2c", "xm2d";
		nvidia,pull = <0>;
		};
		conf_csus {
		nvidia,pins = "csus", "spid", "spif";
		nvidia,pull = <1>;
		nvidia,tristate = <1>;
		};
		conf_crtp {
		nvidia,pins = "crtp", "dap2", "dap3", "dap4",
		"dtc", "dte", "dtf", "gpu", "sdio1",
		"slxc", "slxd", "spdi", "spdo", "spig",
		"uac", "uda";
		"uda";
		nvidia,pull = <0>;
		nvidia,tristate = <1>;
		};
		@@ -336,4 +336,8 @@
		power-gpios = <&gpio 70 0>; /* gpio PI6 */
		support-8bit;
		};

		usb@c5004000 {
		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
		};
		};

+9 −9

Original line number	Diff line number	Diff line
		@@ -159,18 +159,14 @@
		};
		conf_ata {
		nvidia,pins = "ata", "atb", "atc", "atd", "ate",
		"cdev1", "dap1", "dap2", "dtf", "gma",
		"gmb", "gmc", "gmd", "gme", "gpu",
		"gpu7", "gpv", "i2cp", "pta", "rm",
		"sdio1", "slxk", "spdo", "uac", "uda";
		"cdev1", "cdev2", "dap1", "dap2", "dtf",
		"gma", "gmb", "gmc", "gmd", "gme",
		"gpu", "gpu7", "gpv", "i2cp", "pta",
		"rm", "sdio1", "slxk", "spdo", "uac",
		"uda";
		nvidia,pull = <0>;
		nvidia,tristate = <0>;
		};
		conf_cdev2 {
		nvidia,pins = "cdev2";
		nvidia,pull = <1>;
		nvidia,tristate = <0>;
		};
		conf_ck32 {
		nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
		"pmcc", "pmcd", "pmce", "xm2c", "xm2d";
		@@ -351,4 +347,8 @@
		linux,default-trigger = "rfkill0";
		};
		};

		usb@c5004000 {
		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
		};
		};

+4 −0

Original line number	Diff line number	Diff line
		@@ -415,4 +415,8 @@
		0x00000000 0x00000000 0x00000000 0x00000000 >;
		};
		};

		usb@c5004000 {
		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
		};
		};

+13 −9

Original line number	Diff line number	Diff line
		@@ -182,23 +182,23 @@
		nvidia,tristate = <1>;
		};
		conf_atb {
		nvidia,pins = "atb", "cdev1", "dap1", "gma",
		"gmc", "gmd", "gpu", "gpu7", "gpv",
		"sdio1", "slxa", "slxk", "uac";
		nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
		"gma", "gmc", "gmd", "gpu", "gpu7",
		"gpv", "sdio1", "slxa", "slxk", "uac";
		nvidia,pull = <0>;
		nvidia,tristate = <0>;
		};
		conf_cdev2 {
		nvidia,pins = "cdev2", "csus", "spia", "spib",
		"spid", "spif";
		nvidia,pull = <1>;
		nvidia,tristate = <1>;
		};
		conf_ck32 {
		nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
		"pmcc", "pmcd", "pmce", "xm2c", "xm2d";
		nvidia,pull = <0>;
		};
		conf_csus {
		nvidia,pins = "csus", "spia", "spib",
		"spid", "spif";
		nvidia,pull = <1>;
		nvidia,tristate = <1>;
		};
		conf_ddc {
		nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
		nvidia,pull = <2>;
		@@ -304,4 +304,8 @@
		cd-gpios = <&gpio 121 0>;
		wp-gpios = <&gpio 122 0>;
		};

		usb@c5004000 {
		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
		};
		};