Commit cea35899 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.15-rc5 into usb-next 



We need these USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 53971a86 d6d211db

Documentation/devicetree/bindings/arm/arch_timer.txt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs. 


- clock-frequency : The frequency of the main counter, in Hz. Optional.



- always-on : a boolean property. If present, the timer is powered through an

  always-on power domain, therefore it never loses context.



Example:



	timer {

Documentation/devicetree/bindings/ata/apm-xgene.txt

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Required properties: 
  * "sata-phy" for the SATA 6.0Gbps PHY



Optional properties:

- dma-coherent		: Present if dma operations are coherent

- status		: Shall be "ok" if enabled or "disabled" if disabled.

			  Default is "ok".
@@ -55,6 +56,7 @@ Example: 
			      <0x0 0x1f22e000 0x0 0x1000>,

			      <0x0 0x1f227000 0x0 0x1000>;

			interrupts = <0x0 0x87 0x4>;

			dma-coherent;

			status = "ok";

			clocks = <&sataclk 0>;

			phys = <&phy2 0>;
@@ -69,6 +71,7 @@ Example: 
			      <0x0 0x1f23e000 0x0 0x1000>,

			      <0x0 0x1f237000 0x0 0x1000>;

			interrupts = <0x0 0x88 0x4>;

			dma-coherent;

			status = "ok";

			clocks = <&sataclk 0>;

			phys = <&phy3 0>;

Documentation/devicetree/bindings/net/arc_emac.txt

+10 −2
Original line number Diff line number Diff line
@@ -4,11 +4,15 @@ Required properties: 
- compatible: Should be "snps,arc-emac"

- reg: Address and length of the register set for the device

- interrupts: Should contain the EMAC interrupts

- clock-frequency: CPU frequency. It is needed to calculate and set polling

period of EMAC.

- max-speed: see ethernet.txt file in the same directory.

- phy: see ethernet.txt file in the same directory.



Clock handling:

The clock frequency is needed to calculate and set polling period of EMAC.

It must be provided by one of:

- clock-frequency: CPU frequency.

- clocks: reference to the clock supplying the EMAC.



Child nodes of the driver are the individual PHY devices connected to the

MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.
@@ -19,7 +23,11 @@ Examples: 
		reg = <0xc0fc2000 0x3c>;

		interrupts = <6>;

		mac-address = [ 00 11 22 33 44 55 ];



		clock-frequency = <80000000>;

		/* or */

		clocks = <&emac_clock>;



		max-speed = <100>;

		phy = <&phy0>;

Documentation/devicetree/bindings/net/socfpga-dwmac.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ gmac0: ethernet@ff700000 { 
	interrupt-names = "macirq";

	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */

	clocks = <&emac_0_clk>;

	clocks-names = "stmmaceth";

	clock-names = "stmmaceth";

};

Documentation/devicetree/bindings/net/stmmac.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Optional properties: 
- max-frame-size: See ethernet.txt file in the same directory

- clocks: If present, the first clock should be the GMAC main clock,

  further clocks may be specified in derived bindings.

- clocks-names: One name for each entry in the clocks property, the

- clock-names: One name for each entry in the clocks property, the

  first one should be "stmmaceth".



Examples: