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

Commit 09ffa131 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'v3.15-rc4' into devel 

Linux 3.15-rc4
parents 29a1f233 89ca3b88

Documentation/devicetree/bindings/arm/arch_timer.txt

+3 −0
Original line number Original line 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.

- 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:

Example:





	timer {

	timer {

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

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

  * "sata-phy" for the SATA 6.0Gbps PHY





Optional properties:

Optional properties:

- dma-coherent		: Present if dma operations are coherent

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

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

			  Default is "ok".

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

			      <0x0 0x1f22e000 0x0 0x1000>,

			      <0x0 0x1f227000 0x0 0x1000>;

			      <0x0 0x1f227000 0x0 0x1000>;

			interrupts = <0x0 0x87 0x4>;

			interrupts = <0x0 0x87 0x4>;

			dma-coherent;

			status = "ok";

			status = "ok";

			clocks = <&sataclk 0>;

			clocks = <&sataclk 0>;

			phys = <&phy2 0>;

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

			      <0x0 0x1f23e000 0x0 0x1000>,

			      <0x0 0x1f237000 0x0 0x1000>;

			      <0x0 0x1f237000 0x0 0x1000>;

			interrupts = <0x0 0x88 0x4>;

			interrupts = <0x0 0x88 0x4>;

			dma-coherent;

			status = "ok";

			status = "ok";

			clocks = <&sataclk 0>;

			clocks = <&sataclk 0>;

			phys = <&phy3 0>;

			phys = <&phy3 0>;

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

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

	interrupt-names = "macirq";

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

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

	clocks = <&emac_0_clk>;

	clocks = <&emac_0_clk>;

	clocks-names = "stmmaceth";

	clock-names = "stmmaceth";

};
 
};

Documentation/devicetree/bindings/net/stmmac.txt

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

- max-frame-size: See ethernet.txt file in the same directory

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

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

  further clocks may be specified in derived bindings.

  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".

  first one should be "stmmaceth".





Examples:

Examples:

Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ Example: 
		reg 		= <0xfe61f080 0x4>;

		reg 		= <0xfe61f080 0x4>;

		reg-names	= "irqmux";

		reg-names	= "irqmux";

		interrupts 	= <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;

		interrupts 	= <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;

		interrupts-names = "irqmux";

		interrupt-names	= "irqmux";

		ranges 		= <0 0xfe610000 0x5000>;

		ranges 		= <0 0xfe610000 0x5000>;





		PIO0: gpio@fe610000 {

		PIO0: gpio@fe610000 {
@@ -165,7 +165,7 @@ sdhci0:sdhci@fe810000{ 
	interrupt-parent = <&PIO3>;

	interrupt-parent = <&PIO3>;

	#interrupt-cells = <2>;

	#interrupt-cells = <2>;

	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */

	interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */

	interrupts-names = "card-detect";

	interrupt-names = "card-detect";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0	= <&pinctrl_mmc>;

	pinctrl-0	= <&pinctrl_mmc>;

};
 
};