Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / qcom / apq8016-sbc-soc-pins.dtsi

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
index 5f7023f90df78caa21b7254e02da2144268158a8..cbeee0bcdf5234ecbea25bb354f30d591d6e3f18 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
@@ -3,17 +3,9 @@
 
 &msmgpio {
 
-       pinctrl-names = "default";
-       pinctrl-0 = <&soc_gpios_default>;
-
-       soc_gpios_default: default {
-               usr_led_1_ctrl_default: usr_led_1_ctrl_default {
-                       pins = "gpio21";
-                       function = "gpio";
-                       output-low;
-               };
-               usr_led_2_ctrl_default: usr_led_2_ctrl_default {
-                       pins = "gpio120";
+       msmgpio_leds: msmgpio_leds {
+               pinconf {
+                       pins = "gpio21", "gpio120";
                        function = "gpio";
                        output-low;
                };