p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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."
This commit is contained in:
Michael Ellerman 2018-08-13 16:06:23 +10:00
parent 70b5c4ee8e bd96461249
commit 241b5f7ffc
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/boot/dts/fsl/t2080rdb.dts
View File

@ -97,12 +97,12 @@ rgmii_phy2: ethernet-phy@2 {
mdio@fd000 { mdio@fd000 {
xg_cs4315_phy1: ethernet-phy@c { xg_cs4315_phy1: ethernet-phy@c {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0xc>; reg = <0xc>;
}; };
xg_cs4315_phy2: ethernet-phy@d { xg_cs4315_phy2: ethernet-phy@d {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0xd>; reg = <0xd>;
}; };

8
arch/powerpc/boot/dts/fsl/t4240rdb.dts
View File

@ -267,22 +267,22 @@ sgmiiphy44: ethernet-phy@7 {
mdio@fd000 { mdio@fd000 {
xfiphy1: ethernet-phy@10 { xfiphy1: ethernet-phy@10 {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0x10>; reg = <0x10>;
}; };
xfiphy2: ethernet-phy@11 { xfiphy2: ethernet-phy@11 {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0x11>; reg = <0x11>;
}; };
xfiphy3: ethernet-phy@13 { xfiphy3: ethernet-phy@13 {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0x13>; reg = <0x13>;
}; };
xfiphy4: ethernet-phy@12 { xfiphy4: ethernet-phy@12 {
compatible = "ethernet-phy-ieee802.3-c45"; compatible = "ethernet-phy-id13e5.1002";
reg = <0x12>; reg = <0x12>;
}; };
}; };

1
arch/powerpc/configs/dpaa.config
View File

@ -2,3 +2,4 @@ CONFIG_FSL_DPAA=y
CONFIG_FSL_PAMU=y CONFIG_FSL_PAMU=y
CONFIG_FSL_FMAN=y CONFIG_FSL_FMAN=y
CONFIG_FSL_DPAA_ETH=y CONFIG_FSL_DPAA_ETH=y
CONFIG_CORTINA_PHY=y