| Message ID | 1367538519-23940-3-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 03, 2013 at 01:48:36AM +0200, Sebastian Hesselbarth wrote: > To allow to move to orion irqchip driver, existing legacy devices > have to map their irqs. This patch adds init code to map the > corresponding irqs. It will vanish as soon as there is true device tree > support for mv643xx_eth. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Changelog: > v1->v2: > - split off DT changes (Suggested by Jason Cooper) > > Cc: Grant Likely <grant.likely@linaro.org> > Cc: Rob Herring <rob.herring@calxeda.com> > Cc: Rob Landley <rob@landley.net> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > Cc: Jean-Francois Moine <moinejf@free.fr> > Cc: devicetree-discuss@lists.ozlabs.org > Cc: linux-doc@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/mach-dove/board-dt.c | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c > index fbde1dd..9df6dd7 100644 > --- a/arch/arm/mach-dove/board-dt.c > +++ b/arch/arm/mach-dove/board-dt.c > @@ -12,6 +12,7 @@ > #include <linux/clk-provider.h> > #include <linux/clk/mvebu.h> > #include <linux/of.h> > +#include <linux/of_irq.h> > #include <linux/of_platform.h> > #include <linux/platform_data/usb-ehci-orion.h> > #include <asm/hardware/cache-tauros2.h> > @@ -57,6 +58,34 @@ static struct mv643xx_eth_platform_data dove_dt_ge00_data = { > .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, > }; > > +#define DOVE_GE00_PHYS_BASE 0xf1070000 > + > +static void __init dove_legacy_ge00_init(void) > +{ > + struct device_node *np = of_find_compatible_node(NULL, NULL, > + "marvell,mv643xx-eth-block"); > + int irq_sum, irq_err; > + > + if (!np) > + return; > + > + irq_sum = irq_of_parse_and_map(np, 0); > + if (!irq_sum) { > + pr_err("%s: missing sum irq\n", np->full_name); > + return; > + } > + > + irq_err = irq_of_parse_and_map(np, 1); > + if (!irq_err) { > + pr_err("%s: missing err irq\n", np->full_name); > + return; > + } > + > + /* legacy ge00_init wants phys base */ > + orion_ge00_init(&dove_dt_ge00_data, DOVE_GE00_PHYS_BASE, > + irq_sum, irq_err, 1600); > +} Hi Sebastian I know the above code is throw away, but it might help with getting Kirkwood, Orion5x, mv78xx00 supported if we refactor this code and move most of it into plat-orion/common.c. I could imaging a function orion_ge00_irq_init(struct mv643xx_eth_platform_data *eth_data, unsigned long mapbase, unsigned int tx_csum_limit) which does the irq lookup and then calls orion_ge00_init(). Jason: what is the status of the ethernet driver conversion to DT? Will it get merged this week, or is it material for the next merge window? Andrew
On 05/03/2013 07:06 AM, Andrew Lunn wrote: > On Fri, May 03, 2013 at 01:48:36AM +0200, Sebastian Hesselbarth wrote: >> To allow to move to orion irqchip driver, existing legacy devices >> have to map their irqs. This patch adds init code to map the >> corresponding irqs. It will vanish as soon as there is true device tree >> support for mv643xx_eth. >> >> Signed-off-by: Sebastian Hesselbarth<sebastian.hesselbarth@gmail.com> >> --- >> Changelog: >> v1->v2: >> - split off DT changes (Suggested by Jason Cooper) >> >> Cc: Grant Likely<grant.likely@linaro.org> >> Cc: Rob Herring<rob.herring@calxeda.com> >> Cc: Rob Landley<rob@landley.net> >> Cc: Thomas Gleixner<tglx@linutronix.de> >> Cc: Russell King<linux@arm.linux.org.uk> >> Cc: Arnd Bergmann<arnd@arndb.de> >> Cc: Jason Cooper<jason@lakedaemon.net> >> Cc: Andrew Lunn<andrew@lunn.ch> >> Cc: Jason Gunthorpe<jgunthorpe@obsidianresearch.com> >> Cc: Thomas Petazzoni<thomas.petazzoni@free-electrons.com> >> Cc: Gregory Clement<gregory.clement@free-electrons.com> >> Cc: Ezequiel Garcia<ezequiel.garcia@free-electrons.com> >> Cc: Jean-Francois Moine<moinejf@free.fr> >> Cc: devicetree-discuss@lists.ozlabs.org >> Cc: linux-doc@vger.kernel.org >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> --- >> arch/arm/mach-dove/board-dt.c | 31 ++++++++++++++++++++++++++++++- >> 1 file changed, 30 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c >> index fbde1dd..9df6dd7 100644 >> --- a/arch/arm/mach-dove/board-dt.c >> +++ b/arch/arm/mach-dove/board-dt.c >> @@ -12,6 +12,7 @@ >> #include<linux/clk-provider.h> >> #include<linux/clk/mvebu.h> >> #include<linux/of.h> >> +#include<linux/of_irq.h> >> #include<linux/of_platform.h> >> #include<linux/platform_data/usb-ehci-orion.h> >> #include<asm/hardware/cache-tauros2.h> >> @@ -57,6 +58,34 @@ static struct mv643xx_eth_platform_data dove_dt_ge00_data = { >> .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, >> }; >> >> +#define DOVE_GE00_PHYS_BASE 0xf1070000 >> + >> +static void __init dove_legacy_ge00_init(void) >> +{ >> + struct device_node *np = of_find_compatible_node(NULL, NULL, >> + "marvell,mv643xx-eth-block"); >> + int irq_sum, irq_err; >> + >> + if (!np) >> + return; >> + >> + irq_sum = irq_of_parse_and_map(np, 0); >> + if (!irq_sum) { >> + pr_err("%s: missing sum irq\n", np->full_name); >> + return; >> + } >> + >> + irq_err = irq_of_parse_and_map(np, 1); >> + if (!irq_err) { >> + pr_err("%s: missing err irq\n", np->full_name); >> + return; >> + } >> + >> + /* legacy ge00_init wants phys base */ >> + orion_ge00_init(&dove_dt_ge00_data, DOVE_GE00_PHYS_BASE, >> + irq_sum, irq_err, 1600); >> +} > > Hi Sebastian > > I know the above code is throw away, but it might help with getting > Kirkwood, Orion5x, mv78xx00 supported if we refactor this code and > move most of it into plat-orion/common.c. I could imaging a function > > orion_ge00_irq_init(struct mv643xx_eth_platform_data *eth_data, > unsigned long mapbase, unsigned int tx_csum_limit) > > which does the irq lookup and then calls orion_ge00_init(). Andrew, sure. Feel free to move legacy code to where all SoCs can use it. > Jason: what is the status of the ethernet driver conversion to DT? > Will it get merged this week, or is it material for the next merge > window? What I remember from Florian's work it was close to be released. I never saw Florian sending an update to his patches, maybe he ran out of time? I guess DT timer will be a quick patch when we have all SoCs running on DT irqchip and maybe Florian can update his patches even before we sort out Thomas request. Then we could also merge DT timer within this patch set and get rid of legacy helpers before we even introduce them. Sebastian
On Fri, May 03, 2013 at 07:06:32AM +0200, Andrew Lunn wrote: > Jason: what is the status of the ethernet driver conversion to DT? > Will it get merged this week, or is it material for the next merge > window? You'd have to ask Florian/David Miller. I'm not sure wether David was able to pull that in for v3.10 or not. He was pretty responsive to all of the other changes Florian posted. thx, Jason.
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index fbde1dd..9df6dd7 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -12,6 +12,7 @@ #include <linux/clk-provider.h> #include <linux/clk/mvebu.h> #include <linux/of.h> +#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_data/usb-ehci-orion.h> #include <asm/hardware/cache-tauros2.h> @@ -57,6 +58,34 @@ static struct mv643xx_eth_platform_data dove_dt_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, }; +#define DOVE_GE00_PHYS_BASE 0xf1070000 + +static void __init dove_legacy_ge00_init(void) +{ + struct device_node *np = of_find_compatible_node(NULL, NULL, + "marvell,mv643xx-eth-block"); + int irq_sum, irq_err; + + if (!np) + return; + + irq_sum = irq_of_parse_and_map(np, 0); + if (!irq_sum) { + pr_err("%s: missing sum irq\n", np->full_name); + return; + } + + irq_err = irq_of_parse_and_map(np, 1); + if (!irq_err) { + pr_err("%s: missing err irq\n", np->full_name); + return; + } + + /* legacy ge00_init wants phys base */ + orion_ge00_init(&dove_dt_ge00_data, DOVE_GE00_PHYS_BASE, + irq_sum, irq_err, 1600); +} + static void __init dove_dt_init(void) { pr_info("Dove 88AP510 SoC\n"); @@ -70,7 +99,7 @@ static void __init dove_dt_init(void) dove_of_clk_init(); /* Internal devices not ported to DT yet */ - dove_ge00_init(&dove_dt_ge00_data); + dove_legacy_ge00_init(); dove_pcie_init(1, 1); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
To allow to move to orion irqchip driver, existing legacy devices have to map their irqs. This patch adds init code to map the corresponding irqs. It will vanish as soon as there is true device tree support for mv643xx_eth. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Changelog: v1->v2: - split off DT changes (Suggested by Jason Cooper) Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Rob Landley <rob@landley.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Cc: Jean-Francois Moine <moinejf@free.fr> Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-dove/board-dt.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)