projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap4.dtsi
diff --git
a/arch/arm/boot/dts/omap4.dtsi
b/arch/arm/boot/dts/omap4.dtsi
index
421fe9f
..
3fdc51c
100644
(file)
--- a/
arch/arm/boot/dts/omap4.dtsi
+++ b/
arch/arm/boot/dts/omap4.dtsi
@@
-198,7
+198,7
@@
#size-cells = <1>;
ranges = <0 0x5a0 0x170>;
#size-cells = <1>;
ranges = <0 0x5a0 0x170>;
- pbias_regulator: pbias_regulator {
+ pbias_regulator: pbias_regulator
@60
{
compatible = "ti,pbias-omap4", "ti,pbias-omap";
reg = <0x60 0x4>;
syscon = <&omap4_padconf_global>;
compatible = "ti,pbias-omap4", "ti,pbias-omap";
reg = <0x60 0x4>;
syscon = <&omap4_padconf_global>;
@@
-370,6
+370,10
@@
ti,no-idle-on-init;
clocks = <&l3_div_ck>;
clock-names = "fck";
ti,no-idle-on-init;
clocks = <&l3_div_ck>;
clock-names = "fck";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ gpio-controller;
+ #gpio-cells = <2>;
};
uart1: serial@4806a000 {
};
uart1: serial@4806a000 {