--- tegra124-jetson-tk1.dts.wiki	2017-04-13 16:05:05.000000000 +0100
+++ tegra124-jetson-tk1.dts.current	2017-04-13 16:01:43.000000000 +0100
@@ -8,12 +8,15 @@
 	model = "NVIDIA Tegra124 Jetson TK1";
 
 	chosen {
+		stdout-path = "serial0:115200n8";
 	};
 
 	aliases {
 		rtc0 = "/i2c@0,7000d000/pmic@40";
 		rtc1 = "/rtc@0,7000e000";
 		serial0 = "/serial@0,70006300";
+		serial1 = "/serial@0,70006000";
+		serial2 = "/serial@0,70006040";
 	};
 
 	memory {
@@ -40,15 +43,13 @@
 		resets = <0x3 0x46 0x3 0x48 0x3 0x4a>;
 		reset-names = "pex", "afi", "pcie_x";
 		status = "okay";
-		phys = <0x4 0x0>;
-		phy-names = "pcie";
-		avddio-pex-supply = <0x5>;
-		dvddio-pex-supply = <0x5>;
-		avdd-pex-pll-supply = <0x5>;
-		hvdd-pex-supply = <0x6>;
-		hvdd-pex-pll-e-supply = <0x6>;
-		vddio-pex-ctl-supply = <0x6>;
-		avdd-pll-erefe-supply = <0x7>;
+		avddio-pex-supply = <0x4>;
+		dvddio-pex-supply = <0x4>;
+		avdd-pex-pll-supply = <0x4>;
+		hvdd-pex-supply = <0x5>;
+		hvdd-pex-pll-e-supply = <0x5>;
+		vddio-pex-ctl-supply = <0x5>;
+		avdd-pll-erefe-supply = <0x6>;
 
 		pci@1,0 {
 			device_type = "pci";
@@ -59,6 +60,8 @@
 			#size-cells = <0x2>;
 			ranges;
 			nvidia,num-lanes = <0x2>;
+			phys = <0x7>;
+			phy-names = "pcie-0";
 		};
 
 		pci@2,0 {
@@ -70,6 +73,8 @@
 			#size-cells = <0x2>;
 			ranges;
 			nvidia,num-lanes = <0x1>;
+			phys = <0x8>;
+			phy-names = "pcie-0";
 		};
 	};
 
@@ -92,7 +97,7 @@
 			clock-names = "dc", "parent";
 			resets = <0x3 0x1b>;
 			reset-names = "dc";
-			iommus = <0x8 0x1>;
+			iommus = <0x9 0x1>;
 			nvidia,head = <0x0>;
 		};
 
@@ -104,7 +109,7 @@
 			clock-names = "dc", "parent";
 			resets = <0x3 0x1a>;
 			reset-names = "dc";
-			iommus = <0x8 0x2>;
+			iommus = <0x9 0x2>;
 			nvidia,head = <0x1>;
 		};
 
@@ -117,11 +122,11 @@
 			resets = <0x3 0x33>;
 			reset-names = "hdmi";
 			status = "okay";
