arm64: dts: qcom: db820c: Remove pin specific files

Rather than scattering pinctrl definitions in various files, merge the
nodes into db820c.dtsi to make it easier to navigate.

Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi
deleted file mode 100644 (file)
index a5cc80d..0000000
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi
+++ /dev/null
@@ -1,109 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
- */
-&msmgpio {
-       sdc2_cd_on: sdc2_cd_on {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <16>;  /* 16 MA */
-               };
-       };
-
-       sdc2_cd_off: sdc2_cd_off {
-               mux {
-                       pins = "gpio38";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio38";
-                       bias-pull-up;           /* pull up */
-                       drive-strength = <2>;   /* 2 MA */
-               };
-       };
-
-       blsp1_uart1_default: blsp1_uart1_default {
-               mux {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       function = "blsp_uart2";
-               };
-
-               config {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-       };
-
-       blsp1_uart1_sleep: blsp1_uart1_sleep {
-               mux {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       function = "gpio";
-               };
-
-               config {
-                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       hdmi_hpd_active: hdmi_hpd_active {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <16>;
-               };
-       };
-
-       hdmi_hpd_suspend: hdmi_hpd_suspend {
-               mux {
-                       pins = "gpio34";
-                       function = "hdmi_hot";
-               };
-
-               config {
-                       pins = "gpio34";
-                       bias-pull-down;
-                       drive-strength = <2>;
-               };
-       };
-
-       hdmi_ddc_active: hdmi_ddc_active {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-up;
-               };
-       };
-
-       hdmi_ddc_suspend: hdmi_ddc_suspend {
-               mux {
-                       pins = "gpio32", "gpio33";
-                       function = "hdmi_ddc";
-               };
-
-               config {
-                       pins = "gpio32", "gpio33";
-                       drive-strength = <2>;
-                       bias-pull-down;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
deleted file mode 100644 (file)
index 31a3e33..0000000
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+++ /dev/null
@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-&pm8994_gpios {
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
-
-       ls_exp_gpio_f: pm8994_gpio5 {
-               pinconf {
-                       pins = "gpio5";
-                       output-low;
-                       power-source = <2>; // PM8994_GPIO_S4, 1.8V
-               };
-       };
-
-       bt_en_gpios: bt_en_gpios {
-               pinconf {
-                       pins = "gpio19";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
-                       bias-pull-down;
-               };
-       };
-
-       wlan_en_gpios: wlan_en_gpios {
-               pinconf {
-                       pins = "gpio8";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       output-low;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
-                       bias-pull-down;
-               };
-       };
-
-       audio_mclk: clk_div1 {
-               pinconf {
-                       pins = "gpio15";
-                       function = "func1";
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-
-       volume_up_gpio: pm8996_gpio2 {
-               pinconf {
-                       pins = "gpio2";
-                       function = "normal";
-                       input-enable;
-                       drive-push-pull;
-                       bias-pull-up;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-
-       divclk4_pin_a: divclk4 {
-               pinconf {
-                       pins = "gpio18";
-                       function = PMIC_GPIO_FUNC_FUNC2;
-
-                       bias-disable;
-                       power-source = <PM8994_GPIO_S4>;
-               };
-       };
-
-       usb3_vbus_det_gpio: pm8996_gpio22 {
-               pinconf {
-                       pins = "gpio22";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       input-enable;
-                       bias-pull-down;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-};
-
-&pmi8994_gpios {
-       usb2_vbus_det_gpio: pmi8996_gpio6 {
-               pinconf {
-                       pins = "gpio6";
-                       function = PMIC_GPIO_FUNC_NORMAL;
-                       input-enable;
-                       bias-pull-down;
-                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                       power-source = <PM8994_GPIO_S4>; // 1.8V
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
index 99990a1..6c64dee 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
@@ -6,10 +6,9 @@
 #include "msm8996.dtsi"
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
-#include "apq8096-db820c-pins.dtsi"
-#include "apq8096-db820c-pmic-pins.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/sound/qcom,q6afe.h>
 #include <dt-bindings/sound/qcom,q6asm.h>
 
@@ -384,6 +383,110 @@
                "NC", /* GPIO_147 */
                "NC", /* GPIO_148 */
                "NC"; /* GPIO_149 */
+
+       sdc2_cd_on: sdc2_cd_on {
+               mux {
+                       pins = "gpio38";
+                       function = "gpio";
+               };
+
+               config {
+                       pins = "gpio38";
+                       bias-pull-up;           /* pull up */
+                       drive-strength = <16>;  /* 16 MA */
+               };
+       };
+
+       sdc2_cd_off: sdc2_cd_off {
+               mux {
+                       pins = "gpio38";
+                       function = "gpio";
+               };
+
+               config {
+                       pins = "gpio38";
+                       bias-pull-up;           /* pull up */
+                       drive-strength = <2>;   /* 2 MA */
+               };
+       };
+
+       blsp1_uart1_default: blsp1_uart1_default {
+               mux {
+                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                       function = "blsp_uart2";
+               };
+
+               config {
+                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
+       };
+
+       blsp1_uart1_sleep: blsp1_uart1_sleep {
+               mux {
+                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                       function = "gpio";
+               };
+
+               config {
+                       pins = "gpio41", "gpio42", "gpio43", "gpio44";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       hdmi_hpd_active: hdmi_hpd_active {
+               mux {
+                       pins = "gpio34";
+                       function = "hdmi_hot";
+               };
+
+               config {
+                       pins = "gpio34";
+                       bias-pull-down;
+                       drive-strength = <16>;
+               };
+       };
+
+       hdmi_hpd_suspend: hdmi_hpd_suspend {
+               mux {
+                       pins = "gpio34";
+                       function = "hdmi_hot";
+               };
+
+               config {
+                       pins = "gpio34";
+                       bias-pull-down;
+                       drive-strength = <2>;
+               };
+       };
+
+       hdmi_ddc_active: hdmi_ddc_active {
+               mux {
+                       pins = "gpio32", "gpio33";
+                       function = "hdmi_ddc";
+               };
+
+               config {
+                       pins = "gpio32", "gpio33";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       hdmi_ddc_suspend: hdmi_ddc_suspend {
+               mux {
+                       pins = "gpio32", "gpio33";
+                       function = "hdmi_ddc";
+               };
+
+               config {
+                       pins = "gpio32", "gpio33";
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+       };
 };
 
 &pcie0 {
@@ -436,6 +539,80 @@
                "PMIC_SLB",
                "PMIC_BUA",
                "USB_VBUS_DET";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&ls_exp_gpio_f &bt_en_gpios>;
+
+       ls_exp_gpio_f: pm8994_gpio5 {
+               pinconf {
+                       pins = "gpio5";
+                       output-low;
+                       power-source = <2>; // PM8994_GPIO_S4, 1.8V
+               };
+       };
+
+       bt_en_gpios: bt_en_gpios {
+               pinconf {
+                       pins = "gpio19";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+                       bias-pull-down;
+               };
+       };
+
+       wlan_en_gpios: wlan_en_gpios {
+               pinconf {
+                       pins = "gpio8";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       output-low;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>;
+                       bias-pull-down;
+               };
+       };
+
+       audio_mclk: clk_div1 {
+               pinconf {
+                       pins = "gpio15";
+                       function = "func1";
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+
+       volume_up_gpio: pm8996_gpio2 {
+               pinconf {
+                       pins = "gpio2";
+                       function = "normal";
+                       input-enable;
+                       drive-push-pull;
+                       bias-pull-up;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
+
+       divclk4_pin_a: divclk4 {
+               pinconf {
+                       pins = "gpio18";
+                       function = PMIC_GPIO_FUNC_FUNC2;
+
+                       bias-disable;
+                       power-source = <PM8994_GPIO_S4>;
+               };
+       };
+
+       usb3_vbus_det_gpio: pm8996_gpio22 {
+               pinconf {
+                       pins = "gpio22";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       input-enable;
+                       bias-pull-down;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
 };
 
 &pm8994_mpps {
@@ -462,6 +639,17 @@
                "NC",
                "NC",
                "NC";
+
+       usb2_vbus_det_gpio: pmi8996_gpio6 {
+               pinconf {
+                       pins = "gpio6";
+                       function = PMIC_GPIO_FUNC_NORMAL;
+                       input-enable;
+                       bias-pull-down;
+                       qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+                       power-source = <PM8994_GPIO_S4>; // 1.8V
+               };
+       };
 };
 
 &rpm_requests {