git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz...
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-mv78260.dtsi
diff --git
a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index
53dfb15
..
d7a8d0b
100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/
arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@
-251,10
+251,6
@@
};
internal-regs {
- pinctrl: pin-ctrl@18000 {
- compatible = "marvell,mv78260-pinctrl";
- };
-
gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
@@
-298,3
+294,7
@@
};
};
};
+
+&pinctrl {
+ compatible = "marvell,mv78260-pinctrl";
+};