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 branch 'core/urgent' into core/entry
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
hisi-x5hd2.dtsi
diff --git
a/arch/arm/boot/dts/hisi-x5hd2.dtsi
b/arch/arm/boot/dts/hisi-x5hd2.dtsi
index
3ee7967
..
e2dbf1d
100644
(file)
--- a/
arch/arm/boot/dts/hisi-x5hd2.dtsi
+++ b/
arch/arm/boot/dts/hisi-x5hd2.dtsi
@@
-370,8
+370,9
@@
arm,primecell-periphid = <0x00141805>;
reg = <0xa2c000 0x1000>;
interrupts = <0 29 4>;
arm,primecell-periphid = <0x00141805>;
reg = <0xa2c000 0x1000>;
interrupts = <0 29 4>;
- clocks = <&clock HIX5HD2_WDG0_RST>;
- clock-names = "apb_pclk";
+ clocks = <&clock HIX5HD2_WDG0_RST>,
+ <&clock HIX5HD2_WDG0_RST>;
+ clock-names = "wdog_clk", "apb_pclk";
};
};
};
};