projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
mstar-v7.dtsi
diff --git
a/arch/arm/boot/dts/mstar-v7.dtsi
b/arch/arm/boot/dts/mstar-v7.dtsi
index
f078805
..
b0a21b0
100644
(file)
--- a/
arch/arm/boot/dts/mstar-v7.dtsi
+++ b/
arch/arm/boot/dts/mstar-v7.dtsi
@@
-12,7
+12,7
@@
#size-cells = <1>;
interrupt-parent = <&gic>;
#size-cells = <1>;
interrupt-parent = <&gic>;
- cpus {
+ cpus
: cpus
{
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
@@
-109,6
+109,16
@@
reg = <0x204400 0x200>;
};
reg = <0x204400 0x200>;
};
+ gpio: gpio@207800 {
+ #gpio-cells = <2>;
+ reg = <0x207800 0x200>;
+ gpio-controller;
+ #interrupt-cells = <2>;
+ interrupt-controller;
+ interrupt-parent = <&intc_fiq>;
+ status = "disabled";
+ };
+
pm_uart: uart@221000 {
compatible = "ns16550a";
reg = <0x221000 0x100>;
pm_uart: uart@221000 {
compatible = "ns16550a";
reg = <0x221000 0x100>;