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

Commit 499e49b6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'spi-fix-v4.5-rc4' into spi-imx 

spi: Fixes for v4.5

A small clutch of driver specific fixes.  The OMAP one is a bit worrying
since it seems to be triggered by some changes in the runtime PM core
code and I suspect there's other drivers across that are going to be
using the same pattern outside of OMAP but nothing seems to be coming up
in the testing people are doing.
parents 6aa800ca 4dd638f8

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> 
Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Documentation/Intel-IOMMU.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Linux IOMMU Support 


The architecture spec can be obtained from the below location.



http://www.intel.com/technology/virtualization/

http://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/vt-directed-io-spec.pdf



This guide gives a quick cheat sheet for some basic understanding.

Documentation/cgroup-v2.txt

+4 −0
Original line number Diff line number Diff line
@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back. 
		Amount of memory used to cache filesystem data,

		including tmpfs and shared memory.



	  sock



		Amount of memory used in network transmission buffers



	  file_mapped



		Amount of cached filesystem data mapped with mmap()

Documentation/devicetree/bindings/net/brcm,bcmgenet.txt

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ ethernet@f0b60000 { 
		phy1: ethernet-phy@1 {

			max-speed = <1000>;

			reg = <0x1>;

			compatible = "brcm,28nm-gphy", "ethernet-phy-ieee802.3-c22";

			compatible = "ethernet-phy-ieee802.3-c22";

		};

	};

};
@@ -115,7 +115,7 @@ ethernet@f0ba0000 { 
		phy0: ethernet-phy@0 {

			max-speed = <1000>;

			reg = <0x0>;

			compatible = "brcm,bcm53125", "ethernet-phy-ieee802.3-c22";

			compatible = "ethernet-phy-ieee802.3-c22";

		};

	};

};

Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

+1 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ Required properties: 
- compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2".

  "hisilicon,hns-dsaf-v1" is for hip05.

  "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612.

- dsa-name: dsa fabric name who provide this interface.

  should be "dsafX", X is the dsaf id.

- mode: dsa fabric mode string. only support one of dsaf modes like these:

		"2port-64vf",

		"6port-16rss",
@@ -26,9 +24,8 @@ Required properties: 


Example:



dsa: dsa@c7000000 {

dsaf0: dsa@c7000000 {

	compatible = "hisilicon,hns-dsaf-v1";

	dsa_name = "dsaf0";

	mode = "6port-16rss";

	interrupt-parent = <&mbigen_dsa>;

	reg = <0x0 0xC0000000 0x0 0x420000