| Message ID | 1364580879-4297-3-git-send-email-florian@openwrt.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 29, 2013 at 07:14:37PM +0100, 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> > --- > arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ > arch/arm/mach-kirkwood/common.c | 4 ++-- > 2 files changed, 48 insertions(+), 2 deletions(-) > ... > diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c > index 49792a0..a606f9f 100644 > --- a/arch/arm/mach-kirkwood/common.c > +++ b/arch/arm/mach-kirkwood/common.c > @@ -251,8 +251,8 @@ void __init kirkwood_clk_init(void) > /* clkdev entries, mapping clks to devices */ > orion_clkdev_add(NULL, "orion_spi.0", runit); > orion_clkdev_add(NULL, "orion_spi.1", runit); > - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0); > - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1); > + orion_clkdev_add("0", MV643XX_ETH_NAME ".0", ge0); > + orion_clkdev_add("1", MV643XX_ETH_NAME ".1", ge1); Your first patch is going to go through David's tree, and I'd like to prevent any hard dependency between his tree and arm-soc. Can this change be pulled out and applied separately? At first glance, it looks like a fix to match sata and pcie. thx, Jason.
Le 03/29/13 19:48, Jason Cooper a écrit : > On Fri, Mar 29, 2013 at 07:14:37PM +0100, 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> >> --- >> arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ >> arch/arm/mach-kirkwood/common.c | 4 ++-- >> 2 files changed, 48 insertions(+), 2 deletions(-) >> > ... >> diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c >> index 49792a0..a606f9f 100644 >> --- a/arch/arm/mach-kirkwood/common.c >> +++ b/arch/arm/mach-kirkwood/common.c >> @@ -251,8 +251,8 @@ void __init kirkwood_clk_init(void) >> /* clkdev entries, mapping clks to devices */ >> orion_clkdev_add(NULL, "orion_spi.0", runit); >> orion_clkdev_add(NULL, "orion_spi.1", runit); >> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0); >> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1); >> + orion_clkdev_add("0", MV643XX_ETH_NAME ".0", ge0); >> + orion_clkdev_add("1", MV643XX_ETH_NAME ".1", ge1); > > Your first patch is going to go through David's tree, and I'd like to > prevent any hard dependency between his tree and arm-soc. Can this > change be pulled out and applied separately? At first glance, it looks > like a fix to match sata and pcie. I just actually did the same thing as what SATA has (two clocks with names), define a clock name "0" and "1" (is not that too generic BTW?) for ge0 and ge1. But I don't think this change is required. -- Florian
Le 03/29/13 19:14, Florian Fainelli a écrit : > 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> > --- [snip] > + > + ethernet-group@70000 { This one is off-by 0x2000 and should have been 72000 > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "marvell,mv643xx-eth-block"; > + reg = <0x70000 0x4000>; Same here > + 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@74000 { And here, it should be 76000 > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "marvell,mv643xx-eth-block"; > + reg = <0x74000 0x4000>; And here too. -- Florian
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index fada7e6..e0860f8 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@70000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,mv643xx-eth-block"; + reg = <0x70000 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@74000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "marvell,mv643xx-eth-block"; + reg = <0x74000 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"; + }; + }; }; }; diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 49792a0..a606f9f 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -251,8 +251,8 @@ void __init kirkwood_clk_init(void) /* clkdev entries, mapping clks to devices */ orion_clkdev_add(NULL, "orion_spi.0", runit); orion_clkdev_add(NULL, "orion_spi.1", runit); - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0); - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1); + orion_clkdev_add("0", MV643XX_ETH_NAME ".0", ge0); + orion_clkdev_add("1", MV643XX_ETH_NAME ".1", ge1); orion_clkdev_add(NULL, "orion_wdt", tclk); orion_clkdev_add("0", "sata_mv.0", sata0); orion_clkdev_add("1", "sata_mv.0", sata1);
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> --- arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ arch/arm/mach-kirkwood/common.c | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-)