Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'zynq-dt-for-4.6' of https://github.com/Xilinx/linux-xlnx into next/dt 

Merge "ARM: Xilinx Zynq dt patches for v4.6" from Michal Simek

- Add usb phy for Zybo
- Use earlycon instead of earlyprintk

* tag 'zynq-dt-for-4.6' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Use earlycon instead of earlyprintk
  ARM: dts: zynq: Enable USB and USB PHY for ZYBO
parents 8be31869 07bf429d

arch/arm/boot/dts/zynq-parallella.dts

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
	};



	chosen {

		bootargs = "earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";

		bootargs = "earlycon root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";

		stdout-path = "serial0:115200n8";

	};

};

arch/arm/boot/dts/zynq-zc702.dts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
	};



	chosen {

		bootargs = "earlyprintk";

		bootargs = "earlycon";

		stdout-path = "serial0:115200n8";

	};

arch/arm/boot/dts/zynq-zc706.dts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
	};



	chosen {

		bootargs = "earlyprintk";

		bootargs = "earlycon";

		stdout-path = "serial0:115200n8";

	};

arch/arm/boot/dts/zynq-zed.dts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
	};



	chosen {

		bootargs = "earlyprintk";

		bootargs = "earlycon";

		stdout-path = "serial0:115200n8";

	};

arch/arm/boot/dts/zynq-zybo.dts

+12 −1
Original line number Diff line number Diff line
@@ -29,10 +29,15 @@ 
	};



	chosen {

		bootargs = "earlyprintk";

		bootargs = "earlycon";

		stdout-path = "serial0:115200n8";

	};



	usb_phy0: phy0 {

		#phy-cells = <0>;

		compatible = "usb-nop-xceiv";

		reset-gpios = <&gpio0 46 1>;

	};

};



&clkc {
@@ -56,3 +61,9 @@ 
&uart1 {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

	usb-phy = <&usb_phy0>;

};