Skip to content

L
linux
Commit 5c697664 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files
Options

ARM: orion5x: convert DT to use the mvebu-mbus driver 

This commit switches the Orion5x Device Tree files to use the DT
representation and probing for the mvebu-mbus driver. The changes are
mainly:

 * Re-organize the DT to follow the same organization as the one used
   on Armada 370/XP, which is needed for mvebu-mbus to work: a
   top-level soc { ... } node, which corresponds to the MBus bus, and
   a sub-node internal-regs { ... } for all peripherals whose register
   sit only in the "Internal Register Window". This change re-indents
   by one level the definition of all nodes in the Device Tree, which
   explains the large change.

 * Use custom functions orion5x_dt_init_early() and
   orion5x_dt_init_time() instead of orion5x_init_early() and
   orion5x_timer_init() as we now want the MBus driver to be probed
   from the Device Tree. We still use the old-style timer
   initialization, but that will be changed in a followup commit.
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-14-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 2a934742
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 130 deletions
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
View file @ 5c697664
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include "orion5x.dtsi" #include "orion5x-mv88f5182.dtsi"
/ { / {
model = "LaCie Ethernet Disk mini V2"; model = "LaCie Ethernet Disk mini V2";
...@@ -24,15 +24,20 @@ chosen { ...@@ -24,15 +24,20 @@ chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
}; };
ocp@f1000000 { soc {
serial@12000 { ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,
clock-frequency = <166666667>; <MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>;
status = "okay";
}; internal-regs {
serial@12000 {
clock-frequency = <166666667>;
status = "okay";
};
sata@80000 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
};
}; };
}; };
......
arch/arm/boot/dts/orion5x-mv88f5182.dtsi 0 → 100644
View file @ 5c697664
/*
* Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include "orion5x.dtsi"
/ {
compatible = "marvell,orion5x-88f5182", "marvell,orion5x";
soc {
compatible = "marvell,orion5x-88f5182-mbus", "simple-bus";
internal-regs {
mbusc: mbus-controller@20000 {
compatible = "marvell,mbus-controller";
reg = <0x20000 0x100>, <0x1500 0x20>;
};
};
};
};
arch/arm/boot/dts/orion5x.dtsi
View file @ 5c697664
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include "skeleton.dtsi" #include "skeleton.dtsi"
#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
/ { / {
model = "Marvell Orion5x SoC"; model = "Marvell Orion5x SoC";
compatible = "marvell,orion5x"; compatible = "marvell,orion5x";
...@@ -17,149 +19,154 @@ aliases { ...@@ -17,149 +19,154 @@ aliases {
gpio0 = &gpio0; gpio0 = &gpio0;
}; };
ocp@f1000000 { soc {
compatible = "simple-bus"; #address-cells = <2>;
ranges = <0x00000000 0xf1000000 0x4000000
0xf2200000 0xf2200000 0x0000800>;
#address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
controller = <&mbusc>;
gpio0: gpio@10100 { internal-regs {
compatible = "marvell,orion-gpio"; compatible = "simple-bus";
#gpio-cells = <2>;
gpio-controller;
reg = <0x10100 0x40>;
ngpios = <32>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <6>, <7>, <8>, <9>;
};
spi@10600 {
compatible = "marvell,orion-spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <1>;
cell-index = <0>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
reg = <0x10600 0x28>;
status = "disabled"; gpio0: gpio@10100 {
}; compatible = "marvell,orion-gpio";
#gpio-cells = <2>;
i2c@11000 { gpio-controller;
compatible = "marvell,mv64xxx-i2c"; reg = <0x10100 0x40>;
reg = <0x11000 0x20>; ngpios = <32>;
#address-cells = <1>; interrupt-controller;
#size-cells = <0>; #interrupt-cells = <2>;
interrupts = <5>; interrupts = <6>, <7>, <8>, <9>;
clock-frequency = <100000>; };
status = "disabled";
};
serial@12000 { spi@10600 {
compatible = "ns16550a"; compatible = "marvell,orion-spi";
reg = <0x12000 0x100>; #address-cells = <1>;
reg-shift = <2>; #size-cells = <0>;
interrupts = <3>; cell-index = <0>;
/* set clock-frequency in board dts */ reg = <0x10600 0x28>;
status = "disabled"; status = "disabled";
}; };
serial@12100 { i2c@11000 {
compatible = "ns16550a"; compatible = "marvell,mv64xxx-i2c";
reg = <0x12100 0x100>; reg = <0x11000 0x20>;
reg-shift = <2>; #address-cells = <1>;
interrupts = <4>; #size-cells = <0>;
/* set clock-frequency in board dts */ interrupts = <5>;
status = "disabled"; clock-frequency = <100000>;
}; status = "disabled";
};
intc: interrupt-controller@20200 { serial@12000 {
compatible = "marvell,orion-intc"; compatible = "ns16550a";
interrupt-controller; reg = <0x12000 0x100>;
#interrupt-cells = <1>; reg-shift = <2>;
reg = <0x20200 0x08>; interrupts = <3>;
}; /* set clock-frequency in board dts */
status = "disabled";
};
wdt@20300 { serial@12100 {
compatible = "marvell,orion-wdt"; compatible = "ns16550a";
reg = <0x20300 0x28>; reg = <0x12100 0x100>;
status = "okay"; reg-shift = <2>;
}; interrupts = <4>;
/* set clock-frequency in board dts */
status = "disabled";
};
ehci@50000 { intc: interrupt-controller@20200 {
compatible = "marvell,orion-ehci"; compatible = "marvell,orion-intc";
reg = <0x50000 0x1000>; interrupt-controller;
interrupts = <17>; #interrupt-cells = <1>;
status = "disabled"; reg = <0x20200 0x08>;
}; };
xor@60900 { wdt@20300 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-wdt";
reg = <0x60900 0x100 reg = <0x20300 0x28>;
0x60b00 0x100>; status = "okay";
status = "okay"; };
xor00 { ehci@50000 {
interrupts = <30>; compatible = "marvell,orion-ehci";
dmacap,memcpy; reg = <0x50000 0x1000>;
dmacap,xor; interrupts = <17>;
status = "disabled";
}; };
xor01 {
interrupts = <31>; xor@60900 {
dmacap,memcpy; compatible = "marvell,orion-xor";
dmacap,xor; reg = <0x60900 0x100
dmacap,memset; 0x60b00 0x100>;
status = "okay";
xor00 {
interrupts = <30>;
dmacap,memcpy;
dmacap,xor;
};
xor01 {
interrupts = <31>;
dmacap,memcpy;
dmacap,xor;
dmacap,memset;
};
}; };
};
eth: ethernet-controller@72000 { eth: ethernet-controller@72000 {
compatible = "marvell,orion-eth"; compatible = "marvell,orion-eth";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x72000 0x4000>; reg = <0x72000 0x4000>;
marvell,tx-checksum-limit = <1600>; marvell,tx-checksum-limit = <1600>;
status = "disabled"; status = "disabled";
ethernet-port@0 { ethernet-port@0 {
compatible = "marvell,orion-eth-port"; compatible = "marvell,orion-eth-port";
reg = <0>; reg = <0>;
/* overwrite MAC address in bootloader */ /* overwrite MAC address in bootloader */
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
/* set phy-handle property in board file */ /* set phy-handle property in board file */
};
}; };
};
mdio: mdio-bus@72004 { mdio: mdio-bus@72004 {
compatible = "marvell,orion-mdio"; compatible = "marvell,orion-mdio";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x72004 0x84>; reg = <0x72004 0x84>;
interrupts = <22>; interrupts = <22>;
status = "disabled"; status = "disabled";
/* add phy nodes in board file */ /* add phy nodes in board file */
}; };
sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <29>;
status = "disabled";
};
sata@80000 { ehci@a0000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-ehci";
reg = <0x80000 0x5000>; reg = <0xa0000 0x1000>;
interrupts = <29>; interrupts = <12>;
status = "disabled"; status = "disabled";
};
}; };
crypto@90000 { crypto@90000 {
compatible = "marvell,orion-crypto"; compatible = "marvell,orion-crypto";
reg = <0x90000 0x10000>, reg = <MBUS_ID(0xf0, 0x01) 0x90000 0x10000>,
<0xf2200000 0x800>; <MBUS_ID(0x09, 0x00) 0x0 0x800>;
reg-names = "regs", "sram"; reg-names = "regs", "sram";
interrupts = <28>; interrupts = <28>;
status = "okay"; status = "okay";
}; };
ehci@a0000 {
compatible = "marvell,orion-ehci";
reg = <0xa0000 0x1000>;
interrupts = <12>;
status = "disabled";
};
}; };
}; };
arch/arm/mach-orion5x/board-dt.c
View file @ 5c697664
...@@ -15,10 +15,14 @@ ...@@ -15,10 +15,14 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/mbus.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/orion5x.h> #include <mach/orion5x.h>
#include <mach/bridge-regs.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <plat/time.h>
#include "common.h" #include "common.h"
static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = { static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {
...@@ -31,6 +35,16 @@ static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = { ...@@ -31,6 +35,16 @@ static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {
{}, {},
}; };
static void orion5x_dt_init_early(void)
{
orion_time_set_base(TIMER_VIRT_BASE);
}
static void orion5x_dt_init_time(void)
{
orion5x_timer_init();
}
static void __init orion5x_dt_init(void) static void __init orion5x_dt_init(void)
{ {
char *dev_name; char *dev_name;
...@@ -39,6 +53,8 @@ static void __init orion5x_dt_init(void) ...@@ -39,6 +53,8 @@ static void __init orion5x_dt_init(void)
orion5x_id(&dev, &rev, &dev_name); orion5x_id(&dev, &rev, &dev_name);
printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk); printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
BUG_ON(mvebu_mbus_dt_init());
/* /*
* Setup Orion address map * Setup Orion address map
*/ */
...@@ -71,9 +87,9 @@ static const char *orion5x_dt_compat[] = { ...@@ -71,9 +87,9 @@ static const char *orion5x_dt_compat[] = {
DT_MACHINE_START(ORION5X_DT, "Marvell Orion5x (Flattened Device Tree)") DT_MACHINE_START(ORION5X_DT, "Marvell Orion5x (Flattened Device Tree)")
/* Maintainer: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */ /* Maintainer: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> */
.map_io = orion5x_map_io, .map_io = orion5x_map_io,
.init_early = orion5x_init_early, .init_early = orion5x_dt_init_early,
.init_irq = orion_dt_init_irq, .init_irq = orion_dt_init_irq,
.init_time = orion5x_timer_init, .init_time = orion5x_dt_init_time,
.init_machine = orion5x_dt_init, .init_machine = orion5x_dt_init,
.restart = orion5x_restart, .restart = orion5x_restart,
.dt_compat = orion5x_dt_compat, .dt_compat = orion5x_dt_compat,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7