From: Rong Zhang <i@rong.moe> Date: Tue, 13 Feb 2024 10:58:37 +0000 (+0800) Subject: ARM: dts: qcom: msm8974-klte-common: Pin WiFi board type X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a730364f16ddc65268d828acdbf17f2a762e84be;p=linux.git ARM: dts: qcom: msm8974-klte-common: Pin WiFi board type klte* variants have little difference in the WiFi part. Without "brcm,board-type", variant-specific NVRAM file will be probed (e.g., klte probes samsung,klte). Pin it to "samsung,klte" to allow klte* to load the same NVRAM file as klte. Signed-off-by: Rong Zhang <i@rong.moe> Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Tested-by: Icenowy Zheng <uwu@icenowy.me> Link: https://lore.kernel.org/r/20240213110137.122737-3-i@rong.moe Signed-off-by: Bjorn Andersson <andersson@kernel.org> --- diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi index 11e35b34ebd66..b5443fd5b425e 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi @@ -661,6 +661,12 @@ reg = <1>; compatible = "brcm,bcm4329-fmac"; + /* + * Allow all klte* variants to load the same NVRAM file, + * as they have little difference in the WiFi part. + */ + brcm,board-type = "samsung,klte"; + interrupt-parent = <&tlmm>; interrupts = <92 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake";