Commit 188de5dd authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'net-next/master' into mac80211-next 



Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 5207ca55 abf1a08f

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1
Original line number Diff line number Diff line 
Device-Tree bindings for input/gpio_keys.c keyboard driver

Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver



Required properties:

	- compatible = "gpio-keys";

Documentation/devicetree/bindings/mips/mscc.txt

+16 −0
Original line number Diff line number Diff line
@@ -41,3 +41,19 @@ Example: 
		compatible = "mscc,ocelot-cpu-syscon", "syscon";

		reg = <0x70000000 0x2c>;

	};



o HSIO regs:



The SoC has a few registers (HSIO) handling miscellaneous functionalities:

configuration and status of PLL5, RCOMP, SyncE, SerDes configurations and

status, SerDes muxing and a thermal sensor.



Required properties:

- compatible: Should be "mscc,ocelot-hsio", "syscon", "simple-mfd"

- reg : Should contain registers location and length



Example:

	syscon@10d0000 {

		compatible = "mscc,ocelot-hsio", "syscon", "simple-mfd";

		reg = <0x10d0000 0x10000>;

	};

Documentation/devicetree/bindings/net/mscc-ocelot.txt

+3 −6
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ Required properties: 
  - "sys"

  - "rew"

  - "qs"

  - "hsio"

  - "qsys"

  - "ana"

  - "portX" with X from 0 to the number of last port index available on that
@@ -45,7 +44,6 @@ Example: 
		reg = <0x1010000 0x10000>,

		      <0x1030000 0x10000>,

		      <0x1080000 0x100>,

		      <0x10d0000 0x10000>,

		      <0x11e0000 0x100>,

		      <0x11f0000 0x100>,

		      <0x1200000 0x100>,
@@ -59,10 +57,9 @@ Example: 
		      <0x1280000 0x100>,

		      <0x1800000 0x80000>,

		      <0x1880000 0x10000>;

		reg-names = "sys", "rew", "qs", "hsio", "port0",

			    "port1", "port2", "port3", "port4", "port5",

			    "port6", "port7", "port8", "port9", "port10",

			    "qsys", "ana";

		reg-names = "sys", "rew", "qs", "port0", "port1", "port2",

			    "port3", "port4", "port5", "port6", "port7",

			    "port8", "port9", "port10", "qsys", "ana";

		interrupts = <21 22>;

		interrupt-names = "xtr", "inj";

Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
Microsemi Ocelot SerDes muxing driver

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



On Microsemi Ocelot, there is a handful of registers in HSIO address

space for setting up the SerDes to switch port muxing.



A SerDes X can be "muxed" to work with switch port Y or Z for example.

One specific SerDes can also be used as a PCIe interface.



Hence, a SerDes represents an interface, be it an Ethernet or a PCIe one.



There are two kinds of SerDes: SERDES1G supports 10/100Mbps in

half/full-duplex and 1000Mbps in full-duplex mode while SERDES6G supports

10/100Mbps in half/full-duplex and 1000/2500Mbps in full-duplex mode.



Also, SERDES6G number (aka "macro") 0 is the only interface supporting

QSGMII.



This is a child of the HSIO syscon ("mscc,ocelot-hsio", see

Documentation/devicetree/bindings/mips/mscc.txt) on the Microsemi Ocelot.



Required properties:



- compatible: should be "mscc,vsc7514-serdes"

- #phy-cells : from the generic phy bindings, must be 2.

	       The first number defines the input port to use for a given

	       SerDes macro. The second defines the macro to use. They are

	       defined in dt-bindings/phy/phy-ocelot-serdes.h



Example:



	serdes: serdes {

		compatible = "mscc,vsc7514-serdes";

		#phy-cells = <2>;

	};



	ethernet {

		port1 {

			phy-handle = <&phy_foo>;

			/* Link SERDES1G_5 to port1 */

			phys = <&serdes 1 SERDES1G_5>;

		};

	};

Documentation/fb/uvesafb.txt

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ than x86. Check the v86d documentation for a list of currently supported 
arches.



v86d source code can be downloaded from the following website:

  http://dev.gentoo.org/~spock/projects/uvesafb



  https://github.com/mjanusz/v86d



Please refer to the v86d documentation for detailed configuration and

installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo. 


--

 Michal Januszewski <spock@gentoo.org>

 Last updated: 2009-03-30

 Last updated: 2017-10-10



 Documentation of the uvesafb options is loosely based on vesafb.txt.