[PATCH] arm64: dts: qcom: sc7280: Move wcd specific pin conf to common file

[PATCH] arm64: dts: qcom: sc7280: Move wcd specific pin conf to common file

[Srinivasa Rao Mandadapu]

Move wcd specific pin conf to common file to support various
herbronie variant boards and to avoid duplicate nodes in dts files.

Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
---
 .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi   | 71 ++++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts  | 61 -------------------
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi
index 32a1e78..b04d796 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi
@@ -5,6 +5,77 @@
  * Copyright (c) 2022, The Linux Foundation. All rights reserved.
  */
 
+/* PINCTRL - BOARD-SPECIFIC */
+
+/*
+ * Methodology for gpio-line-names:
+ * - If a pin goes to CRD board and is named it gets that name.
+ * - If a pin goes to CRD board and is not named, it gets no name.
+ * - If a pin is totally internal to Qcard then it gets Qcard name.
+ * - If a pin is not hooked up on Qcard, it gets no name.
+ */
+&lpass_dmic01_clk {
+	drive-strength = <8>;
+	bias-disable;
+};
+
+&lpass_dmic01_clk_sleep {
+	drive-strength = <2>;
+};
+
+&lpass_dmic01_data {
+	bias-pull-down;
+};
+
+&lpass_dmic23_clk {
+	drive-strength = <8>;
+	bias-disable;
+};
+
+&lpass_dmic23_clk_sleep {
+	drive-strength = <2>;
+};
+
+&lpass_dmic23_data {
+	bias-pull-down;
+};
+
+&lpass_rx_swr_clk {
+	drive-strength = <2>;
+	slew-rate = <1>;
+	bias-disable;
+};
+
+&lpass_rx_swr_clk_sleep {
+	bias-pull-down;
+};
+
+&lpass_rx_swr_data {
+	drive-strength = <2>;
+	slew-rate = <1>;
+	bias-bus-hold;
+};
+
+&lpass_rx_swr_data_sleep {
+	bias-pull-down;
+};
+
+&lpass_tx_swr_clk {
+	drive-strength = <2>;
+	slew-rate = <1>;
+	bias-disable;
+};
+
+&lpass_tx_swr_clk_sleep {
+	bias-pull-down;
+};
+
+&lpass_tx_swr_data {
+	drive-strength = <2>;
+	slew-rate = <1>;
+	bias-bus-hold;
+};
+
 &mi2s1_data0 {
 	drive-strength = <6>;
 	bias-disable;
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
index e9ca6c5..7881bbc 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
@@ -155,67 +155,6 @@ ap_ts_pen_1v8: &i2c13 {
  * - If a pin is totally internal to Qcard then it gets Qcard name.
  * - If a pin is not hooked up on Qcard, it gets no name.
  */
-&lpass_dmic01_clk {
-	drive-strength = <8>;
-	bias-disable;
-};
-
-&lpass_dmic01_clk_sleep {
-	drive-strength = <2>;
-};
-
-&lpass_dmic01_data {
-	bias-pull-down;
-};
-
-&lpass_dmic23_clk {
-	drive-strength = <8>;
-	bias-disable;
-};
-
-&lpass_dmic23_clk_sleep {
-	drive-strength = <2>;
-};
-
-&lpass_dmic23_data {
-	bias-pull-down;
-};
-
-&lpass_rx_swr_clk {
-	drive-strength = <2>;
-	slew-rate = <1>;
-	bias-disable;
-};
-
-&lpass_rx_swr_clk_sleep {
-	bias-pull-down;
-};
-
-&lpass_rx_swr_data {
-	drive-strength = <2>;
-	slew-rate = <1>;
-	bias-bus-hold;
-};
-
-&lpass_rx_swr_data_sleep {
-	bias-pull-down;
-};
-
-&lpass_tx_swr_clk {
-	drive-strength = <2>;
-	slew-rate = <1>;
-	bias-disable;
-};
-
-&lpass_tx_swr_clk_sleep {
-	bias-pull-down;
-};
-
-&lpass_tx_swr_data {
-	drive-strength = <2>;
-	slew-rate = <1>;
-	bias-bus-hold;
-};
 
 &pm8350c_gpios {
 	gpio-line-names = "FLASH_STROBE_1",		/* 1 */
-- 
2.7.4

Re: [PATCH] arm64: dts: qcom: sc7280: Move wcd specific pin conf to common file

[Doug Anderson]

Hi,

On Wed, Jul 6, 2022 at 3:17 AM Srinivasa Rao Mandadapu
<quic_srivasam@quicinc.com> wrote:
>
> +/* PINCTRL - BOARD-SPECIFIC */

It's not really "board specific" since this is actually a file that's
included by multiple boards.

Maybe just use the header "PINCTRL" for now. Everything here is just
adding pull/drive strength/slew-rate info to existing pinctrl
settings. If we ever have more than that and want to separate into
different sections we can always adjust later.


> +/*
> + * Methodology for gpio-line-names:
> + * - If a pin goes to CRD board and is named it gets that name.
> + * - If a pin goes to CRD board and is not named, it gets no name.
> + * - If a pin is totally internal to Qcard then it gets Qcard name.
> + * - If a pin is not hooked up on Qcard, it gets no name.
> + */

This file doesn't include "gpio-line-names" so you don't need to
include documentation about it.

-Doug

Re: [PATCH] arm64: dts: qcom: sc7280: Move wcd specific pin conf to common file

[Srinivasa Rao Mandadapu]

On 7/7/2022 2:13 AM, Doug Anderson wrote:
Thanks for your time Doug!!!
> Hi,
>
> On Wed, Jul 6, 2022 at 3:17 AM Srinivasa Rao Mandadapu
> <quic_srivasam@quicinc.com> wrote:
>> +/* PINCTRL - BOARD-SPECIFIC */
> It's not really "board specific" since this is actually a file that's
> included by multiple boards.
Okay. Will update accordingly.
>
> Maybe just use the header "PINCTRL" for now. Everything here is just
> adding pull/drive strength/slew-rate info to existing pinctrl
> settings. If we ever have more than that and want to separate into
> different sections we can always adjust later.
>
>
>> +/*
>> + * Methodology for gpio-line-names:
>> + * - If a pin goes to CRD board and is named it gets that name.
>> + * - If a pin goes to CRD board and is not named, it gets no name.
>> + * - If a pin is totally internal to Qcard then it gets Qcard name.
>> + * - If a pin is not hooked up on Qcard, it gets no name.
>> + */
> This file doesn't include "gpio-line-names" so you don't need to
> include documentation about it.
Okay. Will remove it.
>
> -Doug