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

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

Merge tag 'omap-for-v4.1/wl12xx-dt' of... 

Merge tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "wireless wl12xx and omap device tree changes for v4.1" from Tony
Lindgren:

Wireless and omap changes to make wl12xx driver to use device tree
data instead of platform data from Eliad Peller <eliad@wizery.com>:

- Add device-tree support to the wlcore (wl12xx/wl18xx) driver.

- Update the current users to use the bindings instead of pdata-quirks.

- Finally, remove the deprecated wl12xx_platform_data struct

Note that da850 board file code that still uses the platform data,
but we have da850.dtsi that can be used instead. So it was decided
that we should try to remove the wl12xx support from the da850
board file as suggested by Sekhar Nori <nsekhar@ti.com>. As it's
the last patch in the series, the last patch can be simply reverted
if needed.

As this series touches quite a bit of arch code, it was suggested
by Kalle Valo <kvalo@codeaurora.org> that the whole series should
be merged via the arm-soc tree.

* tag 'omap-for-v4.1/wl12xx-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  wlcore: remove wl12xx_platform_data
  ARM: dts: add wl12xx/wl18xx bindings
  wlcore: add device-tree support
  dt: bindings: add TI's wilink wireless device
  wl12xx: use frequency instead of enumerations for pdata clocks
  wlcore: set irq_trigger in board files instead of hiding behind a quirk
  + Linux 4.0-rc4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6054ef25 83c3a7d4

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

	};