projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mips
[oweals/u-boot.git]
/
arch
/
mips
/
dts
/
brcm,bcm6328.dtsi
diff --git
a/arch/mips/dts/brcm,bcm6328.dtsi
b/arch/mips/dts/brcm,bcm6328.dtsi
index 4adc83fcb43713bebb9cabf624edd600862c9cd9..a99607574357bfd68a7cd0b5a9a537441defd3e2 100644
(file)
--- a/
arch/mips/dts/brcm,bcm6328.dtsi
+++ b/
arch/mips/dts/brcm,bcm6328.dtsi
@@
-78,6
+78,17
@@
mask = <0x1>;
};
mask = <0x1>;
};
+ wdt: watchdog@1000005c {
+ compatible = "brcm,bcm6345-wdt";
+ reg = <0x1000005c 0xc>;
+ clocks = <&periph_osc>;
+ };
+
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ wdt = <&wdt>;
+ };
+
gpio: gpio-controller@10000084 {
compatible = "brcm,bcm6345-gpio";
reg = <0x10000084 0x4>, <0x1000008c 0x4>;
gpio: gpio-controller@10000084 {
compatible = "brcm,bcm6345-gpio";
reg = <0x10000084 0x4>, <0x1000008c 0x4>;
@@
-120,7
+131,7
@@
memory-controller@10003000 {
compatible = "brcm,bcm6328-mc";
memory-controller@10003000 {
compatible = "brcm,bcm6328-mc";
- reg = <0x10003000 0x
1000
>;
+ reg = <0x10003000 0x
864
>;
u-boot,dm-pre-reloc;
};
};
u-boot,dm-pre-reloc;
};
};