Re: [PATCH v5 2/3] arm64: dts: qcom: x1-hp-x14: Commonalize HP Omnibook X14 device tree

[Krzysztof Kozlowski]

On Tue, Jul 08, 2025 at 10:34:07PM +0200, Jens Glathe wrote:
> Commonalize the HP Omnibook X14 device tree for derivation of Hamoa (x1e*/x1p6*)
> and Purwa (x1p4*/x1*) variants. Required because the device trees are not
> compatible.
> 
> Signed-off-by: Jens Glathe <jens.glathe@xxxxxxxxxxxxxxxxxxxxxx>
> ---
>  ...hp-omnibook-x14.dts => x1-hp-omnibook-x14.dtsi} |   23 -
>  .../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts     | 1610 +-------------------
>  2 files changed, 34 insertions(+), 1599 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
> similarity index 98%
> copy from arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
> copy to arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
> index 8d2a9b7f4730783bbaa81e488a0e99cc195a195f..740d145d51a90b67e572b02486eeff9aa256fcde 100644
> --- a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
> +++ b/arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
> @@ -4,17 +4,12 @@
>   * Copyright (c) 2024, Xilin Wu <wuxilin123@xxxxxxxxx>
>   */
>  
> -/dts-v1/;
> -
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/input/gpio-keys.h>
>  #include <dt-bindings/input/input.h>
>  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
>  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
>  
> -#include "x1e80100.dtsi"
> -#include "x1e80100-pmics.dtsi"
> -
>  / {
>  	model = "HP Omnibook X 14";
>  	compatible = "hp,omnibook-x14", "qcom,x1e80100";

All these properties should be gone from DTSI.

> @@ -860,10 +855,6 @@ vreg_l3j_0p8: ldo3 {
>  
>  &gpu {
>  	status = "okay";
> -
> -	zap-shader {
> -		firmware-name = "qcom/x1e80100/hp/omnibook-x14/qcdxkmsuc8380.mbn";
> -	};
>  };

...

> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

Incomplete copyrights. While renaming/splitting you are not allowed to
change them.

> + */
> +
> +/dts-v1/;
> +
> +#include "x1e80100.dtsi"
> +#include "x1e80100-pmics.dtsi"
> +#include "x1-hp-omnibook-x14.dtsi"

Best regards,
Krzysztof