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 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-openblocks_a6.dts
diff --git
a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index
0db0e3e
..
94e49f3
100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@
-41,7
+41,7
@@
};
pinctrl: pin-controller@10000 {
};
pinctrl: pin-controller@10000 {
- pinctrl-0 = <&pmx_dip_switches
&pmx_gpio_header
>;
+ pinctrl-0 = <&pmx_dip_switches>;
pinctrl-names = "default";
pmx_uart0: pmx-uart0 {
pinctrl-names = "default";
pmx_uart0: pmx-uart0 {
@@
-174,3
+174,10
@@
phy-handle = <ðphy0>;
};
};
phy-handle = <ðphy0>;
};
};
+
+&gpio0 {
+ status = "okay";
+
+ pinctrl-0 = <&pmx_gpio_header>;
+ pinctrl-names = "default";
+};