* [PATCH v5 0/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA
@ 2026-11-16 20:55 Daniel Carter
2026-11-16 20:55 ` [PATCH v5 1/3] dt-bindings: arm: qcom: document " Daniel Carter
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Carter @ 2026-11-16 20:55 UTC (permalink / raw)
To: krzk, andersson, broonie, srinivas.kandagatla, konradybcio
Cc: robh, conor+dt, vkoul, tiwai, perex, lgirdwood,
pierre-louis.bossart, yung-chuan.liao, abelvesa, linux-arm-msm,
linux-sound, devicetree, linux-kernel, yass27106
Hi Krzysztof, hi Srini, hi all,
v5 of the series, collecting the tags received on v4 and adding the
Cc: stable that Srini requested:
Changes since v4:
- dt-bindings patch 1/3: collected Krzysztof's Acked-by.
- soundwire patch 3/3: added Cc: stable@vger.kernel.org (as requested
for stable backporting given the Fixes: tags) and collected Srini's
Reviewed-by. No code changes in this patch.
- patch 2/3 is unchanged.
- The series is rebased onto v7.4-rc2. Patch 3/3 is functionally
identical to v4 (verified hunk-for-hunk); only its diff context
shifted, from the treewide devm_kmalloc_obj conversion that landed
in v7.4-rc2 for drivers/soundwire/qcom.c.
Series:
[1/3] dt-bindings: arm: qcom: document Asus Vivobook 16 X1607QA
[2/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA
[3/3] soundwire: qcom: check clk_prepare_enable() return values
Best regards,
Daniel Carter
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 1/3] dt-bindings: arm: qcom: document Asus Vivobook 16 X1607QA
2026-11-16 20:55 [PATCH v5 0/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA Daniel Carter
@ 2026-11-16 20:55 ` Daniel Carter
2026-11-16 20:55 ` [PATCH v5 2/3] arm64: dts: qcom: add device tree for " Daniel Carter
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Carter @ 2026-11-16 20:55 UTC (permalink / raw)
To: krzk, andersson, broonie, srinivas.kandagatla, konradybcio
Cc: robh, conor+dt, vkoul, tiwai, perex, lgirdwood,
pierre-louis.bossart, yung-chuan.liao, abelvesa, linux-arm-msm,
linux-sound, devicetree, linux-kernel, yass27106
Document the compatible for the Asus Vivobook 16 X1607QA laptop,
based on the Qualcomm X1P42100 (Purwa) SoC.
Signed-off-by: Daniel Carter <yass27106@gmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 121ca557ce1..d22f1b0b4ef 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -1306,6 +1306,7 @@ properties:
- items:
- enum:
+ - asus,vivobook-16-x1607qa
- asus,vivobook-s15-x1p4
- hp,omnibook-x14-fe1
- lenovo,thinkbook-16
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 2/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA
2026-11-16 20:55 ` [PATCH v5 1/3] dt-bindings: arm: qcom: document " Daniel Carter
@ 2026-11-16 20:55 ` Daniel Carter
2026-11-16 20:55 ` [PATCH v5 3/3] soundwire: qcom: check clk_prepare_enable() return values Daniel Carter
[not found] ` <sashiko-outbox-217692@kernel.org>
0 siblings, 2 replies; 6+ messages in thread
From: Daniel Carter @ 2026-11-16 20:55 UTC (permalink / raw)
To: krzk, andersson, broonie, srinivas.kandagatla, konradybcio
Cc: robh, conor+dt, vkoul, tiwai, perex, lgirdwood,
pierre-louis.bossart, yung-chuan.liao, abelvesa, linux-arm-msm,
linux-sound, devicetree, linux-kernel, yass27106
The Asus Vivobook 16 X1607QA is a 16-inch laptop based on the
Qualcomm X1P-42-100 (Purwa) SoC, an 8-core derivative of the
X1E80100 (hamoa) platform. Its board design is close to the Vivobook
S 15 (X1P42100), so the device tree builds on the shared
x1-asus-vivobook-s15.dtsi.
Supported so far:
- the 2x WSA8845 speaker and WCD9385 headset codec audio stack over
SoundWire, including the VA macro DMIC input
- the ADSP and CDSP remote processors with the ASUS firmware paths
- the Adreno GPU with the zapped shader firmware
The pmc8380_6 PMIC (and its thermal and die-temp nodes) belongs to
the third CPU cluster, which is unpopulated on this 8-core part; its
nodes are deleted as on the Vivobook S 15.
Signed-off-by: Daniel Carter <yass27106@gmail.com>
---
arch/arm64/boot/dts/qcom/Makefile | 2 +
.../x1p42100-asus-vivobook-16-x1607qa.dts | 232 ++++++++++++++++++
2 files changed, 234 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 88230c4e00e..4405eaab62d 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -507,6 +507,8 @@ x1e80100-microsoft-romulus15-el2-dtbs := x1e80100-microsoft-romulus15.dtb x1-el2
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus15.dtb x1e80100-microsoft-romulus15-el2.dtb
x1e80100-qcp-el2-dtbs := x1e80100-qcp.dtb x1-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb x1e80100-qcp-el2.dtb
+x1p42100-asus-vivobook-16-x1607qa-el2-dtbs := x1p42100-asus-vivobook-16-x1607qa.dtb x1-el2.dtbo
+dtb-$(CONFIG_ARCH_QCOM) += x1p42100-asus-vivobook-16-x1607qa.dtb x1p42100-asus-vivobook-16-x1607qa-el2.dtb
x1p42100-asus-vivobook-s15-el2-dtbs := x1p42100-asus-vivobook-s15.dtb x1-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-asus-vivobook-s15.dtb x1p42100-asus-vivobook-s15-el2.dtb
x1p42100-asus-zenbook-a14-el2-dtbs := x1p42100-asus-zenbook-a14.dtb x1-el2.dtbo
diff --git a/arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts b/arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts
new file mode 100644
index 00000000000..3877809dcb3
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2026, Daniel Carter <yass27106@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "purwa.dtsi"
+#include "x1-asus-vivobook-s15.dtsi"
+
+/delete-node/ &pmc8380_6;
+/delete-node/ &pmc8380_6_thermal;
+/delete-node/ &pmc8380_6_die_temp;
+
+/ {
+ model = "ASUS Vivobook 16 (X1607QA)";
+ compatible = "asus,vivobook-16-x1607qa", "qcom,x1p42100";
+
+ wcd938x: audio-codec {
+ compatible = "qcom,wcd9385-codec";
+
+ pinctrl-0 = <&wcd_default>;
+ pinctrl-names = "default";
+
+ qcom,micbias1-microvolt = <1800000>;
+ qcom,micbias2-microvolt = <1800000>;
+ qcom,micbias3-microvolt = <1800000>;
+ qcom,micbias4-microvolt = <1800000>;
+ qcom,mbhc-buttons-vthreshold-microvolt =
+ <75000 150000 237000 500000 500000 500000 500000 500000>;
+ qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
+ qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
+ qcom,rx-device = <&wcd_rx>;
+ qcom,tx-device = <&wcd_tx>;
+
+ reset-gpios = <&tlmm 191 GPIO_ACTIVE_LOW>;
+
+ vdd-buck-supply = <&vreg_l15b_1p8>;
+ vdd-rxtx-supply = <&vreg_l15b_1p8>;
+ vdd-io-supply = <&vreg_l15b_1p8>;
+ vdd-mic-bias-supply = <&vreg_bob1>;
+
+ #sound-dai-cells = <1>;
+ };
+
+ sound {
+ compatible = "qcom,x1e80100-sndcard";
+ model = "X1P42100-ASUS-Vivobook-16";
+ audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT",
+ "SpkrRight IN", "WSA WSA_SPK2 OUT",
+ "IN1_HPHL", "HPHL_OUT",
+ "IN2_HPHR", "HPHR_OUT",
+ "AMIC2", "MIC BIAS2",
+ "VA DMIC0", "MIC BIAS1",
+ "VA DMIC1", "MIC BIAS1",
+ "VA DMIC0", "VA MIC BIAS1",
+ "VA DMIC1", "VA MIC BIAS1",
+ "TX SWR_INPUT1", "ADC2_OUTPUT";
+
+ wcd-playback-dai-link {
+ link-name = "WCD Playback";
+
+ codec {
+ sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>;
+ };
+
+ cpu {
+ sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ wcd-capture-dai-link {
+ link-name = "WCD Capture";
+
+ codec {
+ sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>;
+ };
+
+ cpu {
+ sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ va-dai-link {
+ link-name = "VA Capture";
+
+ codec {
+ sound-dai = <&lpass_vamacro 0>;
+ };
+
+ cpu {
+ sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+
+ wsa-dai-link {
+ link-name = "WSA Playback";
+
+ codec {
+ sound-dai = <&left_spkr>, <&right_spkr>,
+ <&swr0 0>, <&lpass_wsamacro 0>;
+ };
+
+ cpu {
+ sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>;
+ };
+
+ platform {
+ sound-dai = <&q6apm>;
+ };
+ };
+ };
+};
+
+&apps_rsc {
+ regulators-0 {
+ vreg_l12b_1p2: ldo12 {
+ regulator-name = "vreg_l12b_1p2";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ regulator-always-on;
+ };
+ };
+};
+
+&gpu_zap_shader {
+ firmware-name = "qcom/x1p42100/ASUSTeK/vivobook-16-x1607qa/qcdxkmsucpurwa.mbn";
+};
+
+&lpass_tlmm {
+ spkr_01_sd_n_active: spkr-01-sd-n-active-state {
+ pins = "gpio12";
+ function = "gpio";
+ drive-strength = <16>;
+ bias-disable;
+ output-low;
+ };
+};
+
+&lpass_vamacro {
+ pinctrl-0 = <&dmic01_default>;
+ pinctrl-names = "default";
+ qcom,dmic-sample-rate = <4800000>;
+ vdd-micb-supply = <&vreg_bob1>;
+};
+
+&remoteproc_adsp {
+ firmware-name = "qcom/x1p42100/ASUSTeK/vivobook-16-x1607qa/qcadsp8380.mbn",
+ "qcom/x1p42100/ASUSTeK/vivobook-16-x1607qa/adsp_dtbs.elf";
+ status = "okay";
+};
+
+&remoteproc_cdsp {
+ firmware-name = "qcom/x1p42100/ASUSTeK/vivobook-16-x1607qa/qccdsp8380.mbn",
+ "qcom/x1p42100/ASUSTeK/vivobook-16-x1607qa/cdsp_dtbs.elf";
+ status = "okay";
+};
+
+&swr0 {
+ pinctrl-0 = <&wsa_swr_active>, <&spkr_01_sd_n_active>;
+ pinctrl-names = "default";
+ status = "okay";
+
+ /* WSA8845, Left Speaker */
+ left_spkr: speaker@0,0 {
+ compatible = "sdw20217020400";
+ reg = <0 0>;
+ reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
+ #sound-dai-cells = <0>;
+ sound-name-prefix = "SpkrLeft";
+ vdd-1p8-supply = <&vreg_l15b_1p8>;
+ vdd-io-supply = <&vreg_l12b_1p2>;
+ qcom,port-mapping = <1 2 3 7 10 13>;
+ };
+
+ /* WSA8845, Right Speaker */
+ right_spkr: speaker@0,1 {
+ compatible = "sdw20217020400";
+ reg = <0 1>;
+ reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
+ #sound-dai-cells = <0>;
+ sound-name-prefix = "SpkrRight";
+ vdd-1p8-supply = <&vreg_l15b_1p8>;
+ vdd-io-supply = <&vreg_l12b_1p2>;
+ qcom,port-mapping = <4 5 6 7 11 13>;
+ };
+};
+
+&swr1 {
+ status = "okay";
+
+ /* WCD9385 RX */
+ wcd_rx: codec@0,4 {
+ compatible = "sdw20217010d00";
+ reg = <0 4>;
+ qcom,rx-port-mapping = <1 2 3 4 5>;
+ };
+};
+
+&swr2 {
+ status = "okay";
+
+ /* WCD9385 TX */
+ wcd_tx: codec@0,3 {
+ compatible = "sdw20217010d00";
+ reg = <0 3>;
+ qcom,tx-port-mapping = <2 2 3 4>;
+ };
+};
+
+&tlmm {
+ wcd_default: wcd-reset-n-active-state {
+ pins = "gpio191";
+ function = "gpio";
+ drive-strength = <16>;
+ bias-disable;
+ output-low;
+ };
+};
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 3/3] soundwire: qcom: check clk_prepare_enable() return values
2026-11-16 20:55 ` [PATCH v5 2/3] arm64: dts: qcom: add device tree for " Daniel Carter
@ 2026-11-16 20:55 ` Daniel Carter
2026-11-22 15:41 ` Daniel Carter
[not found] ` <sashiko-outbox-217692@kernel.org>
1 sibling, 1 reply; 6+ messages in thread
From: Daniel Carter @ 2026-11-16 20:55 UTC (permalink / raw)
To: krzk, andersson, broonie, srinivas.kandagatla, konradybcio
Cc: robh, conor+dt, vkoul, tiwai, perex, lgirdwood,
pierre-louis.bossart, yung-chuan.liao, abelvesa, linux-arm-msm,
linux-sound, devicetree, linux-kernel, yass27106
clk_prepare_enable() can fail; unchecked, the driver proceeds to
touch registers with the interface clock off, which aborts on arm64.
Check the return value in the interrupt handler (returning IRQ_NONE,
as the interrupt status is not read or cleared on that path), in
probe, and in the runtime resume path (returning the error without
unmasking the level-high wake IRQ, which would storm while the slave
keeps driving the line).
Fixes: 02efb49aa805 ("soundwire: qcom: add support for SoundWire controller")
Fixes: 74e79da9fd46 ("soundwire: qcom: add runtime pm support")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Carter <yass27106@gmail.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
drivers/soundwire/qcom.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index c31d921f679..2cf2a8a2bc4 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -778,7 +778,9 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id)
u32 i;
int devnum;
int ret = IRQ_HANDLED;
- clk_prepare_enable(ctrl->hclk);
+
+ if (clk_prepare_enable(ctrl->hclk))
+ return IRQ_NONE;
ctrl->reg_read(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_STATUS],
&intr_sts);
@@ -1675,7 +1677,11 @@ static int qcom_swrm_probe(struct platform_device *pdev)
goto err_init;
}
- clk_prepare_enable(ctrl->hclk);
+ ret = clk_prepare_enable(ctrl->hclk);
+ if (ret) {
+ dev_err(dev, "unable to enable iface clock\n");
+ goto err_init;
+ }
ctrl->dev = dev;
dev_set_drvdata(&pdev->dev, ctrl);
@@ -1800,7 +1806,9 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
disable_irq_nosync(ctrl->wake_irq);
}
- clk_prepare_enable(ctrl->hclk);
+ ret = clk_prepare_enable(ctrl->hclk);
+ if (ret)
+ return ret;
if (ctrl->clock_stop_not_supported) {
reinit_completion(&ctrl->enumeration);
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 2/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA
[not found] ` <sashiko-outbox-217692@kernel.org>
@ 2026-11-22 10:14 ` Daniel Carter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Carter @ 2026-11-22 10:14 UTC (permalink / raw)
To: krzk, andersson, konradybcio
Cc: robh, conor+dt, devicetree, linux-arm-msm, linux-kernel,
yass27106
Hi Krzysztof, hi all,
A friendly ping on this one - no rush, just making sure it did not fall
through the cracks.
Patches 1/3 and 3/3 already carry Krzysztof's Acked-by and Srini's
Reviewed-by; only 2/3 (the device tree itself) is still awaiting review.
On the panel question Sashiko raised: the panel node is inherited from the
shared x1-asus-vivobook-s15.dtsi, and display output works correctly on
this hardware with it (iGPU-accelerated desktop). The exact panel model has
not been identified from EDID yet - I can send a follow-up refining the
panel description once it is, or adjust it in this series beforehand if you
would prefer that before the board is merged.
Is there anything else you would like changed in 2/3?
Best regards,
Daniel Carter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 3/3] soundwire: qcom: check clk_prepare_enable() return values
2026-11-16 20:55 ` [PATCH v5 3/3] soundwire: qcom: check clk_prepare_enable() return values Daniel Carter
@ 2026-11-22 15:41 ` Daniel Carter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Carter @ 2026-11-22 15:41 UTC (permalink / raw)
To: vkoul
Cc: srinivas.kandagatla, andersson, linux-sound, linux-arm-msm,
linux-kernel, yass27106
Hi Vinod,
A friendly ping on this one - it already has Srini's Reviewed-by and carries
Fixes: tags plus Cc: stable.
One rebase note: the patch was written against v7.4-rc2, and your fixes
branch has since gained "soundwire: qcom: disable the interrupt before
gating the clock", which shifts the runtime-resume hunk. I verified it
applies cleanly on top of your fixes branch (apply + build + checkpatch
clean), with the error path still returning before enable_irq():
- clk_prepare_enable(ctrl->hclk);
+ ret = clk_prepare_enable(ctrl->hclk);
+ if (ret)
+ return ret;
+
enable_irq(ctrl->irq);
If you would like it for the current -rc cycle, I can resend it rebased on
soundwire/fixes; otherwise it can wait for the next merge window. Either
way, let me know if you want anything changed.
Best regards,
Daniel Carter
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-11-22 15:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 20:55 [PATCH v5 0/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA Daniel Carter
2026-11-16 20:55 ` [PATCH v5 1/3] dt-bindings: arm: qcom: document " Daniel Carter
2026-11-16 20:55 ` [PATCH v5 2/3] arm64: dts: qcom: add device tree for " Daniel Carter
2026-11-16 20:55 ` [PATCH v5 3/3] soundwire: qcom: check clk_prepare_enable() return values Daniel Carter
2026-11-22 15:41 ` Daniel Carter
[not found] ` <sashiko-outbox-217692@kernel.org>
2026-11-22 10:14 ` [PATCH v5 2/3] arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA Daniel Carter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox