Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / stih416-pinctrl.dtsi

diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index 250d5ecc951ea0e3e5c7f071fb4e38b6312840d7..ee6c119e261e89e8a887b18a78fdfdff284c0975 100644 (file)
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -122,6 +122,22 @@
                                };
                        };
 
+                       keyscan {
+                               pinctrl_keyscan: keyscan {
+                                       st,pins {
+                                               keyin0 = <&PIO0 2 ALT2 IN>;
+                                               keyin1 = <&PIO0 3 ALT2 IN>;
+                                               keyin2 = <&PIO0 4 ALT2 IN>;
+                                               keyin3 = <&PIO2 6 ALT2 IN>;
+
+                                               keyout0 = <&PIO1 6 ALT2 OUT>;
+                                               keyout1 = <&PIO1 7 ALT2 OUT>;
+                                               keyout2 = <&PIO0 6 ALT2 OUT>;
+                                               keyout3 = <&PIO2 7 ALT2 OUT>;
+                                       };
+                               };
+                       };
+
                        sbc_i2c0 {
                                pinctrl_sbc_i2c0_default: sbc_i2c0-default {
                                        st,pins {