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

Commit 241b5f7f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Merge some updates from Scott:

"This contains an 8xx compilation fix, and a dpaa device tree fix."
parents 70b5c4ee bd964612

arch/powerpc/boot/dts/fsl/t2080rdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ 


		mdio@fd000 {

			xg_cs4315_phy1: ethernet-phy@c {

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

				compatible = "ethernet-phy-id13e5.1002";

				reg = <0xc>;

			};



			xg_cs4315_phy2: ethernet-phy@d {

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

				compatible = "ethernet-phy-id13e5.1002";

				reg = <0xd>;

			};

arch/powerpc/boot/dts/fsl/t4240rdb.dts

+4 −4
Original line number Diff line number Diff line
@@ -267,22 +267,22 @@ 


			mdio@fd000 {

				xfiphy1: ethernet-phy@10 {

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

					compatible = "ethernet-phy-id13e5.1002";

					reg = <0x10>;

				};



				xfiphy2: ethernet-phy@11 {

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

					compatible = "ethernet-phy-id13e5.1002";

					reg = <0x11>;

				};



				xfiphy3: ethernet-phy@13 {

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

					compatible = "ethernet-phy-id13e5.1002";

					reg = <0x13>;

				};



				xfiphy4: ethernet-phy@12 {

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

					compatible = "ethernet-phy-id13e5.1002";

					reg = <0x12>;

				};

			};

arch/powerpc/configs/dpaa.config

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ CONFIG_FSL_DPAA=y 
CONFIG_FSL_PAMU=y

CONFIG_FSL_FMAN=y

CONFIG_FSL_DPAA_ETH=y

CONFIG_CORTINA_PHY=y