This was present downstream. Add upstream too. NOTE: upstream I
managed to get some sort of halfway state and got one pinctrl entry in
the coachz-r1 device tree. Remove that as part of this since it's now
in the dtsi.
Cc: Srinivasa Rao Mandadapu <[email protected]>
Cc: Ajit Pandey <[email protected]>
Cc: Judy Hsiao <[email protected]>
Cc: Cheng-Yi Chiang <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: Matthias Kaehlcke <[email protected]>
Signed-off-by: Douglas Anderson <[email protected]>
---
This applies atop the patch ("arm64: dts: qcom: Add sound node for
sc7180-trogdor-coachz") [1].
NOTE: downstream this property was present in each of the board
revisions. There's actually no longer any reason for this and I'll
shortly post a downstream patch to fix this.
[1] https://lore.kernel.org/r/[email protected]/
Changes in v2:
- Remove the pinctrl from the -r1
.../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 13 -------------
.../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
index 86619f6c1134..1b1dbdb2a82f 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
@@ -138,17 +138,4 @@ &tlmm {
"AP_TS_PEN_I2C_SCL",
"DP_HOT_PLUG_DET",
"EC_IN_RW_ODL";
-
- dmic_clk_en: dmic_clk_en {
- pinmux {
- pins = "gpio83";
- function = "gpio";
- };
-
- pinconf {
- pins = "gpio83";
- drive-strength = <8>;
- bias-pull-up;
- };
- };
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index e2ffe71c2d52..4c6e433c8226 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -93,6 +93,9 @@ &sound {
compatible = "google,sc7180-coachz";
model = "sc7180-adau7002-max98357a";
audio-routing = "PDM_DAT", "DMIC";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&dmic_clk_en>;
};
&sound_multimedia0_codec {
@@ -247,4 +250,17 @@ &tlmm {
"AP_TS_PEN_I2C_SCL",
"DP_HOT_PLUG_DET",
"EC_IN_RW_ODL";
+
+ dmic_clk_en: dmic_clk_en {
+ pinmux {
+ pins = "gpio83";
+ function = "gpio";
+ };
+
+ pinconf {
+ pins = "gpio83";
+ drive-strength = <8>;
+ bias-pull-up;
+ };
+ };
};
--
2.31.0.rc2.261.g7f71774620-goog
On Mon, Mar 15, 2021 at 01:39:30PM -0700, Douglas Anderson wrote:
> This was present downstream. Add upstream too. NOTE: upstream I
> managed to get some sort of halfway state and got one pinctrl entry in
> the coachz-r1 device tree. Remove that as part of this since it's now
> in the dtsi.
>
> Cc: Srinivasa Rao Mandadapu <[email protected]>
> Cc: Ajit Pandey <[email protected]>
> Cc: Judy Hsiao <[email protected]>
> Cc: Cheng-Yi Chiang <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: Matthias Kaehlcke <[email protected]>
> Signed-off-by: Douglas Anderson <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
Quoting Douglas Anderson (2021-03-15 13:39:30)
> This was present downstream. Add upstream too. NOTE: upstream I
> managed to get some sort of halfway state and got one pinctrl entry in
> the coachz-r1 device tree. Remove that as part of this since it's now
> in the dtsi.
>
> Cc: Srinivasa Rao Mandadapu <[email protected]>
> Cc: Ajit Pandey <[email protected]>
> Cc: Judy Hsiao <[email protected]>
> Cc: Cheng-Yi Chiang <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: Matthias Kaehlcke <[email protected]>
> Signed-off-by: Douglas Anderson <[email protected]>
> ---
Reviewed-by: Stephen Boyd <[email protected]>
Bjorn,
On Mon, Mar 15, 2021 at 1:39 PM Douglas Anderson <[email protected]> wrote:
>
> This was present downstream. Add upstream too. NOTE: upstream I
> managed to get some sort of halfway state and got one pinctrl entry in
> the coachz-r1 device tree. Remove that as part of this since it's now
> in the dtsi.
>
> Cc: Srinivasa Rao Mandadapu <[email protected]>
> Cc: Ajit Pandey <[email protected]>
> Cc: Judy Hsiao <[email protected]>
> Cc: Cheng-Yi Chiang <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: Matthias Kaehlcke <[email protected]>
> Signed-off-by: Douglas Anderson <[email protected]>
> ---
> This applies atop the patch ("arm64: dts: qcom: Add sound node for
> sc7180-trogdor-coachz") [1].
>
> NOTE: downstream this property was present in each of the board
> revisions. There's actually no longer any reason for this and I'll
> shortly post a downstream patch to fix this.
>
> [1] https://lore.kernel.org/r/[email protected]/
>
> Changes in v2:
> - Remove the pinctrl from the -r1
>
> .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 13 -------------
> .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 ++++++++++++++++
> 2 files changed, 16 insertions(+), 13 deletions(-)
I guess this patch missed the boat for 5.13? Can it get queued up for
5.14 whenever that happens?
Thanks!
-Doug
On Mon 12 Apr 18:16 CDT 2021, Doug Anderson wrote:
> Bjorn,
>
> On Mon, Mar 15, 2021 at 1:39 PM Douglas Anderson <[email protected]> wrote:
> >
> > This was present downstream. Add upstream too. NOTE: upstream I
> > managed to get some sort of halfway state and got one pinctrl entry in
> > the coachz-r1 device tree. Remove that as part of this since it's now
> > in the dtsi.
> >
> > Cc: Srinivasa Rao Mandadapu <[email protected]>
> > Cc: Ajit Pandey <[email protected]>
> > Cc: Judy Hsiao <[email protected]>
> > Cc: Cheng-Yi Chiang <[email protected]>
> > Cc: Stephen Boyd <[email protected]>
> > Cc: Matthias Kaehlcke <[email protected]>
> > Signed-off-by: Douglas Anderson <[email protected]>
> > ---
> > This applies atop the patch ("arm64: dts: qcom: Add sound node for
> > sc7180-trogdor-coachz") [1].
> >
> > NOTE: downstream this property was present in each of the board
> > revisions. There's actually no longer any reason for this and I'll
> > shortly post a downstream patch to fix this.
> >
> > [1] https://lore.kernel.org/r/[email protected]/
> >
> > Changes in v2:
> > - Remove the pinctrl from the -r1
> >
> > .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 13 -------------
> > .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 ++++++++++++++++
> > 2 files changed, 16 insertions(+), 13 deletions(-)
>
> I guess this patch missed the boat for 5.13? Can it get queued up for
> 5.14 whenever that happens?
>
Meh, I scraped the inbox and thought I got everything that was ready
picked up. I'll check with Arnd, otherwise it's staged for v5.14 now.
Regards,
Bjorn