-			hdmi-supply = <0x9>;
-			pll-supply = <0xa>;
-			vdd-supply = <0xb>;
-			nvidia,ddc-i2c-bus = <0xc>;
-			nvidia,hpd-gpio = <0xd 0x6f 0x0>;
+			hdmi-supply = <0xa>;
+			pll-supply = <0xb>;
+			vdd-supply = <0xc>;
+			nvidia,ddc-i2c-bus = <0xd>;
+			nvidia,hpd-gpio = <0xe 0x6f 0x0>;
 		};
 
 		sor@0,54540000 {
@@ -167,9 +172,9 @@
 		clock-names = "gpu", "pwr";
 		resets = <0x3 0xb8>;
 		reset-names = "gpu";
-		iommus = <0x8 0x13>;
+		iommus = <0x9 0x13>;
 		status = "disabled";
-		vdd-supply = <0xe>;
+		vdd-supply = <0xf>;
 	};
 
 	interrupt-controller@60004000 {
@@ -183,7 +188,7 @@
 	};
 
 	timer@0,60005000 {
-		compatible = "nvidia,tegra124-timer", "nvidia,tegra20-timer";
+		compatible = "nvidia,tegra124-timer", "nvidia,tegra30-timer", "nvidia,tegra20-timer";
 		reg = <0x0 0x60005000 0x0 0x400>;
 		interrupts = <0x0 0x0 0x4 0x0 0x1 0x4 0x0 0x29 0x4 0x0 0x2a 0x4 0x0 0x79 0x4 0x0 0x7a 0x4>;
 		clocks = <0x3 0x5>;
@@ -194,7 +199,7 @@
 		reg = <0x0 0x60006000 0x0 0x1000>;
 		#clock-cells = <0x1>;
 		#reset-cells = <0x1>;
-		nvidia,external-memory-controller = <0xf>;
+		nvidia,external-memory-controller = <0x10>;
 		linux,phandle = <0x3>;
 		phandle = <0x3>;
 
@@ -310,9 +315,8 @@
 		gpio-controller;
 		#interrupt-cells = <0x2>;
 		interrupt-controller;
-		gpio-ranges = <0x10 0x0 0x0 0xfb>;
-		linux,phandle = <0xd>;
-		phandle = <0xd>;
+		linux,phandle = <0xe>;
+		phandle = <0xe>;
 	};
 
 	dma@0,60020000 {
@@ -337,8 +341,6 @@
 		reg = <0x0 0x70000868 0x0 0x164 0x0 0x70003000 0x0 0x434 0x0 0x70000820 0x0 0x8>;
 		pinctrl-names = "boot";
 		pinctrl-0 = <0x11>;
-		linux,phandle = <0x10>;
-		phandle = <0x10>;
 
 		pinmux {
 			linux,phandle = <0x11>;
@@ -1914,17 +1916,17 @@
 		audio-codec@1c {
 			compatible = "realtek,rt5639";
 			reg = <0x1c>;
-			interrupt-parent = <0xd>;
+			interrupt-parent = <0xe>;
 			interrupts = <0x3c 0x0>;
-			realtek,ldo1-en-gpios = <0xd 0x8a 0x0>;
-			linux,phandle = <0x2c>;
-			phandle = <0x2c>;
+			realtek,ldo1-en-gpios = <0xe 0x8a 0x0>;
+			linux,phandle = <0x31>;
+			phandle = <0x31>;
 		};
 
 		temperature-sensor@4c {
 			compatible = "ti,tmp451";
 			reg = <0x4c>;
-			interrupt-parent = <0xd>;
+			interrupt-parent = <0xe>;
 			interrupts = <0x46 0x8>;
 		};
 
@@ -1981,8 +1983,8 @@
 		dma-names = "rx", "tx";
 		status = "okay";
 		clock-frequency = <0x186a0>;
-		linux,phandle = <0xc>;
-		phandle = <0xc>;
+		linux,phandle = <0xd>;
+		phandle = <0xd>;
 	};
 
 	i2c@0,7000d000 {
@@ -2011,8 +2013,8 @@
 			#gpio-cells = <0x2>;
 			pinctrl-names = "default";
 			pinctrl-0 = <0x13>;
-			linux,phandle = <0x2a>;
-			phandle = <0x2a>;
+			linux,phandle = <0x2f>;
+			phandle = <0x2f>;
 
 			pinmux {
 				linux,phandle = <0x13>;
@@ -2057,8 +2059,8 @@
 					regulator-always-on;
 					regulator-boot-on;
 					ams,ext-control = <0x2>;
-					linux,phandle = <0x1e>;
-					phandle = <0x1e>;
+					linux,phandle = <0x24>;
+					phandle = <0x24>;
 				};
 
 				sd1 {
@@ -2094,8 +2096,8 @@
 					regulator-name = "+1.05V_RUN";
 					regulator-min-microvolt = <0x100590>;
 					regulator-max-microvolt = <0x100590>;
-					linux,phandle = <0x5>;
-					phandle = <0x5>;
+					linux,phandle = <0x4>;
+					phandle = <0x4>;
 				};
 
 				sd5 {
@@ -2116,8 +2118,8 @@
 					regulator-max-microamp = <0x3567e0>;
 					regulator-boot-on;
 					regulator-always-on;
-					linux,phandle = <0xe>;
-					phandle = <0xe>;
+					linux,phandle = <0xf>;
+					phandle = <0xf>;
 				};
 
 				ldo0 {
@@ -2127,8 +2129,8 @@
 					regulator-boot-on;
 					regulator-always-on;
 					ams,ext-control = <0x1>;
-					linux,phandle = <0x7>;
-					phandle = <0x7>;
+					linux,phandle = <0x6>;
+					phandle = <0x6>;
 				};
 
 				ldo1 {
@@ -2170,8 +2172,8 @@
 					regulator-name = "+VDDIO_SDMMC3";
 					regulator-min-microvolt = <0x1b7740>;
 					regulator-max-microvolt = <0x325aa0>;
-					linux,phandle = <0x1d>;
-					phandle = <0x1d>;
+					linux,phandle = <0x23>;
+					phandle = <0x23>;
 				};
 
 				ldo7 {
@@ -2358,8 +2360,8 @@
 		clock-names = "mc";
 		interrupts = <0x0 0x4d 0x4>;
 		#iommu-cells = <0x1>;
-		linux,phandle = <0x8>;
-		phandle = <0x8>;
+		linux,phandle = <0x9>;
+		phandle = <0x9>;
 
 		emc-timings-3 {
 			nvidia,ram-code = <0x3>;
@@ -2429,9 +2431,9 @@
 	emc@0,7001b000 {
 		compatible = "nvidia,tegra124-emc";
 		reg = <0x0 0x7001b000 0x0 0x1000>;
-		nvidia,memory-controller = <0x8>;
-		linux,phandle = <0xf>;
-		phandle = <0xf>;
+		nvidia,memory-controller = <0x9>;
+		linux,phandle = <0x10>;
+		phandle = <0x10>;
 
 		emc-timings-3 {
 			nvidia,ram-code = <0x3>;
@@ -2710,14 +2712,14 @@
 		clock-names = "sata", "sata-oob", "cml1", "pll_e";
 		resets = <0x3 0x7c 0x3 0x7b 0x3 0x81>;
 		reset-names = "sata", "sata-oob", "sata-cold";
-		phys = <0x4 0x1>;
-		phy-names = "sata-phy";
 		status = "okay";
-		hvdd-supply = <0x6>;
-		vddio-supply = <0x5>;
-		avdd-supply = <0x5>;
-		target-5v-supply = <0x1a>;
-		target-12v-supply = <0x1b>;
+		phys = <0x1a>;
+		phy-names = "sata-0";
+		hvdd-supply = <0x5>;
+		vddio-supply = <0x4>;
+		avdd-supply = <0x4>;
+		target-5v-supply = <0x1b>;
+		target-12v-supply = <0x1c>;
 	};
 
 	hda@0,70030000 {
@@ -2731,37 +2733,194 @@
 		status = "okay";
 	};
 
+	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 = <0x0 0x27 0x4 0x0 0x28 0x4>;
+		clocks = <0x3 0x59 0x3 0xfc 0x3 0xfd 0x3 0x9c 0x3 0x138 0x3 0xff 0x3 0x102 0x3 0xfe 0x3 0xdf 0x3 0xc9 0x3 0xe7>;
+		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 = <0x3 0x59 0x3 0x9c 0x3 0x8f>;
+		reset-names = "xusb_host", "xusb_ss", "xusb_src";
+		nvidia,xusb-padctl = <0x1d>;
+		status = "okay";
+		phys = <0x1e 0x1f 0x20 0x21>;
+		phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0";
+		avddio-pex-supply = <0x4>;
+		dvddio-pex-supply = <0x4>;
+		avdd-usb-supply = <0x5>;
+		avdd-pll-utmip-supply = <0x17>;
+		avdd-pll-erefe-supply = <0x6>;
+		avdd-usb-ss-pll-supply = <0x4>;
+		hvdd-usb-ss-supply = <0x5>;
+		hvdd-usb-ss-pll-e-supply = <0x5>;
+	};
+
 	padctl@0,7009f000 {
 		compatible = "nvidia,tegra124-xusb-padctl";
 		reg = <0x0 0x7009f000 0x0 0x1000>;
 		resets = <0x3 0x8e>;
 		reset-names = "padctl";
-		#phy-cells = <0x1>;
-		pinctrl-0 = <0x1c>;
-		pinctrl-names = "default";
-		linux,phandle = <0x4>;
-		phandle = <0x4>;
+		status = "okay";
+		linux,phandle = <0x1d>;
+		phandle = <0x1d>;
 
-		pinmux {
-			linux,phandle = <0x1c>;
-			phandle = <0x1c>;
+		pads {
+
+			usb2 {
+				status = "okay";
+
+				lanes {
+
+					usb2-0 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "snps";
+						linux,phandle = <0x1e>;
+						phandle = <0x1e>;
+					};
+
+					usb2-1 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "snps";
+						linux,phandle = <0x1f>;
+						phandle = <0x1f>;
+					};
+
+					usb2-2 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "xusb";
+						linux,phandle = <0x20>;
+						phandle = <0x20>;
+					};
+				};
+			};
+
+			ulpi {
+				status = "disabled";
 
-			usb3 {
-				nvidia,lanes = "pcie-0", "pcie-1";
-				nvidia,function = "usb3";
-				nvidia,iddq = <0x0>;
+				lanes {
+
+					ulpi-0 {
+						status = "disabled";
+						#phy-cells = <0x0>;
+					};
+				};
+			};
+
+			hsic {
+				status = "disabled";
+
+				lanes {
+
+					hsic-0 {
+						status = "disabled";
+						#phy-cells = <0x0>;
+					};
+
+					hsic-1 {
+						status = "disabled";
+						#phy-cells = <0x0>;
+					};
+				};
 			};
 
 			pcie {
-				nvidia,lanes = "pcie-2", "pcie-3", "pcie-4";
-				nvidia,function = "pcie";
-				nvidia,iddq = <0x0>;
+				status = "okay";
+
+				lanes {
+
+					pcie-0 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "usb3-ss";
+						linux,phandle = <0x21>;
+						phandle = <0x21>;
+					};
+
+					pcie-1 {
+						status = "disabled";
+						#phy-cells = <0x0>;
+					};
+
+					pcie-2 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "pcie";
+						linux,phandle = <0x8>;
+						phandle = <0x8>;
+					};
+
+					pcie-3 {
+						status = "disabled";
+						#phy-cells = <0x0>;
+					};
+
+					pcie-4 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "pcie";
+						linux,phandle = <0x7>;
+						phandle = <0x7>;
+					};
+				};
 			};
 
 			sata {
-				nvidia,lanes = "sata-0";
-				nvidia,function = "sata";
-				nvidia,iddq = <0x0>;
+				status = "okay";
+
+				lanes {
+
+					sata-0 {
+						status = "okay";
+						#phy-cells = <0x0>;
+						nvidia,function = "sata";
+						linux,phandle = <0x1a>;
+						phandle = <0x1a>;
+					};
+				};
+			};
+		};
+
+		ports {
+
+			usb2-0 {
+				status = "okay";
+				mode = "otg";
+			};
+
+			usb2-1 {
+				status = "okay";
+				mode = "host";
+			};
+
+			usb2-2 {
+				status = "okay";
+				mode = "host";
+				vbus-supply = <0x22>;
+			};
+
+			ulpi-0 {
+				status = "disabled";
+			};
+
+			hsic-0 {
+				status = "disabled";
+			};
+
+			hsic-1 {
+				status = "disabled";
+			};
+
+			usb3-0 {
+				status = "okay";
+				nvidia,usb2-companion = <0x2>;
+			};
+
+			usb3-1 {
+				status = "disabled";
 			};
 		};
 	};
