projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
berlin2q.dtsi
diff --git
a/arch/arm/boot/dts/berlin2q.dtsi
b/arch/arm/boot/dts/berlin2q.dtsi
index
2c34bfb
..
e548229
100644
(file)
--- a/
arch/arm/boot/dts/berlin2q.dtsi
+++ b/
arch/arm/boot/dts/berlin2q.dtsi
@@
-37,11
+37,11
@@
#include <dt-bindings/clock/berlin2q.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/berlin2q.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
-
/ {
model = "Marvell Armada 1500 pro (BG2-Q) SoC";
compatible = "marvell,berlin2q", "marvell,berlin";
/ {
model = "Marvell Armada 1500 pro (BG2-Q) SoC";
compatible = "marvell,berlin2q", "marvell,berlin";
+ #address-cells = <1>;
+ #size-cells = <1>;
aliases {
serial0 = &uart0;
aliases {
serial0 = &uart0;
@@
-99,7
+99,7
@@
clock-frequency = <25000000>;
};
clock-frequency = <25000000>;
};
- soc {
+ soc
@f7000000
{
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
@@
-525,7
+525,6
@@
reg = <0x2000 0x100>;
clocks = <&refclk>;
interrupts = <1>;
reg = <0x2000 0x100>;
clocks = <&refclk>;
interrupts = <1>;
- status = "disabled";
};
wdt2: watchdog@3000 {
};
wdt2: watchdog@3000 {
@@
-533,7
+532,6
@@
reg = <0x3000 0x100>;
clocks = <&refclk>;
interrupts = <2>;
reg = <0x3000 0x100>;
clocks = <&refclk>;
interrupts = <2>;
- status = "disabled";
};
sm_gpio1: gpio@5000 {
};
sm_gpio1: gpio@5000 {