Skip to contentSkip to conversation

arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA

PATCH In review Daniel Carter 3 participants 6 messages Nov 14 – Nov 15

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

v4 cover arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA

Hi Krzysztof, hi all,

v4 of the series, now sent as a fresh thread (v3 was sent as replies inside the v2 thread, which made it easy to miss - apologies for that, and for v2 reaching you with the commit descriptions stripped by my mail setup; the commits themselves were always complete).

Changes since v3:

- Dropped the LPASS macro / SoundWire clock-retry patch following Mark Brown's review. The driver core already retriggers deferred probe when suppliers register, and a bounded retry loop open-coded in five drivers is not the right fix.
- soundwire: the clk_prepare_enable() check now returns IRQ_NONE from the interrupt handler (the status is neither read nor cleared on that path), carries Fixes: tags, and the runtime resume error path returns the error without unmasking the level-high wake IRQ.
- arm64/dts: style cleanups - status properties placed last, alphabetical ordering of DAI-link subnodes, continuation lines aligned to 8-column tabs, chassis-type no longer duplicated from the shared dtsi.
- The bindings patch now uses the "dt-bindings: arm: qcom:" subject prefix.

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

#1 lore raw

PATCH v4 1/3 dt-bindings: arm: qcom: document Asus Vivobook 16 X1607QA

Document the compatible for the Asus Vivobook 16 X1607QA laptop, based on the Qualcomm X1P42100 (Purwa) SoC.

---
 Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/qcom.yaml +1 -0
index 121ca557ce1..d22f1b0b4ef 100644
@@ -1306,6 +1306,7 @@ properties:
 
       - items:
           - enum:
+              - asus,vivobook-16-x1607qa
               - asus,vivobook-s15-x1p4
               - hp,omnibook-x14-fe1
               - lenovo,thinkbook-16
Signature · 1 line
2.55.0
#2 lore raw

PATCH v4 2/3 arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA

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.

---
 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
arch/arm64/boot/dts/qcom/Makefile +2 -0
index 88230c4e00e..4405eaab62d 100644
@@ -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
arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts new file +232 -0

232 lines not on this page · raw message

Signature · 1 line
2.55.0
#3 lore raw

PATCH v4 3/3 soundwire: qcom: check clk_prepare_enable() return values

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")
---
 drivers/soundwire/qcom.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/soundwire/qcom.c +11 -3
index 6e0c5fb10ef..62a44f64dd8 100644
@@ -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);
Signature · 1 line
2.55.0
Reviewed-by on v4 3/3
#4 lore raw

Re: [PATCH v4 3/3] soundwire: qcom: check clk_prepare_enable() return values

Quoted 10 lines · Daniel Carter

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")

Missing Cc Stable.

Quoted 1 line

Other than that, lgtm

--Srini

Quoted 43 lines
---
 drivers/soundwire/qcom.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/soundwire/qcom.c +11 -3
index 6e0c5fb10ef..62a44f64dd8 100644
@@ -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);
#5 lore raw
In reply to Daniel Carter
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Medium] arm64: dts: qcom: x1607qa inherits 15.6-inch s15 eDP panel node --

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Medium] arm64: dts: qcom: x1607qa inherits 15.6-inch s15 eDP panel node
--

commit 246e79ebfb4556e9bdaf80bc90837e339e322fb1
Author: Daniel Carter <[email protected]>

arm64: dts: qcom: add device tree for Asus Vivobook 16 X1607QA

This commit adds the device tree for the 16-inch Asus Vivobook 16 X1607QA laptop based on the Qualcomm X1P-42-100 SoC, building on x1-asus-vivobook-s15.dtsi.

Quoted 13 lines
arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts new file +7 -0
new file mode 100644
index 0000000000000..3877809dcb33a
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2026, Daniel Carter <[email protected]>
+ */
+
+/dts-v1/;
+

arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts line 17

Quoted 10 lines
arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-16-x1607qa.dts new file +10 -0
+#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";

[Severity: Medium]
Should this device tree override the eDP panel node under mdss_dp3 inherited from x1-asus-vivobook-s15.dtsi?

arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi:&mdss_dp3 {
	...
	aux-bus {
		panel {
			compatible = "samsung,atna56ac03", "samsung,atna33xc20";
			enable-gpios = <&pmc8380_3_gpios 4 GPIO_ACTIVE_HIGH>;
			power-supply = <&vreg_edp_3p3>;
	...
}

Per Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml, samsung,atna56ac03 is the 15.6-inch 3K (2880x1620) Samsung AMOLED panel for the Vivobook S 15, and samsung,atna33xc20 binds panel-samsung-atna33xc20.c, which applies Samsung AMOLED EL_ON3 power-cycling delays and DP AUX backlight control rather than standard eDP panel sequencing for this 16-inch laptop.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2