@@ -2794,11 +2953,11 @@
 		resets = <0x3 0x45>;
 		reset-names = "sdhci";
 		status = "okay";
-		cd-gpios = <0xd 0xaa 0x1>;
-		power-gpios = <0xd 0x88 0x0>;
-		wp-gpios = <0xd 0x84 0x0>;
+		cd-gpios = <0xe 0xaa 0x1>;
+		power-gpios = <0xe 0x88 0x0>;
+		wp-gpios = <0xe 0x84 0x0>;
 		bus-width = <0x4>;
-		vqmmc-supply = <0x1d>;
+		vqmmc-supply = <0x23>;
 	};
 
 	sdhci@0,700b0600 {
@@ -2822,8 +2981,8 @@
 		resets = <0x3 0x4e>;
 		reset-names = "soctherm";
 		#thermal-sensor-cells = <0x1>;
-		linux,phandle = <0x28>;
-		phandle = <0x28>;
+		linux,phandle = <0x2d>;
+		phandle = <0x2d>;
 	};
 
 	clock@0,70110000 {
@@ -2843,10 +3002,10 @@
 		nvidia,ci = <0x0>;
 		nvidia,cg = <0x2>;
 		status = "okay";
-		vdd-cpu-supply = <0x1e>;
+		vdd-cpu-supply = <0x24>;
 		nvidia,i2c-fs-rate = <0x61a80>;
-		linux,phandle = <0x23>;
-		phandle = <0x23>;
+		linux,phandle = <0x28>;
+		phandle = <0x28>;
 	};
 
 	ahub@0,70300000 {
@@ -2881,8 +3040,8 @@
 			resets = <0x3 0xb>;
 			reset-names = "i2s";
 			status = "okay";
-			linux,phandle = <0x2b>;
-			phandle = <0x2b>;
+			linux,phandle = <0x30>;
+			phandle = <0x30>;
 		};
 
 		i2s@0,70301200 {
@@ -2924,8 +3083,8 @@
 		clocks = <0x3 0x16>;
 		resets = <0x3 0x16>;
 		reset-names = "usb";
-		nvidia,phy = <0x1f>;
-		status = "disabled";
+		nvidia,phy = <0x25>;
+		status = "okay";
 	};
 
 	usb-phy@0,7d000000 {
@@ -2948,8 +3107,8 @@
 		nvidia,xcvr-hsslew = <0xc>;
 		nvidia,has-utmi-pad-registers;
 		status = "okay";
-		linux,phandle = <0x1f>;
-		phandle = <0x1f>;
+		linux,phandle = <0x25>;
+		phandle = <0x25>;
 	};
 
 	usb@0,7d004000 {
@@ -2960,7 +3119,7 @@
 		clocks = <0x3 0x3a>;
 		resets = <0x3 0x3a>;
 		reset-names = "usb";
-		nvidia,phy = <0x20>;
+		nvidia,phy = <0x26>;
 		status = "okay";
 	};
 
