| Message ID | 1365071235-11611-4-git-send-email-florian@openwrt.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Florian, On Thu, Apr 04, 2013 at 12:27:13PM +0200, Florian Fainelli wrote: > This patch modifies kirkwood.dtsi to specify the various gigabit > interfaces nodes available on kirkwood devices. They are disabled by > default and should be enabled on a per-board basis. egiga0 and egiga1 > aliases are defined for convenience. The mdio node is also present and > should be enabled on a per-board basis as well. > > Signed-off-by: Florian Fainelli <florian@openwrt.org> > --- > Changes since v1: > - dropped change to arch/arm/mach-kirkwood/common.c to avoid merge conflicts I think we should remove the clock aliases in kirkwood_legacy_clk_init() in mach-kirkwood/dt-board.c (once we have proper clock support, see my other mail). > - fixed off-by 0x2000 ethernet-group nodes address > > arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi > index fada7e6..254f5a8 100644 > --- a/arch/arm/boot/dts/kirkwood.dtsi > +++ b/arch/arm/boot/dts/kirkwood.dtsi > @@ -7,6 +7,8 @@ > aliases { > gpio0 = &gpio0; > gpio1 = &gpio1; > + egiga0 = &egiga0; > + egiga1 = &egiga1; > }; > intc: interrupt-controller { > compatible = "marvell,orion-intc", "marvell,intc"; > @@ -202,5 +204,49 @@ > clocks = <&gate_clk 4>; > status = "disabled"; > }; > + > + mdio@72004 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "marvell,orion-mdio"; > + reg = <0x72004 0x84>; Don't we need to add: interrupts = <46>; here? - Simon
Le 04/04/13 23:35, Simon Baatz a écrit : > Hi Florian, > > On Thu, Apr 04, 2013 at 12:27:13PM +0200, Florian Fainelli wrote: >> This patch modifies kirkwood.dtsi to specify the various gigabit >> interfaces nodes available on kirkwood devices. They are disabled by >> default and should be enabled on a per-board basis. egiga0 and egiga1 >> aliases are defined for convenience. The mdio node is also present and >> should be enabled on a per-board basis as well. >> >> Signed-off-by: Florian Fainelli <florian@openwrt.org> >> --- >> Changes since v1: >> - dropped change to arch/arm/mach-kirkwood/common.c to avoid merge conflicts > > I think we should remove the clock aliases in > kirkwood_legacy_clk_init() in mach-kirkwood/dt-board.c (once we have > proper clock support, see my other mail). > [snip] > > Don't we need to add: > > interrupts = <46>; > > here? Right this is missing, in fact it still works ok because the orion-mdio driver can do busy waiting instead of interrupt signaling. Will fix that in the next round, thanks! -- Florian
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index fada7e6..254f5a8 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -7,6 +7,8 @@ aliases { gpio0 = &gpio0; gpio1 = &gpio1; + egiga0 = &egiga0; + egiga1 = &egiga1; }; intc: interrupt-controller { compatible = "marvell,orion-intc", "marvell,intc"; @@ -202,5 +204,49 @@ clocks = <&gate_clk 4>; status = "disabled"; }; + + mdio@72004 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,orion-mdio"; + reg = <0x72004 0x84>; + status = "disabled"; + }; + + ethernet-group@72000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,mv643xx-eth-block"; + reg = <0x72000 0x4000>; + tx-csum-limit = <1600>; + status = "disabled"; + + egiga0: egiga0@0 { + device_type = "network"; + compatible = "marvell,mv643xx-eth"; + reg = <0>; + interrupts = <11>; + clocks = <&gate_clk 0>; + clock-names = "0"; + }; + }; + + ethernet-group@76000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,mv643xx-eth-block"; + reg = <0x76000 0x4000>; + tx-csum-limit = <1600>; + status = "disabled"; + + egiga1: egiga1@0 { + device_type = "network"; + compatible = "marvell,mv643xx-eth"; + reg = <0>; + interrupts = <15>; + clocks = <&gate_clk 19>; + clock-names = "1"; + }; + }; }; };
This patch modifies kirkwood.dtsi to specify the various gigabit interfaces nodes available on kirkwood devices. They are disabled by default and should be enabled on a per-board basis. egiga0 and egiga1 aliases are defined for convenience. The mdio node is also present and should be enabled on a per-board basis as well. Signed-off-by: Florian Fainelli <florian@openwrt.org> --- Changes since v1: - dropped change to arch/arm/mach-kirkwood/common.c to avoid merge conflicts - fixed off-by 0x2000 ethernet-group nodes address arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)