* [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
@ 2021-03-15 20:39 Douglas Anderson
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Douglas Anderson @ 2021-03-15 20:39 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Douglas Anderson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Stephen Boyd, Matthias Kaehlcke,
Andy Gross, Rob Herring, devicetree, linux-arm-msm, linux-kernel
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 <srivasam@codeaurora.org>
Cc: Ajit Pandey <ajitp@codeaurora.org>
Cc: Judy Hsiao <judyhsiao@chromium.org>
Cc: Cheng-Yi Chiang <cychiang@chromium.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
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/20210313054654.11693-3-srivasam@codeaurora.org/
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
@ 2021-03-15 20:39 ` Douglas Anderson
2021-03-15 22:25 ` Matthias Kaehlcke
2021-03-17 1:00 ` Stephen Boyd
2021-03-15 22:23 ` [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Matthias Kaehlcke
` (3 subsequent siblings)
4 siblings, 2 replies; 9+ messages in thread
From: Douglas Anderson @ 2021-03-15 20:39 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Douglas Anderson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Stephen Boyd, Matthias Kaehlcke,
Andy Gross, Rob Herring, devicetree, linux-arm-msm, linux-kernel
Match what's downstream for this board.
Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Cc: Ajit Pandey <ajitp@codeaurora.org>
Cc: Judy Hsiao <judyhsiao@chromium.org>
Cc: Cheng-Yi Chiang <cychiang@chromium.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
This applies atop the patch (arm64: dts: qcom: sc7180-trogdor: Add
lpass dai link for I2S driver") [1].
[1] https://lore.kernel.org/r/20210313054654.11693-2-srivasam@codeaurora.org/
(no changes since v1)
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index d253a08f6fc8..622b5f1b88a2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -139,6 +139,13 @@ &sdhc_2 {
status = "okay";
};
+&sound {
+ model = "sc7180-rt5682-max98357a-2mic";
+ pinctrl-names = "default";
+ pinctrl-0 = <&dmic_sel>;
+ dmic-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
+};
+
&usb_c1 {
status = "disabled";
};
--
2.31.0.rc2.261.g7f71774620-goog
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
@ 2021-03-15 22:25 ` Matthias Kaehlcke
2021-03-17 1:00 ` Stephen Boyd
1 sibling, 0 replies; 9+ messages in thread
From: Matthias Kaehlcke @ 2021-03-15 22:25 UTC (permalink / raw)
To: Douglas Anderson, s
Cc: Bjorn Andersson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Stephen Boyd, Andy Gross,
Rob Herring, devicetree, linux-arm-msm, linux-kernel
On Mon, Mar 15, 2021 at 01:39:31PM -0700, Douglas Anderson wrote:
> Match what's downstream for this board.
>
> Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
2021-03-15 22:25 ` Matthias Kaehlcke
@ 2021-03-17 1:00 ` Stephen Boyd
1 sibling, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2021-03-17 1:00 UTC (permalink / raw)
To: Bjorn Andersson, Douglas Anderson
Cc: Douglas Anderson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Matthias Kaehlcke, Andy Gross,
Rob Herring, devicetree, linux-arm-msm, linux-kernel
Quoting Douglas Anderson (2021-03-15 13:39:31)
> Match what's downstream for this board.
>
> Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
@ 2021-03-15 22:23 ` Matthias Kaehlcke
2021-03-17 0:59 ` Stephen Boyd
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Matthias Kaehlcke @ 2021-03-15 22:23 UTC (permalink / raw)
To: Douglas Anderson
Cc: Bjorn Andersson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Stephen Boyd, Andy Gross,
Rob Herring, devicetree, linux-arm-msm, linux-kernel
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 <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
2021-03-15 22:23 ` [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Matthias Kaehlcke
@ 2021-03-17 0:59 ` Stephen Boyd
2021-04-12 23:16 ` Doug Anderson
2021-04-19 14:50 ` patchwork-bot+linux-arm-msm
4 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2021-03-17 0:59 UTC (permalink / raw)
To: Bjorn Andersson, Douglas Anderson
Cc: Douglas Anderson, Srinivasa Rao Mandadapu, Ajit Pandey,
Judy Hsiao, Cheng-Yi Chiang, Matthias Kaehlcke, Andy Gross,
Rob Herring, devicetree, linux-arm-msm, linux-kernel
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 <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
` (2 preceding siblings ...)
2021-03-17 0:59 ` Stephen Boyd
@ 2021-04-12 23:16 ` Doug Anderson
2021-04-13 22:56 ` Bjorn Andersson
2021-04-19 14:50 ` patchwork-bot+linux-arm-msm
4 siblings, 1 reply; 9+ messages in thread
From: Doug Anderson @ 2021-04-12 23:16 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Srinivasa Rao Mandadapu, Ajit Pandey, Judy Hsiao,
Cheng-Yi Chiang, Stephen Boyd, Matthias Kaehlcke, Andy Gross,
Rob Herring,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-arm-msm, LKML
Bjorn,
On Mon, Mar 15, 2021 at 1:39 PM Douglas Anderson <dianders@chromium.org> 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 <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
> 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/20210313054654.11693-3-srivasam@codeaurora.org/
>
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
2021-04-12 23:16 ` Doug Anderson
@ 2021-04-13 22:56 ` Bjorn Andersson
0 siblings, 0 replies; 9+ messages in thread
From: Bjorn Andersson @ 2021-04-13 22:56 UTC (permalink / raw)
To: Doug Anderson
Cc: Srinivasa Rao Mandadapu, Ajit Pandey, Judy Hsiao,
Cheng-Yi Chiang, Stephen Boyd, Matthias Kaehlcke, Andy Gross,
Rob Herring,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-arm-msm, LKML
On Mon 12 Apr 18:16 CDT 2021, Doug Anderson wrote:
> Bjorn,
>
> On Mon, Mar 15, 2021 at 1:39 PM Douglas Anderson <dianders@chromium.org> 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 <srivasam@codeaurora.org>
> > Cc: Ajit Pandey <ajitp@codeaurora.org>
> > Cc: Judy Hsiao <judyhsiao@chromium.org>
> > Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> > Cc: Stephen Boyd <swboyd@chromium.org>
> > Cc: Matthias Kaehlcke <mka@chromium.org>
> > Signed-off-by: Douglas Anderson <dianders@chromium.org>
> > ---
> > 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/20210313054654.11693-3-srivasam@codeaurora.org/
> >
> > 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
` (3 preceding siblings ...)
2021-04-12 23:16 ` Doug Anderson
@ 2021-04-19 14:50 ` patchwork-bot+linux-arm-msm
4 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2021-04-19 14:50 UTC (permalink / raw)
To: Doug Anderson; +Cc: linux-arm-msm
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
On Mon, 15 Mar 2021 13:39:30 -0700 you 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 <srivasam@codeaurora.org>
> Cc: Ajit Pandey <ajitp@codeaurora.org>
> Cc: Judy Hsiao <judyhsiao@chromium.org>
> Cc: Cheng-Yi Chiang <cychiang@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: Matthias Kaehlcke <mka@chromium.org>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
>
> [...]
Here is the summary with links:
- [v2,1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz
https://git.kernel.org/qcom/c/7dc936edb2b0
- [v2,2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom
https://git.kernel.org/qcom/c/3965f55d96c2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-04-19 14:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 20:39 [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Douglas Anderson
2021-03-15 20:39 ` [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Douglas Anderson
2021-03-15 22:25 ` Matthias Kaehlcke
2021-03-17 1:00 ` Stephen Boyd
2021-03-15 22:23 ` [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Matthias Kaehlcke
2021-03-17 0:59 ` Stephen Boyd
2021-04-12 23:16 ` Doug Anderson
2021-04-13 22:56 ` Bjorn Andersson
2021-04-19 14:50 ` patchwork-bot+linux-arm-msm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.