projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
rk3xxx.dtsi
diff --git
a/arch/arm/boot/dts/rk3xxx.dtsi
b/arch/arm/boot/dts/rk3xxx.dtsi
index 405d61258f107516a561f8c48c8b18e22ba785bc..e15beb3c671ed58dcbc20b8a2e6df66851643179 100644
(file)
--- a/
arch/arm/boot/dts/rk3xxx.dtsi
+++ b/
arch/arm/boot/dts/rk3xxx.dtsi
@@
-409,6
+409,8
@@
#io-channel-cells = <1>;
clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;
clock-names = "saradc", "apb_pclk";
+ resets = <&cru SRST_SARADC>;
+ reset-names = "saradc-apb";
status = "disabled";
};