@@ -2983,8 +3142,8 @@
 		nvidia,hsdiscon-level = <0x5>;
 		nvidia,xcvr-hsslew = <0xc>;
 		status = "okay";
-		linux,phandle = <0x20>;
-		phandle = <0x20>;
+		linux,phandle = <0x26>;
+		phandle = <0x26>;
 	};
 
 	usb@0,7d008000 {
@@ -2995,7 +3154,7 @@
 		clocks = <0x3 0x3b>;
 		resets = <0x3 0x3b>;
 		reset-names = "usb";
-		nvidia,phy = <0x21>;
+		nvidia,phy = <0x27>;
 		status = "okay";
 	};
 
@@ -3019,8 +3178,8 @@
 		nvidia,xcvr-hsslew = <0xc>;
 		status = "okay";
 		vbus-supply = <0x22>;
-		linux,phandle = <0x21>;
-		phandle = <0x21>;
+		linux,phandle = <0x27>;
+		phandle = <0x27>;
 	};
 
 	cpus {
@@ -3031,43 +3190,43 @@
 			device_type = "cpu";
 			compatible = "arm,cortex-a15";
 			reg = <0x0>;
-			clocks = <0x3 0x106 0x3 0x107 0x3 0xe3 0x3 0xd3 0x23>;
+			clocks = <0x3 0x106 0x3 0x107 0x3 0xe3 0x3 0xd3 0x28>;
 			clock-names = "cpu_g", "cpu_lp", "pll_x", "pll_p", "dfll";
 			clock-latency = <0x493e0>;
-			vdd-cpu-supply = <0x1e>;
-			linux,phandle = <0x24>;
-			phandle = <0x24>;
+			vdd-cpu-supply = <0x24>;
+			linux,phandle = <0x29>;
+			phandle = <0x29>;
 		};
 
 		cpu@1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a15";
 			reg = <0x1>;
