| Message ID | 1263456799-3306-1-git-send-email-yu.liu@freescale.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jan 14, 2010 at 1:13 AM, Liu Yu <yu.liu@freescale.com> wrote: > After these change, when need to work in rtbi mode, > just change phy-connection-type to "rtbi". > > Also, this work can be done by u-boot. > > Signed-off-by: Liu Yu <yu.liu@freescale.com> Looks okay by me, Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > arch/powerpc/boot/dts/mpc8569mds.dts | 47 ++++++++++++++++++++++++++++++--- > 1 files changed, 42 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts > index 795eb36..8b72eaf 100644 > --- a/arch/powerpc/boot/dts/mpc8569mds.dts > +++ b/arch/powerpc/boot/dts/mpc8569mds.dts > @@ -535,6 +535,7 @@ > rx-clock-name = "none"; > tx-clock-name = "clk12"; > pio-handle = <&pio1>; > + tbi-handle = <&tbi1>; > phy-handle = <&qe_phy0>; > phy-connection-type = "rgmii-id"; > }; > @@ -579,7 +580,7 @@ > reg = <0x6>; > device_type = "ethernet-phy"; > }; > - tbi-phy@11 { > + tbi1: tbi-phy@11 { > reg = <0x11>; > device_type = "tbi-phy"; > }; > @@ -590,7 +591,7 @@ > reg = <0x3520 0x18>; > compatible = "fsl,ucc-mdio"; > > - tbi0: tbi-phy@15 { > + tbi6: tbi-phy@15 { > reg = <0x15>; > device_type = "tbi-phy"; > }; > @@ -600,7 +601,7 @@ > #size-cells = <0>; > reg = <0x3720 0x38>; > compatible = "fsl,ucc-mdio"; > - tbi1: tbi-phy@17 { > + tbi8: tbi-phy@17 { > reg = <0x17>; > device_type = "tbi-phy"; > }; > @@ -617,10 +618,22 @@ > rx-clock-name = "none"; > tx-clock-name = "clk12"; > pio-handle = <&pio3>; > + tbi-handle = <&tbi3>; > phy-handle = <&qe_phy2>; > phy-connection-type = "rgmii-id"; > }; > > + mdio@2320 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x2320 0x18>; > + compatible = "fsl,ucc-mdio"; > + tbi3: tbi-phy@11 { > + reg = <0x11>; > + device_type = "tbi-phy"; > + }; > + }; > + > enet1: ucc@3000 { > device_type = "network"; > compatible = "ucc_geth"; > @@ -632,10 +645,22 @@ > rx-clock-name = "none"; > tx-clock-name = "clk17"; > pio-handle = <&pio2>; > + tbi-handle = <&tbi2>; > phy-handle = <&qe_phy1>; > phy-connection-type = "rgmii-id"; > }; > > + mdio@3120 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x3120 0x18>; > + compatible = "fsl,ucc-mdio"; > + tbi2: tbi-phy@11 { > + reg = <0x11>; > + device_type = "tbi-phy"; > + }; > + }; > + > enet3: ucc@3200 { > device_type = "network"; > compatible = "ucc_geth"; > @@ -647,10 +672,22 @@ > rx-clock-name = "none"; > tx-clock-name = "clk17"; > pio-handle = <&pio4>; > + tbi-handle = <&tbi4>; > phy-handle = <&qe_phy3>; > phy-connection-type = "rgmii-id"; > }; > > + mdio@3320 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x3320 0x18>; > + compatible = "fsl,ucc-mdio"; > + tbi4: tbi-phy@11 { > + reg = <0x11>; > + device_type = "tbi-phy"; > + }; > + }; > + > enet5: ucc@3400 { > device_type = "network"; > compatible = "ucc_geth"; > @@ -661,7 +698,7 @@ > local-mac-address = [ 00 00 00 00 00 00 ]; > rx-clock-name = "none"; > tx-clock-name = "none"; > - tbi-handle = <&tbi0>; > + tbi-handle = <&tbi6>; > phy-handle = <&qe_phy5>; > phy-connection-type = "sgmii"; > }; > @@ -676,7 +713,7 @@ > local-mac-address = [ 00 00 00 00 00 00 ]; > rx-clock-name = "none"; > tx-clock-name = "none"; > - tbi-handle = <&tbi1>; > + tbi-handle = <&tbi8>; > phy-handle = <&qe_phy7>; > phy-connection-type = "sgmii"; > }; > -- > 1.6.4 > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev >
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts index 795eb36..8b72eaf 100644 --- a/arch/powerpc/boot/dts/mpc8569mds.dts +++ b/arch/powerpc/boot/dts/mpc8569mds.dts @@ -535,6 +535,7 @@ rx-clock-name = "none"; tx-clock-name = "clk12"; pio-handle = <&pio1>; + tbi-handle = <&tbi1>; phy-handle = <&qe_phy0>; phy-connection-type = "rgmii-id"; }; @@ -579,7 +580,7 @@ reg = <0x6>; device_type = "ethernet-phy"; }; - tbi-phy@11 { + tbi1: tbi-phy@11 { reg = <0x11>; device_type = "tbi-phy"; }; @@ -590,7 +591,7 @@ reg = <0x3520 0x18>; compatible = "fsl,ucc-mdio"; - tbi0: tbi-phy@15 { + tbi6: tbi-phy@15 { reg = <0x15>; device_type = "tbi-phy"; }; @@ -600,7 +601,7 @@ #size-cells = <0>; reg = <0x3720 0x38>; compatible = "fsl,ucc-mdio"; - tbi1: tbi-phy@17 { + tbi8: tbi-phy@17 { reg = <0x17>; device_type = "tbi-phy"; }; @@ -617,10 +618,22 @@ rx-clock-name = "none"; tx-clock-name = "clk12"; pio-handle = <&pio3>; + tbi-handle = <&tbi3>; phy-handle = <&qe_phy2>; phy-connection-type = "rgmii-id"; }; + mdio@2320 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x2320 0x18>; + compatible = "fsl,ucc-mdio"; + tbi3: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + enet1: ucc@3000 { device_type = "network"; compatible = "ucc_geth"; @@ -632,10 +645,22 @@ rx-clock-name = "none"; tx-clock-name = "clk17"; pio-handle = <&pio2>; + tbi-handle = <&tbi2>; phy-handle = <&qe_phy1>; phy-connection-type = "rgmii-id"; }; + mdio@3120 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3120 0x18>; + compatible = "fsl,ucc-mdio"; + tbi2: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + enet3: ucc@3200 { device_type = "network"; compatible = "ucc_geth"; @@ -647,10 +672,22 @@ rx-clock-name = "none"; tx-clock-name = "clk17"; pio-handle = <&pio4>; + tbi-handle = <&tbi4>; phy-handle = <&qe_phy3>; phy-connection-type = "rgmii-id"; }; + mdio@3320 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3320 0x18>; + compatible = "fsl,ucc-mdio"; + tbi4: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + enet5: ucc@3400 { device_type = "network"; compatible = "ucc_geth"; @@ -661,7 +698,7 @@ local-mac-address = [ 00 00 00 00 00 00 ]; rx-clock-name = "none"; tx-clock-name = "none"; - tbi-handle = <&tbi0>; + tbi-handle = <&tbi6>; phy-handle = <&qe_phy5>; phy-connection-type = "sgmii"; }; @@ -676,7 +713,7 @@ local-mac-address = [ 00 00 00 00 00 00 ]; rx-clock-name = "none"; tx-clock-name = "none"; - tbi-handle = <&tbi1>; + tbi-handle = <&tbi8>; phy-handle = <&qe_phy7>; phy-connection-type = "sgmii"; };
After these change, when need to work in rtbi mode, just change phy-connection-type to "rtbi". Also, this work can be done by u-boot. Signed-off-by: Liu Yu <yu.liu@freescale.com> --- arch/powerpc/boot/dts/mpc8569mds.dts | 47 ++++++++++++++++++++++++++++++--- 1 files changed, 42 insertions(+), 5 deletions(-)