[PATCH 0/2] arm64: dts: qcom: HP OmniBook X14 / EliteBook Ultra G1q cleanups

[PATCH 0/2] arm64: dts: qcom: HP OmniBook X14 / EliteBook Ultra G1q cleanups

[Juerg Haefliger via B4 Relay]

This is a small two patch series that cleans up the device trees for the
HP OmniBook X14 family and untangles the HP EliteBook Ultra G1q from them.

Patch 1 consolidates the duplicated hamoa-pmics.dtsi include and
chassis-type property into the included x1-hp-omnibook-x14.dtsi.

Patch 2 makes the HP EliteBook Ultra G1q a sibling of the OmniBook X14
boards instead of a child, so all three (2 x omnibook, 1 x elitebook) are
at the same level.

Both patches are pure devicetree restructuring, no functional changes
intended.

...Juerg

---
Juerg Haefliger (2):
      arm64: dts: qcom: x1-hp-omnibook-x14: Consolidate pmics and chassis
      arm64: dts: qcom: hp-elitebook-ultra-g1q: Drop omnibook-x14.dts include

 arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi             | 4 ++++
 arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 7 ++++++-
 arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts        | 2 --
 arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts        | 3 +--
 4 files changed, 11 insertions(+), 5 deletions(-)
---
base-commit: 705529dab1fa872d8b53b09c95e1b03a95573376
change-id: 20261008-dts-qcom-hp-omnibook-x14-cleanup-0b4318b27d1d

Best regards,
--  
Juerg Haefliger <juerg.haefliger@canonical.com>

[PATCH 1/2] arm64: dts: qcom: x1-hp-omnibook-x14: Consolidate pmics and chassis

[Juerg Haefliger via B4 Relay]

From: Juerg Haefliger <juerg.haefliger@canonical.com>

hamoa-pmics.dtsi and chassis-type are identical across the HP Omnibook X14
boards that include this shared dtsi, so move them there.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi      | 4 ++++
 arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 2 --
 arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi b/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
index 443901a09d4c..1ae68a71bb3e 100644
--- a/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
@@ -10,7 +10,11 @@
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
 
+#include "hamoa-pmics.dtsi"
+
 / {
+	chassis-type = "laptop";
+
 	aliases {
 		serial0 = &uart21;
 		serial1 = &uart14;
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
index b79e59e1c413..5630ed1181ca 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
@@ -7,13 +7,11 @@
 /dts-v1/;
 
 #include "hamoa.dtsi"
-#include "hamoa-pmics.dtsi"
 #include "x1-hp-omnibook-x14.dtsi"
 
 / {
 	model = "HP Omnibook X 14-fe0";
 	compatible = "hp,omnibook-x14", "qcom,x1e80100";
-	chassis-type = "laptop";
 };
 
 &gpu_zap_shader {
diff --git a/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
index 0e4dfb0f0a2a..53a3ede856f0 100644
--- a/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
+++ b/arch/arm64/boot/dts/qcom/x1p42100-hp-omnibook-x14.dts
@@ -3,8 +3,8 @@
 /dts-v1/;
 
 #include "purwa.dtsi"
-#include "hamoa-pmics.dtsi"
 #include "x1-hp-omnibook-x14.dtsi"
+
 /delete-node/ &pmc8380_6;
 /delete-node/ &pmc8380_6_thermal;
 /delete-node/ &pmc8380_6_die_temp;
@@ -12,7 +12,6 @@
 / {
 	model = "HP Omnibook X 14-fe1";
 	compatible = "hp,omnibook-x14-fe1", "qcom,x1p42100";
-	chassis-type = "laptop";
 };
 
 &gpu_zap_shader {

-- 
2.53.0

[PATCH 2/2] arm64: dts: qcom: hp-elitebook-ultra-g1q: Drop omnibook-x14.dts include

[Juerg Haefliger via B4 Relay]

From: Juerg Haefliger <juerg.haefliger@canonical.com>

The EliteBook Ultra G1q is a different product from the OmniBook X14 that
happens to reuse the same mainboard, not a variant of it. As such, it
should not be a child of x1e80100-hp-omnibook-x14 but rather a sibling.
Include the shared base platform dtsi to match the other OmniBook X14s.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
index 0b3b6cb23e1a..9327eaa16b92 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
@@ -2,7 +2,8 @@
 
 /dts-v1/;
 
-#include "x1e80100-hp-omnibook-x14.dts"
+#include "hamoa.dtsi"
+#include "x1-hp-omnibook-x14.dtsi"
 
 / {
 	model = "HP EliteBook Ultra G1q";
@@ -16,11 +17,15 @@ &gpu_zap_shader {
 &remoteproc_adsp {
 	firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qcadsp8380.mbn",
 			"qcom/x1e80100/hp/elitebook-ultra-g1q/adsp_dtbs.elf";
+
+	status = "okay";
 };
 
 &remoteproc_cdsp {
 	firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qccdsp8380.mbn",
 			"qcom/x1e80100/hp/elitebook-ultra-g1q/cdsp_dtbs.elf";
+
+	status = "okay";
 };
 
 &sound {

-- 
2.53.0

Re: [PATCH 1/2] arm64: dts: qcom: x1-hp-omnibook-x14: Consolidate pmics and chassis

[Abel Vesa]

On 26-10-08 20:34:45, Juerg Haefliger via B4 Relay wrote:
> From: Juerg Haefliger <juerg.haefliger@canonical.com>
> 
> hamoa-pmics.dtsi and chassis-type are identical across the HP Omnibook X14
> boards that include this shared dtsi, so move them there.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH 2/2] arm64: dts: qcom: hp-elitebook-ultra-g1q: Drop omnibook-x14.dts include

[Abel Vesa]

On 26-10-08 20:34:46, Juerg Haefliger via B4 Relay wrote:
> From: Juerg Haefliger <juerg.haefliger@canonical.com>
> 
> The EliteBook Ultra G1q is a different product from the OmniBook X14 that
> happens to reuse the same mainboard, not a variant of it. As such, it
> should not be a child of x1e80100-hp-omnibook-x14 but rather a sibling.
> Include the shared base platform dtsi to match the other OmniBook X14s.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>

You are also enabling the some remoteprocs, so please mention that in
the commit message.

With that fixed:

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH 2/2] arm64: dts: qcom: hp-elitebook-ultra-g1q: Drop omnibook-x14.dts include

[Juerg Haefliger]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

On Fri, 9 Oct 2026 22:11:56 +0300
Abel Vesa <abel.vesa@oss.qualcomm.com> wrote:

> On 26-10-08 20:34:46, Juerg Haefliger via B4 Relay wrote:
> > From: Juerg Haefliger <juerg.haefliger@canonical.com>
> > 
> > The EliteBook Ultra G1q is a different product from the OmniBook X14 that
> > happens to reuse the same mainboard, not a variant of it. As such, it
> > should not be a child of x1e80100-hp-omnibook-x14 but rather a sibling.
> > Include the shared base platform dtsi to match the other OmniBook X14s.
> > 
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>  
> 
> You are also enabling the some remoteprocs, so please mention that in
> the commit message.

Done, v2 is on the list.

> With that fixed:
> 
> Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Thanks for the review!

...Juerg

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]