arm64: dts: qcom: apq8016-sbc: merge -pins.dtsi into main .dtsi

apq8016-sbc.dtsi is the only remaining device which takes up
4 files since it has its pinctrl split into separate files.

Actually this does not really make the device tree easier to read
(just harder to find nodes). For db820c the files were merged in
commit 88264f1f6bf5 ("arm64: dts: qcom: db820c: Remove pin specific files").

Do the same for apq8016-sbc (db410c) and move the pinctrl definitions
into apq8016-sbc.dtsi.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200514112754.148919-3-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
deleted file mode 100644 (file)
index 4190793..0000000
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
+++ /dev/null
@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
-
-&pm8916_gpios {
-
-       usb_hub_reset_pm: usb-hub-reset-pm {
-               pinconf {
-                       pins = "gpio3";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       input-disable;
-                       output-high;
-               };
-       };
-
-       usb_hub_reset_pm_device: usb-hub-reset-pm-device {
-               pinconf {
-                       pins = "gpio3";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-               };
-       };
-
-       usb_sw_sel_pm: usb-sw-sel-pm {
-               pinconf {
-                       pins = "gpio4";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       power-source = <PM8916_GPIO_VPH>;
-                       input-disable;
-                       output-high;
-               };
-       };
-
-       usb_sw_sel_pm_device: usb-sw-sel-pm-device {
-               pinconf {
-                       pins = "gpio4";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       power-source = <PM8916_GPIO_VPH>;
-                       input-disable;
-                       output-low;
-               };
-       };
-
-       pm8916_gpios_leds: pm8916-gpios-leds {
-               pinconf {
-                       pins = "gpio1", "gpio2";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-               };
-       };
-};
-
-&pm8916_mpps {
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&ls_exp_gpio_f>;
-
-       ls_exp_gpio_f: pm8916-mpp4 {
-               pinconf {
-                       pins = "mpp4";
-                       function = "digital";
-                       output-low;
-                       power-source = <PM8916_MPP_L5>; // 1.8V
-               };
-       };
-
-       pm8916_mpps_leds: pm8916-mpps-leds {
-               pinconf {
-                       pins = "mpp2", "mpp3";
-                       function = "digital";
-                       output-low;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
deleted file mode 100644 (file)
index ac00bee..0000000
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
+++ /dev/null
@@ -1,89 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <dt-bindings/gpio/gpio.h>
-
-&msmgpio {
-
-       msmgpio_leds: msmgpio-leds {
-               pinconf {
-                       pins = "gpio21", "gpio120";
-                       function = "gpio";
-                       output-low;
-               };
-       };
-
-       usb_id_default: usb-id-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio121";
-               };
-
-               pinconf {
-                       pins = "gpio121";
-                       drive-strength = <8>;
-                       input-enable;
-                       bias-pull-up;
-               };
-       };
-
-       adv7533_int_active: adv533-int-active {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio31";
-               };
-               pinconf {
-                       pins = "gpio31";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       adv7533_int_suspend: adv7533-int-suspend {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio31";
-               };
-               pinconf {
-                       pins = "gpio31";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       adv7533_switch_active: adv7533-switch-active {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio32";
-               };
-               pinconf {
-                       pins = "gpio32";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       adv7533_switch_suspend: adv7533-switch-suspend {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio32";
-               };
-               pinconf {
-                       pins = "gpio32";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       msm_key_volp_n_default: msm-key-volp-n-default {
-               pinmux {
-                       function = "gpio";
-                       pins = "gpio107";
-               };
-               pinconf {
-                       pins = "gpio107";
-                       drive-strength = <8>;
-                       input-enable;
-                       bias-pull-up;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 08c7538..8a4b790 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -5,10 +5,10 @@
 
 #include "msm8916.dtsi"
 #include "pm8916.dtsi"
-#include "apq8016-sbc-soc-pins.dtsi"
-#include "apq8016-sbc-pmic-pins.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
 #include <dt-bindings/sound/apq8016-lpass.h>
 
 /*
@@ -777,3 +777,157 @@
                regulator-max-microvolt = <3337000>;
        };
 };
+
+&msmgpio {
+       msmgpio_leds: msmgpio-leds {
+               pinconf {
+                       pins = "gpio21", "gpio120";
+                       function = "gpio";
+                       output-low;
+               };
+       };
+
+       usb_id_default: usb-id-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio121";
+               };
+
+               pinconf {
+                       pins = "gpio121";
+                       drive-strength = <8>;
+                       input-enable;
+                       bias-pull-up;
+               };
+       };
+
+       adv7533_int_active: adv533-int-active {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio31";
+               };
+               pinconf {
+                       pins = "gpio31";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
+       };
+
+       adv7533_int_suspend: adv7533-int-suspend {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio31";
+               };
+               pinconf {
+                       pins = "gpio31";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       adv7533_switch_active: adv7533-switch-active {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio32";
+               };
+               pinconf {
+                       pins = "gpio32";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
+       };
+
+       adv7533_switch_suspend: adv7533-switch-suspend {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio32";
+               };
+               pinconf {
+                       pins = "gpio32";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       msm_key_volp_n_default: msm-key-volp-n-default {
+               pinmux {
+                       function = "gpio";
+                       pins = "gpio107";
+               };
+               pinconf {
+                       pins = "gpio107";
+                       drive-strength = <8>;
+                       input-enable;
+                       bias-pull-up;
+               };
+       };
+};
+
+&pm8916_gpios {
+       usb_hub_reset_pm: usb-hub-reset-pm {
+               pinconf {
+                       pins = "gpio3";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       input-disable;
+                       output-high;
+               };
+       };
+
+       usb_hub_reset_pm_device: usb-hub-reset-pm-device {
+               pinconf {
+                       pins = "gpio3";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+               };
+       };
+
+       usb_sw_sel_pm: usb-sw-sel-pm {
+               pinconf {
+                       pins = "gpio4";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       power-source = <PM8916_GPIO_VPH>;
+                       input-disable;
+                       output-high;
+               };
+       };
+
+       usb_sw_sel_pm_device: usb-sw-sel-pm-device {
+               pinconf {
+                       pins = "gpio4";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       power-source = <PM8916_GPIO_VPH>;
+                       input-disable;
+                       output-low;
+               };
+       };
+
+       pm8916_gpios_leds: pm8916-gpios-leds {
+               pinconf {
+                       pins = "gpio1", "gpio2";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+               };
+       };
+};
+
+&pm8916_mpps {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ls_exp_gpio_f>;
+
+       ls_exp_gpio_f: pm8916-mpp4 {
+               pinconf {
+                       pins = "mpp4";
+                       function = "digital";
+                       output-low;
+                       power-source = <PM8916_MPP_L5>; // 1.8V
+               };
+       };
+
+       pm8916_mpps_leds: pm8916-mpps-leds {
+               pinconf {
+                       pins = "mpp2", "mpp3";
+                       function = "digital";
+                       output-low;
+               };
+       };
+};