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 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap34xx.dtsi
diff --git
a/arch/arm/boot/dts/omap34xx.dtsi
b/arch/arm/boot/dts/omap34xx.dtsi
index
e446562
..
e41c52d
100644
(file)
--- a/
arch/arm/boot/dts/omap34xx.dtsi
+++ b/
arch/arm/boot/dts/omap34xx.dtsi
@@
-28,7
+28,7
@@
};
};
- ocp {
+ ocp
@68000000
{
omap3_pmx_core2: pinmux@480025d8 {
compatible = "ti,omap3-padconf", "pinctrl-single";
reg = <0x480025d8 0x24>;