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

Commit b41877da authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.117 (8b21e85d) into msm-4.9"

parents d5ad663c a5718e30

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"

 - reg: address and size of registers controlling irq functionality

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 116

SUBLEVEL = 117

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/emev2.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

			clock-frequency = <533000000>;

		};

		cpu@1 {

		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;
@@ -56,6 +56,7 @@ 
		compatible = "arm,cortex-a9-pmu";

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>, <&cpu1>;

	};



	clocks@e0110000 {