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

Commit 9f234b8c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-p.62 (366527f0) into msm-4.14"

parents 0380ccab c1085cd6

Documentation/devicetree/bindings/net/dsa/qca8k.txt

+22 −1
Original line number Diff line number Diff line
@@ -2,7 +2,10 @@ 


Required properties:



- compatible: should be "qca,qca8337"

- compatible: should be one of:

    "qca,qca8334"

    "qca,qca8337"



- #size-cells: must be 0

- #address-cells: must be 1
@@ -14,6 +17,20 @@ port and PHY id, each subnode describing a port needs to have a valid phandle 
referencing the internal PHY connected to it. The CPU port of this switch is

always port 0.



A CPU port node has the following optional node:



- fixed-link            : Fixed-link subnode describing a link to a non-MDIO

                          managed entity. See

                          Documentation/devicetree/bindings/net/fixed-link.txt

                          for details.



For QCA8K the 'fixed-link' sub-node supports only the following properties:



- 'speed' (integer, mandatory), to indicate the link speed. Accepted

  values are 10, 100 and 1000

- 'full-duplex' (boolean, optional), to indicate that full duplex is

  used. When absent, half duplex is assumed.



Example:
@@ -53,6 +70,10 @@ Example: 
					label = "cpu";

					ethernet = <&gmac1>;

					phy-mode = "rgmii";

					fixed-link {

						speed = 1000;

						full-duplex;

					};

				};



				port@1 {

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties on all platforms: 
			- "amlogic,meson6-dwmac"

			- "amlogic,meson8b-dwmac"

			- "amlogic,meson-gxbb-dwmac"

			- "amlogic,meson-axg-dwmac"

		Additionally "snps,dwmac" and any applicable more

		detailed version number described in net/stmmac.txt

		should be used.

Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ 
Required properties for the root node:

 - compatible: one of "amlogic,meson8-cbus-pinctrl"

		      "amlogic,meson8b-cbus-pinctrl"

		      "amlogic,meson8m2-cbus-pinctrl"

		      "amlogic,meson8-aobus-pinctrl"

		      "amlogic,meson8b-aobus-pinctrl"

		      "amlogic,meson8m2-aobus-pinctrl"

		      "amlogic,meson-gxbb-periphs-pinctrl"

		      "amlogic,meson-gxbb-aobus-pinctrl"

		      "amlogic,meson-gxl-periphs-pinctrl"

Documentation/vfio-mediated-device.txt

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ The functions in the mdev_parent_ops structure are as follows: 
* create: allocate basic resources in a driver for a mediated device

* remove: free resources in a driver when a mediated device is destroyed



(Note that mdev-core provides no implicit serialization of create/remove

callbacks per mdev parent device, per mdev type, or any other categorization.

Vendor drivers are expected to be fully asynchronous in this respect or

provide their own internal resource protection.)



The callbacks in the mdev_parent_ops structure are as follows:



* open: open callback of mediated device

Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 56

SUBLEVEL = 62

EXTRAVERSION =

NAME = Petit Gorille
@@ -667,6 +667,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)