| Message ID | 1395790482-3957-3-git-send-email-dinguyen@altera.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2014-03-25 at 18:34 -0500, dinguyen@altera.com wrote: > > - #size-cells = <1>; > - compatible = "altr,socfpga-stmmac"; > - altr,sysmgr-syscon = <&sysmgr 0x60>; > + gmac0: ethernet@ff700000 { > + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; > status = "disabled"; > - ranges; > - > - gmac0: gmac0@ff700000 { > - compatible = "snps,dwmac-3.70a", "snps,dwmac"; > - reg = <0xff700000 0x2000>; > - interrupts = <0 115 4>; > - interrupt-names = "macirq"; > - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ > - clocks = <&emac0_clk>; > - clock-names = "stmmaceth"; > - }; > + altr,sysmgr-syscon = <&sysmgr 0x60>; > + reg = <0xff700000 0x2000>; > + interrupts = <0 115 4>; > + interrupt-names = "macirq"; > + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ > + clocks = <&emac0_clk>; > + clock-names = "stmmaceth"; > }; not strictly related to this patch, but noticed in bypassing: is the 'clocks' spec correct? ISTR that 'emac0_clk' is the PLL output, while the gated clock for the EMAC IP block is named 'emac_0_clk' (note the extra underscore) virtually yours Gerhard Sittig
On 03/26/2014 05:12 PM, Gerhard Sittig wrote: > On Tue, 2014-03-25 at 18:34 -0500, dinguyen@altera.com wrote: >> >> - #size-cells = <1>; >> - compatible = "altr,socfpga-stmmac"; >> - altr,sysmgr-syscon = <&sysmgr 0x60>; >> + gmac0: ethernet@ff700000 { >> + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; >> status = "disabled"; >> - ranges; >> - >> - gmac0: gmac0@ff700000 { >> - compatible = "snps,dwmac-3.70a", "snps,dwmac"; >> - reg = <0xff700000 0x2000>; >> - interrupts = <0 115 4>; >> - interrupt-names = "macirq"; >> - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ >> - clocks = <&emac0_clk>; >> - clock-names = "stmmaceth"; >> - }; >> + altr,sysmgr-syscon = <&sysmgr 0x60>; >> + reg = <0xff700000 0x2000>; >> + interrupts = <0 115 4>; >> + interrupt-names = "macirq"; >> + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ >> + clocks = <&emac0_clk>; >> + clock-names = "stmmaceth"; >> }; > > not strictly related to this patch, but noticed in bypassing: > > is the 'clocks' spec correct? ISTR that 'emac0_clk' is the PLL > output, while the gated clock for the EMAC IP block is named > 'emac_0_clk' (note the extra underscore) > Yes, you're right. Thanks for catching that. Dinh > > virtually yours > Gerhard Sittig > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 404553c..953801c 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -450,43 +450,28 @@ }; }; - ethernet0: ethernet0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; + gmac0: ethernet@ff700000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - - gmac0: gmac0@ff700000 { - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff700000 0x2000>; - interrupts = <0 115 4>; - interrupt-names = "macirq"; - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac0_clk>; - clock-names = "stmmaceth"; - }; + altr,sysmgr-syscon = <&sysmgr 0x60>; + reg = <0xff700000 0x2000>; + interrupts = <0 115 4>; + interrupt-names = "macirq"; + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ + clocks = <&emac0_clk>; + clock-names = "stmmaceth"; }; - ethernet1: ethernet1 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; + gmac1: ethernet@ff702000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - - gmac1: gmac1@ff702000 { - device_type = "network"; - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff702000 0x2000>; - interrupts = <0 120 4>; - interrupt-names = "macirq"; - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac1_clk>; - clock-names = "stmmaceth"; - }; + altr,sysmgr-syscon = <&sysmgr 0x60>; + reg = <0xff702000 0x2000>; + interrupts = <0 120 4>; + interrupt-names = "macirq"; + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ + clocks = <&emac1_clk>; + clock-names = "stmmaceth"; }; L2: l2-cache@fffef000 { diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts index 2d6b38b..a87ee1c 100644 --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts @@ -46,11 +46,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index 26c63a0..ae16d97 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -39,11 +39,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 469bb5c..b79e2a2 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts @@ -39,11 +39,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts index 91f6ccf..87d6f75 100644 --- a/arch/arm/boot/dts/socfpga_vt.dts +++ b/arch/arm/boot/dts/socfpga_vt.dts @@ -87,10 +87,7 @@ }; }; -ðernet0 { - status = "okay"; -}; - &gmac0 { + status = "okay"; phy-mode = "gmii"; };