-			linux,phandle = <0x25>;
-			phandle = <0x25>;
+			linux,phandle = <0x2a>;
+			phandle = <0x2a>;
 		};
 
 		cpu@2 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a15";
 			reg = <0x2>;
-			linux,phandle = <0x26>;
-			phandle = <0x26>;
+			linux,phandle = <0x2b>;
+			phandle = <0x2b>;
 		};
 
 		cpu@3 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a15";
 			reg = <0x3>;
-			linux,phandle = <0x27>;
-			phandle = <0x27>;
+			linux,phandle = <0x2c>;
+			phandle = <0x2c>;
 		};
 	};
 
 	pmu {
 		compatible = "arm,cortex-a15-pmu";
 		interrupts = <0x0 0x90 0x4 0x0 0x91 0x4 0x0 0x92 0x4 0x0 0x93 0x4>;
-		interrupt-affinity = <0x24 0x25 0x26 0x27>;
+		interrupt-affinity = <0x29 0x2a 0x2b 0x2c>;
 	};
 
 	thermal-zones {
@@ -3075,7 +3234,7 @@
 		cpu {
 			polling-delay-passive = <0x3e8>;
 			polling-delay = <0x3e8>;
-			thermal-sensors = <0x28 0x0>;
+			thermal-sensors = <0x2d 0x0>;
 
 			trips {
 
@@ -3093,7 +3252,7 @@
 		mem {
 			polling-delay-passive = <0x3e8>;
 			polling-delay = <0x3e8>;
-			thermal-sensors = <0x28 0x1>;
+			thermal-sensors = <0x2d 0x1>;
 
 			trips {
 
@@ -3111,7 +3270,7 @@
 		gpu {
 			polling-delay-passive = <0x3e8>;
 			polling-delay = <0x3e8>;
-			thermal-sensors = <0x28 0x2>;
+			thermal-sensors = <0x2d 0x2>;
 
 			trips {
 
@@ -3129,7 +3288,7 @@
 		pllx {
 			polling-delay-passive = <0x3e8>;
 			polling-delay = <0x3e8>;
-			thermal-sensors = <0x28 0x3>;
+			thermal-sensors = <0x2d 0x3>;
 		};
 	};
 
@@ -3139,6 +3298,16 @@
 		interrupt-parent = <0x2>;
 	};
 
+	serial@70006000 {
+		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		status = "okay";
+	};
+
+	serial@70006040 {
+		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		status = "okay";
+	};
+
 	clocks {
 		compatible = "simple-bus";
 		#address-cells = <0x1>;
@@ -3159,10 +3328,10 @@
 
 		power {
 			label = "Power";
-			gpios = <0xd 0x80 0x1>;
+			gpios = <0xe 0x80 0x1>;
 			linux,code = <0x74>;
 			debounce-interval = <0xa>;
-			gpio-key,wakeup;
+			wakeup-source;
 		};
 	};
 
@@ -3179,8 +3348,8 @@
 			regulator-max-microvolt = <0xb71b00>;
 			regulator-always-on;
 			regulator-boot-on;
-			linux,phandle = <0x29>;
-			phandle = <0x29>;
+			linux,phandle = <0x2e>;
+			phandle = <0x2e>;
 		};
 
 		regulator@1 {
@@ -3191,7 +3360,7 @@
 			regulator-max-microvolt = <0x4c4b40>;
 			regulator-always-on;
 			regulator-boot-on;
-			vin-supply = <0x29>;
+			vin-supply = <0x2e>;
 			linux,phandle = <0x14>;
 			phandle = <0x14>;
 		};
@@ -3204,7 +3373,7 @@
 			regulator-max-microvolt = <0x325aa0>;
 			regulator-always-on;
 			regulator-boot-on;
-			vin-supply = <0x29>;
+			vin-supply = <0x2e>;
 			linux,phandle = <0x18>;
 			phandle = <0x18>;
 		};
@@ -3217,7 +3386,7 @@
 			regulator-max-microvolt = <0x325aa0>;
 			regulator-always-on;
 			regulator-boot-on;
-			gpio = <0x2a 0x1 0x0>;
+			gpio = <0x2f 0x1 0x0>;
 			enable-active-high;
 			vin-supply = <0x18>;
 			linux,phandle = <0x16>;
@@ -3231,8 +3400,8 @@
 			regulator-min-microvolt = <0x325aa0>;
 			regulator-max-microvolt = <0x325aa0>;
 			vin-supply = <0x16>;
-			linux,phandle = <0xb>;
-			phandle = <0xb>;
+			linux,phandle = <0xc>;
+			phandle = <0xc>;
 		};
 
 		regulator@7 {
@@ -3241,7 +3410,7 @@
 			regulator-name = "+USB0_VBUS_SW";
 			regulator-min-microvolt = <0x4c4b40>;
 			regulator-max-microvolt = <0x4c4b40>;
-			gpio = <0xd 0x6c 0x0>;
+			gpio = <0xe 0x6c 0x0>;
 			enable-active-high;
 			gpio-open-drain;
 			vin-supply = <0x14>;
@@ -3253,7 +3422,8 @@
 			regulator-name = "+5V_USB_HS";
 			regulator-min-microvolt = <0x4c4b40>;
 			regulator-max-microvolt = <0x4c4b40>;
-			gpio = <0xd 0x6d 0x0>;
+			regulator-always-on;
+			gpio = <0xe 0x6d 0x0>;
 			enable-active-high;
 			gpio-open-drain;
 			vin-supply = <0x14>;
@@ -3269,11 +3439,11 @@
 			regulator-max-microvolt = <0x325aa0>;
 			regulator-always-on;
 			regulator-boot-on;
-			gpio = <0x2a 0x2 0x0>;
+			gpio = <0x2f 0x2 0x0>;
 			enable-active-high;
 			vin-supply = <0x18>;
-			linux,phandle = <0x6>;
-			phandle = <0x6>;
+			linux,phandle = <0x5>;
+			phandle = <0x5>;
 		};
 
 		regulator@11 {
@@ -3282,10 +3452,10 @@
 			regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
 			regulator-min-microvolt = <0x100590>;
 			regulator-max-microvolt = <0x100590>;
-			gpio = <0xd 0x3f 0x1>;
-			vin-supply = <0x5>;
-			linux,phandle = <0xa>;
-			phandle = <0xa>;
+			gpio = <0xe 0x3f 0x1>;
+			vin-supply = <0x4>;
+			linux,phandle = <0xb>;
+			phandle = <0xb>;
 		};
 
 		regulator@12 {
@@ -3294,11 +3464,11 @@
 			regulator-name = "+5V_HDMI_CON";
 			regulator-min-microvolt = <0x4c4b40>;
 			regulator-max-microvolt = <0x4c4b40>;
-			gpio = <0xd 0x56 0x0>;
+			gpio = <0xe 0x56 0x0>;
 			enable-active-high;
 			vin-supply = <0x14>;
-			linux,phandle = <0x9>;
-			phandle = <0x9>;
+			linux,phandle = <0xa>;
+			phandle = <0xa>;
 		};
 
 		regulator@13 {
@@ -3307,11 +3477,11 @@
 			regulator-name = "+5V_SATA";
 			regulator-min-microvolt = <0x4c4b40>;
 			regulator-max-microvolt = <0x4c4b40>;
-			gpio = <0xd 0xf2 0x0>;
+			gpio = <0xe 0xf2 0x0>;
 			enable-active-high;
 			vin-supply = <0x14>;
-			linux,phandle = <0x1a>;
-			phandle = <0x1a>;
+			linux,phandle = <0x1b>;
+			phandle = <0x1b>;
 		};
 
 		regulator@14 {
@@ -3320,11 +3490,11 @@
 			regulator-name = "+12V_SATA";
 			regulator-min-microvolt = <0xb71b00>;
 			regulator-max-microvolt = <0xb71b00>;
-			gpio = <0xd 0xf2 0x0>;
+			gpio = <0xe 0xf2 0x0>;
 			enable-active-high;
-			vin-supply = <0x29>;
-			linux,phandle = <0x1b>;
-			phandle = <0x1b>;
+			vin-supply = <0x2e>;
+			linux,phandle = <0x1c>;
+			phandle = <0x1c>;
 		};
 	};
 
@@ -3332,9 +3502,9 @@
 		compatible = "nvidia,tegra-audio-rt5640-jetson-tk1", "nvidia,tegra-audio-rt5640";
 		nvidia,model = "NVIDIA Tegra Jetson TK1";
 		nvidia,audio-routing = "Headphones", "HPOR", "Headphones", "HPOL", "Mic Jack", "MICBIAS1", "IN2P", "Mic Jack";
-		nvidia,i2s-controller = <0x2b>;
-		nvidia,audio-codec = <0x2c>;
-		nvidia,hp-det-gpios = <0xd 0x8f 0x1>;
+		nvidia,i2s-controller = <0x30>;
+		nvidia,audio-codec = <0x31>;
+		nvidia,hp-det-gpios = <0xe 0x8f 0x1>;
 		clocks = <0x3 0xd8 0x3 0xd9 0x3 0x78>;
 		clock-names = "pll_a", "pll_a_out0", "mclk";
 	};