Merge branch 'build-v0.3.3'

files/linux-4.8.17-armv7-fpga.diff

@@ -1,3 +1,15 @@
+diff --git arch/arm/boot/dts/Makefile arch/arm/boot/dts/Makefile
+index faacd52..9d09920 100644
+--- arch/arm/boot/dts/Makefile
++++ arch/arm/boot/dts/Makefile
+@@ -863,6 +863,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \
+ 	wm8850-w70v2.dtb
+ dtb-$(CONFIG_ARCH_ZYNQ) += \
+ 	zynq-parallella.dtb \
++	zynq-pynqz1.dtb \
+ 	zynq-zc702.dtb \
+ 	zynq-zc706.dtb \
+ 	zynq-zed.dtb \
 diff --git arch/arm/boot/dts/zynq-7000.dtsi arch/arm/boot/dts/zynq-7000.dtsi
 index f283ff0..2a9be16 100644
 --- arch/arm/boot/dts/zynq-7000.dtsi
@@ -19,7 +31,7 @@ index f283ff0..2a9be16 100644
  };
 diff --git arch/arm/boot/dts/zynq-pynqz1.dts arch/arm/boot/dts/zynq-pynqz1.dts
 new file mode 100644
-index 0000000..6529ef8
+index 0000000..b708179
 --- /dev/null
 +++ arch/arm/boot/dts/zynq-pynqz1.dts
 @@ -0,0 +1,64 @@
@@ -85,7 +97,7 @@ index 0000000..6529ef8
 +&usb0 {
 +	status = "okay";
 +	dr_mode = "host";
-+	usb-phy = <&usb_phy0>;
++	usb-reset = <&gpio0 46 0>;
 +};
 diff --git arch/arm/boot/dts/zynq-zybo.dts arch/arm/boot/dts/zynq-zybo.dts
 index d9e0f3e..c99ddc3 100644

target/zynq-pynqz1/boot/devicetree-4.8.17-zynq-pynqz1.dts

@@ -110,8 +110,8 @@
 			interrupt-parent = <0x3>;
 			interrupts = <0x0 0x14 0x4>;
 			reg = <0xe000a000 0x1000>;
-			linux,phandle = <0x7>;
-			phandle = <0x7>;
+			linux,phandle = <0x6>;
+			phandle = <0x6>;
 		};
 
 		i2c@e0004000 {
@@ -350,7 +350,7 @@
 			reg = <0xe0002000 0x1000>;
 			phy_type = "ulpi";
 			dr_mode = "host";
-			usb-phy = <0x6>;
+			usb-reset = <0x6 0x2e 0x0>;
 		};
 
 		usb@e0003000 {
@@ -386,8 +386,6 @@
 	phy0 {
 		#phy-cells = <0x0>;
 		compatible = "usb-nop-xceiv";
-		reset-gpios = <0x7 0x2e 0x1>;
-		linux,phandle = <0x6>;
-		phandle = <0x6>;
+		reset-gpios = <0x6 0x2e 0x1>;
 	};
 };