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

Commit 746c6baf authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-q.156 (d3432184) into msm-4.14"

parents 905523b6 3c563a8a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ Example:
			};
		};

		port@10 {
		port@a {
			reg = <10>;

			adv7482_txa: endpoint {
@@ -83,7 +83,7 @@ Example:
			};
		};

		port@11 {
		port@b {
			reg = <11>;

			adv7482_txb: endpoint {
+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ Optional properties:
- interrupt-names: must be "mdio_done_error" when there is a share interrupt fed
  to this hardware block, or must be "mdio_done" for the first interrupt and
  "mdio_error" for the second when there are separate interrupts
- clocks: A reference to the clock supplying the MDIO bus controller
- clock-frequency: the MDIO bus clock that must be output by the MDIO bus
  hardware, if absent, the default hardware values are used

Child nodes of this MDIO bus controller node are standard Ethernet PHY device
nodes as described in Documentation/devicetree/bindings/net/phy.txt
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 154
SUBLEVEL = 156
EXTRAVERSION =
NAME = Petit Gorille

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@
#include <linux/string.h>
#include <asm/byteorder.h>

#define INT_MAX			((int)(~0U>>1))

typedef __be16 fdt16_t;
typedef __be32 fdt32_t;
typedef __be64 fdt64_t;
+6 −6
Original line number Diff line number Diff line
@@ -724,6 +724,7 @@
	pinctrl-0 = <&cpsw_default>;
	pinctrl-1 = <&cpsw_sleep>;
	status = "okay";
	slaves = <1>;
};

&davinci_mdio {
@@ -731,15 +732,14 @@
	pinctrl-0 = <&davinci_mdio_default>;
	pinctrl-1 = <&davinci_mdio_sleep>;
	status = "okay";
};

&cpsw_emac0 {
	phy_id = <&davinci_mdio>, <0>;
	phy-mode = "rgmii-txid";
	ethphy0: ethernet-phy@0 {
		reg = <0>;
	};
};

&cpsw_emac1 {
	phy_id = <&davinci_mdio>, <1>;
&cpsw_emac0 {
	phy-handle = <&ethphy0>;
	phy-mode = "rgmii-txid";
};

Loading