Skip to content

Commit

Permalink
ARM: dts: berlin: add the Marvell Armada 1500 pro
Browse files Browse the repository at this point in the history
Adds initial support for the Marvell Armada 1500 pro (BG2Q) SoC (Berlin family).
The SoC has nodes for cpu, l2 cache controller, interrupt controllers, local
timer, apb timers and uarts for now. Also add corresponding binding documentation.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  • Loading branch information
Antoine Tenart authored and Sebastian Hesselbarth committed May 19, 2014
1 parent c9eaa44 commit 374ddcb
Show file tree
Hide file tree
Showing 2 changed files with 225 additions and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/arm/marvell,berlin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ SoC and board used. Currently known SoC compatibles are:
"marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100),
"marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005)
"marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????)
"marvell,berlin2q" for Marvell Armada 1500-pro (BG2Q, 88DE3114)
"marvell,berlin3" for Marvell Armada ? (BG3, 88DE????)

* Example:
Expand Down
224 changes: 224 additions & 0 deletions arch/arm/boot/dts/berlin2q.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
/*
* Copyright (C) 2014 Antoine Ténart <antoine.tenart@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 <dt-bindings/interrupt-controller/arm-gic.h>

#include "skeleton.dtsi"

/ {
model = "Marvell Armada 1500 pro (BG2-Q) SoC";
compatible = "marvell,berlin2q", "marvell,berlin";

cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu@0 {
compatible = "arm,cortex-a9";
device_type = "cpu";
next-level-cache = <&l2>;
reg = <0>;
};

cpu@1 {
compatible = "arm,cortex-a9";
device_type = "cpu";
next-level-cache = <&l2>;
reg = <1>;
};

cpu@2 {
compatible = "arm,cortex-a9";
device_type = "cpu";
next-level-cache = <&l2>;
reg = <2>;
};

cpu@3 {
compatible = "arm,cortex-a9";
device_type = "cpu";
next-level-cache = <&l2>;
reg = <3>;
};
};

smclk: sysmgr-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <25000000>;
};

cfgclk: config-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <100000000>;
};

cpuclk: cpu-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <1200000000>;
};

twdclk: twdclk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
clocks = <&cpuclk>;
clock-mult = <1>;
clock-div = <3>;
};

soc {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;

ranges = <0 0xf7000000 0x1000000>;
interrupt-parent = <&gic>;

l2: l2-cache-controller@ac0000 {
compatible = "arm,pl310-cache";
reg = <0xac0000 0x1000>;
cache-level = <2>;
};

local-timer@ad0600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0xad0600 0x20>;
clocks = <&twdclk>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
};

gic: interrupt-controller@ad1000 {
compatible = "arm,cortex-a9-gic";
reg = <0xad1000 0x1000>, <0xad0100 0x100>;
interrupt-controller;
#interrupt-cells = <3>;
};

apb@e80000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;

ranges = <0 0xe80000 0x10000>;
interrupt-parent = <&aic>;

timer0: timer@2c00 {
compatible = "snps,dw-apb-timer";
reg = <0x2c00 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
interrupts = <8>;
};

timer1: timer@2c14 {
compatible = "snps,dw-apb-timer";
reg = <0x2c14 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer2: timer@2c28 {
compatible = "snps,dw-apb-timer";
reg = <0x2c28 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer3: timer@2c3c {
compatible = "snps,dw-apb-timer";
reg = <0x2c3c 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer4: timer@2c50 {
compatible = "snps,dw-apb-timer";
reg = <0x2c50 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer5: timer@2c64 {
compatible = "snps,dw-apb-timer";
reg = <0x2c64 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer6: timer@2c78 {
compatible = "snps,dw-apb-timer";
reg = <0x2c78 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

timer7: timer@2c8c {
compatible = "snps,dw-apb-timer";
reg = <0x2c8c 0x14>;
clocks = <&cfgclk>;
clock-names = "timer";
status = "disabled";
};

aic: interrupt-controller@3800 {
compatible = "snps,dw-apb-ictl";
reg = <0x3800 0x30>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
};
};

apb@fc0000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;

ranges = <0 0xfc0000 0x10000>;
interrupt-parent = <&sic>;

uart0: uart@9000 {
compatible = "snps,dw-apb-uart";
reg = <0x9000 0x100>;
interrupt-parent = <&sic>;
interrupts = <8>;
clocks = <&smclk>;
reg-shift = <2>;
status = "disabled";
};

uart1: uart@a000 {
compatible = "snps,dw-apb-uart";
reg = <0xa000 0x100>;
interrupt-parent = <&sic>;
interrupts = <9>;
clocks = <&smclk>;
reg-shift = <2>;
status = "disabled";
};

sic: interrupt-controller@e000 {
compatible = "snps,dw-apb-ictl";
reg = <0xe000 0x30>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&gic>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
};
};
};
};

0 comments on commit 374ddcb

Please sign in to comment.