* [PATCH 1/3] ARM: dove: add DT parsing for legacy mv643xx_eth
[not found] ` <1367519140-19716-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2013-05-02 18:25 ` Sebastian Hesselbarth
[not found] ` <1367519140-19716-2-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-02 18:25 ` [PATCH 2/3] ARM: dove: add DT parsing for legacy timer Sebastian Hesselbarth
2013-05-02 19:19 ` [PATCH 0/3] ARM: dove: prepare and move to orion irqchip driver Jason Cooper
2 siblings, 1 reply; 7+ messages in thread
From: Sebastian Hesselbarth @ 2013-05-02 18:25 UTC (permalink / raw)
Cc: Andrew Lunn, Russell King, Jason Cooper, Jean-Francois Moine,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-doc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Grant Likely,
Thomas Gleixner,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Sebastian Hesselbarth
To allow to move to orion irqchip driver, existing legacy devices
have to map their irqs. This patch adds a node for mv643xx_eth and
some init code to map the corresponding irqs. While the device tree
node can stay, the init code will vanish as soon as there is true
device tree support for mv643xx_eth.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Cc: Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/arm/boot/dts/dove.dtsi | 7 +++++++
arch/arm/mach-dove/board-dt.c | 31 ++++++++++++++++++++++++++++++-
2 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index f7509ca..ea7c5da 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -197,6 +197,13 @@
status = "disabled";
};
+ gbe: ethernet-controller {
+ compatible = "marvell,mv643xx-eth-block";
+ reg = <0x72000 0x4000>;
+ interrupts = <29>, <30>;
+ status = "disabled";
+ };
+
rtc@d8500 {
compatible = "marvell,orion-rtc";
reg = <0xd8500 0x20>;
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);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/3] ARM: dove: add DT parsing for legacy timer
[not found] ` <1367519140-19716-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-02 18:25 ` [PATCH 1/3] ARM: dove: add DT parsing for legacy mv643xx_eth Sebastian Hesselbarth
@ 2013-05-02 18:25 ` Sebastian Hesselbarth
[not found] ` <1367519140-19716-3-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-02 19:19 ` [PATCH 0/3] ARM: dove: prepare and move to orion irqchip driver Jason Cooper
2 siblings, 1 reply; 7+ messages in thread
From: Sebastian Hesselbarth @ 2013-05-02 18:25 UTC (permalink / raw)
Cc: Andrew Lunn, Russell King, Jason Cooper, Jean-Francois Moine,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-doc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Grant Likely,
Thomas Gleixner,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Sebastian Hesselbarth
To allow to move to orion irqchip driver, existing legacy devices
have to map their irqs. This patch adds a node for orion timer and
some init code to map the corresponding irqs. While the device tree
node can stay, the init code will vanish as soon as there is true
device tree support for orion timer.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
Cc: Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
arch/arm/boot/dts/dove.dtsi | 7 ++++++
arch/arm/mach-dove/board-dt.c | 42 +++++++++++++++++++++++++++++++++++-----
2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index ea7c5da..433cca1 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -30,6 +30,13 @@
marvell,tauros2-cache-features = <0>;
};
+ timer: timer {
+ compatible = "marvell,orion-timer";
+ reg = <0x20300 0x20>;
+ interrupts = <0>;
+ clocks = <&core_clk 0>;
+ };
+
intc: interrupt-controller {
compatible = "marvell,orion-intc";
interrupt-controller;
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c
index 9df6dd7..cea65b7 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_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/platform_data/usb-ehci-orion.h>
@@ -20,6 +21,7 @@
#include <mach/pm.h>
#include <plat/common.h>
#include <plat/irq.h>
+#include <plat/time.h>
#include "common.h"
/*
@@ -48,10 +50,42 @@ static void __init dove_legacy_clk_init(void)
of_clk_get_from_provider(&clkspec));
}
-static void __init dove_of_clk_init(void)
+#define BRIDGE_INT_TIMER1_CLR (~0x0004)
+
+static void __init dove_legacy_timer_init(void)
{
+ struct device_node *np = of_find_compatible_node(NULL, NULL,
+ "marvell,orion-timer");
+ struct clk *clk;
+ void __iomem *base;
+ unsigned int tclk, irq;
+
+ /* Setup root of clk tree */
mvebu_clocks_init();
dove_legacy_clk_init();
+
+ if (!np)
+ panic("missing timer node\n");
+
+ base = of_iomap(np, 0);
+ if (!base)
+ panic("%s: missing reg base for timer\n", np->full_name);
+
+ irq = irq_of_parse_and_map(np, 0);
+ if (!irq)
+ panic("%s: missing irq for timer\n", np->full_name);
+
+ clk = of_clk_get(np, 0);
+ if (IS_ERR(clk))
+ panic("%s: missing clock for timer\n", np->full_name);
+
+ clk_prepare_enable(clk);
+ tclk = clk_get_rate(clk);
+ clk_put(clk);
+
+ orion_time_set_base(base);
+ /* legacy timer init gets bridge reg base */
+ orion_time_init(base - 0x300, BRIDGE_INT_TIMER1_CLR, irq, tclk);
}
static struct mv643xx_eth_platform_data dove_dt_ge00_data = {
@@ -95,9 +129,6 @@ static void __init dove_dt_init(void)
#endif
dove_setup_cpu_mbus();
- /* Setup root of clk tree */
- dove_of_clk_init();
-
/* Internal devices not ported to DT yet */
dove_legacy_ge00_init();
dove_pcie_init(1, 1);
@@ -112,9 +143,8 @@ static const char * const dove_dt_board_compat[] = {
DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")
.map_io = dove_map_io,
- .init_early = dove_init_early,
.init_irq = orion_dt_init_irq,
- .init_time = dove_timer_init,
+ .init_time = dove_legacy_timer_init,
.init_machine = dove_dt_init,
.restart = dove_restart,
.dt_compat = dove_dt_board_compat,
--
1.7.2.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/3] ARM: dove: prepare and move to orion irqchip driver
[not found] ` <1367519140-19716-1-git-send-email-sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-05-02 18:25 ` [PATCH 1/3] ARM: dove: add DT parsing for legacy mv643xx_eth Sebastian Hesselbarth
2013-05-02 18:25 ` [PATCH 2/3] ARM: dove: add DT parsing for legacy timer Sebastian Hesselbarth
@ 2013-05-02 19:19 ` Jason Cooper
2 siblings, 0 replies; 7+ messages in thread
From: Jason Cooper @ 2013-05-02 19:19 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Andrew Lunn, Russell King, Jean-Francois Moine,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-doc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Grant Likely,
Thomas Gleixner,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Thu, May 02, 2013 at 08:25:37PM +0200, Sebastian Hesselbarth wrote:
> This patch set moves Dove to the recently introduced irqchip driver
> for Marvell Orion SoCs. First, init code for timer and mv643xx_eth
> is added to prepare legacy non-DT drivers for virtual irqs provided by
> irqchip drivers. Then DT enabled boards for Dove are moved to the
> orion irqchip driver.
>
> Note: This patch set depends on irqchip driver for Orion SoCs patch.
>
> Sebastian Hesselbarth (3):
> ARM: dove: add DT parsing for legacy mv643xx_eth
> ARM: dove: add DT parsing for legacy timer
> ARM: dove: move DT boards to orion irqchip driver
>
> arch/arm/boot/dts/dove.dtsi | 18 ++++++++-
In the next version, please send the dtsi changes as separate patches.
This will reduce merge conflicts on our end.
Also, and I'll note this on the other thread as well, please put the
drivers/irqchip patch in the same series as this so the dependency is
clear.
In it's current state, your driver patch can only conflict with other
work in drivers/irqchip/{Makefile,Kconfig}. This easy for us. So we
should try to get an Ack from the irqchip folks to keep that patch with
this series and prevent a cross-tree dependency.
thx,
Jason.
> arch/arm/mach-dove/Kconfig | 1 +
> arch/arm/mach-dove/Makefile | 4 +-
> arch/arm/mach-dove/board-dt.c | 77 ++++++++++++++++++++++++++++++++++++-----
> 4 files changed, 87 insertions(+), 13 deletions(-)
> ---
> Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
> Cc: Rob Landley <rob-VoJi6FS/r0vR7s880joybQ@public.gmane.org>
> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
> Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
> Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
> Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
> Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Jean-Francois Moine <moinejf-GANU6spQydw@public.gmane.org>
> Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
> Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> --
> 1.7.2.5
>
^ permalink raw reply [flat|nested] 7+ messages in thread