Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[uclinux-h8/linux.git] / arch / arm / boot / dts / kirkwood-ts219-6281.dts

diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index 42648ab..6dd1038 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -8,10 +8,7 @@
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
 
-                       pinctrl-0 = < &pmx_uart0 &pmx_uart1 &pmx_spi
-                                     &pmx_twsi0 &pmx_sata0 &pmx_sata1
-                                     &pmx_ram_size &pmx_reset_button
-                                     &pmx_USB_copy_button &pmx_board_id>;
+                       pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
                        pinctrl-names = "default";
 
                        pmx_ram_size: pmx-ram-size {
@@ -39,6 +36,9 @@
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
+               pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
+               pinctrl-names = "default";
+
                button@1 {
                        label = "USB Copy";
                        linux,code = <133>;