Commit cdaa8cf3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' into next/fixes-non-critical 



Merge a set of fixes that we missed sending in before v4.0 release. These
will also be sent to -stable.

* fixes: (659 commits)
  ARM: at91/dt: sama5d3 xplained: add phy address for macb1
  kbuild: Create directory for target DTB
  ARM: mvebu: Disable CPU Idle on Armada 38x
  arm64: juno: Fix misleading name of UART reference clock
  ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
  ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
  ARM: socfpga: dts: fix spi1 interrupt
  ARM: dts: Fix gpio interrupts for dm816x
  ARM: dts: dra7: remove ti,hwmod property from pcie phy
  ARM: EXYNOS: Fix build breakage cpuidle on !SMP
  ARM: OMAP: dmtimer: disable pm runtime on remove
  ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
  ARM: dts: fix lid and power pin-functions for exynos5250-spring
  ARM: dts: fix mmc node updates for exynos5250-spring
  ARM: OMAP2+: Fix socbus family info for AM33xx devices
  ARM: dts: omap3: Add missing dmas for crypto
  + Linux 4.0-rc4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 30a5c189 98b80987

Documentation/CodeOfConflict

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Code of Conflict

----------------



The Linux kernel development effort is a very personal process compared

to "traditional" ways of developing software.  Your code and ideas

behind it will be carefully reviewed, often resulting in critique and

criticism.  The review will almost always require improvements to the

code before it can be included in the kernel.  Know that this happens

because everyone involved wants to see the best possible solution for

the overall success of Linux.  This development process has been proven

to create the most robust operating system kernel ever, and we do not

want to do anything to cause the quality of submission and eventual

result to ever decrease.



If however, anyone feels personally abused, threatened, or otherwise

uncomfortable due to this process, that is not acceptable.  If so,

please contact the Linux Foundation's Technical Advisory Board at

<tab@lists.linux-foundation.org>, or the individual members, and they

will work to resolve the issue to the best of their ability.  For more

information on who is on the Technical Advisory Board and what their

role is, please see:

	http://www.linuxfoundation.org/programs/advisory-councils/tab



As a reviewer of code, please strive to keep things civil and focused on

the technical issues involved.  We are all humans, and frustrations can

be high on both sides of the process.  Try to keep in mind the immortal

words of Bill and Ted, "Be excellent to each other."

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional Properties: 
	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

- power-domains: phandle pointing to the parent power domain, for more details

		 see Documentation/devicetree/bindings/power/power_domain.txt



Node of a device using power domains must have a power-domains property

defined with a phandle to respective power domain.

Documentation/devicetree/bindings/arm/sti.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ Boards with the ST STiH407 SoC shall have the following properties: 
Required root node property:

compatible = "st,stih407";



Boards with the ST STiH410 SoC shall have the following properties:

Required root node property:

compatible = "st,stih410";



Boards with the ST STiH418 SoC shall have the following properties:

Required root node property:

compatible = "st,stih418";

Documentation/devicetree/bindings/i2c/i2c-imx.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  - "fsl,vf610-i2c" for I2C compatible with the one integrated on Vybrid vf610 SoC

- reg : Should contain I2C/HS-I2C registers location and length

- interrupts : Should contain I2C/HS-I2C interrupt

- clocks : Should contain the I2C/HS-I2C clock specifier



Optional properties:

- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ property is used. 
- amd,serdes-cdr-rate: CDR rate speed selection

- amd,serdes-pq-skew: PQ (data sampling) skew

- amd,serdes-tx-amp: TX amplitude boost

- amd,serdes-dfe-tap-config: DFE taps available to run

- amd,serdes-dfe-tap-enable: DFE taps to enable



Example:

	xgbe_phy@e1240800 {
@@ -41,4 +43,6 @@ Example: 
		amd,serdes-cdr-rate = <2>, <2>, <7>;

		amd,serdes-pq-skew = <10>, <10>, <30>;

		amd,serdes-tx-amp = <15>, <15>, <10>;

		amd,serdes-dfe-tap-config = <3>, <3>, <1>;

		amd,serdes-dfe-tap-enable = <0>, <0>, <127>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE