Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

[karo-tx-linux.git] / arch / arm / boot / dts / kirkwood-ts419.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
index 1a9c624c7a928f9c67bd72e1bb372e61d4a911b0..30ab93bfb1e476d0722bdc17e1eb6b5ca43f353b 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi
@@ -14,7 +14,7 @@
        compatible = "qnap,ts419", "marvell,kirkwood";
 
        ocp@f1000000 {
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
                        pinctrl-names = "default";
 
                        pmx_USB_copy_button: pmx-USB-copy-button {