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 <[email protected]>
---
Changes Since V1:
-- Remove redundant documentation.
-- Update the pincontrol header comment.
.../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 64 ++++++++++++++++++++++
arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 61 ---------------------
2 files changed, 64 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..859faaa 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,70 @@
* Copyright (c) 2022, The Linux Foundation. All rights reserved.
*/
+/* PINCTRL */
+
+&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
Hi,
On Thu, Jul 7, 2022 at 5:36 AM Srinivasa Rao Mandadapu
<[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> Changes Since V1:
> -- Remove redundant documentation.
> -- Update the pincontrol header comment.
>
> .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 64 ++++++++++++++++++++++
> arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 61 ---------------------
> 2 files changed, 64 insertions(+), 61 deletions(-)
Looks fine to me now, thanks!
Reviewed-by: Douglas Anderson <[email protected]>
Quoting Srinivasa Rao Mandadapu (2022-07-07 05:36:21)
> 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..859faaa 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,70 @@
> * Copyright (c) 2022, The Linux Foundation. All rights reserved.
> */
>
> +/* PINCTRL */
> +
> +&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>;
I suspect this was discussed before, but why do we need to modify drive
strengths on pins that aren't in output mode? I assume either rx_swr or
tx_swr is unidirectional.
> + 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;
On 7/8/2022 11:29 PM, Stephen Boyd wrote:
Thanks for your time Stephen!!!
> Quoting Srinivasa Rao Mandadapu (2022-07-07 05:36:21)
>> 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..859faaa 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,70 @@
>> * Copyright (c) 2022, The Linux Foundation. All rights reserved.
>> */
>>
>> +/* PINCTRL */
>> +
>> +&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>;
> I suspect this was discussed before, but why do we need to modify drive
> strengths on pins that aren't in output mode? I assume either rx_swr or
> tx_swr is unidirectional.
Actually this patch is just reorganization only. didn't do any
modification of already reviewed patches.
Will test without drive strength again and post a fix patch post this
patch accepted if required.
>
>> + 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;
On Thu, 7 Jul 2022 18:06:21 +0530, Srinivasa Rao Mandadapu wrote:
> Move wcd specific pin conf to common file to support various
> herbronie variant boards and to avoid duplicate nodes in dts files.
>
>
Applied, thanks!
[1/1] arm64: dts: qcom: sc7280: Move wcd specific pin conf to common file
commit: 49ac5e0c3078012480749102dd3f405770a0e281
Best regards,
--
Bjorn Andersson <[email protected]>