On 5.03.2023 13:59, Krzysztof Kozlowski wrote:
> status=okay should appear in final place where all required properties
> are provided, because that makes the code the easiest to read. Move the
> status from common OnePlus DTSI to board DTS. No functional changes.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> ---
+CC Harry
Are all of these firmwares actually different on 3/3T?
My educated guess would be that at least ZAP and Venus could
be shared. Could you doublecheck?
For the patch, I suppose this does make sense and it looks like we're
already doing it, so:
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 17 -----------------
> arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 ++++++
> arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 ++++++
> 3 files changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> index 104deaee74e5..2adadc1e5b7c 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> @@ -85,10 +85,6 @@ wlan_en: wlan-en-regulator {
> };
> };
>
> -&adsp_pil {
> - status = "okay";
> -};
> -
> &blsp1_i2c3 {
> status = "okay";
>
> @@ -183,10 +179,6 @@ &dsi0_phy {
> status = "okay";
> };
>
> -&gpu {
> - status = "okay";
> -};
> -
> &hsusb_phy1 {
> vdd-supply = <&vreg_l28a_0p925>;
> vdda-pll-supply = <&vreg_l12a_1p8>;
> @@ -215,7 +207,6 @@ &mmcc {
>
> &mss_pil {
> pll-supply = <&vreg_l12a_1p8>;
> - status = "okay";
> };
>
> &pcie0 {
> @@ -548,10 +539,6 @@ wcd9335: codec@1,0 {
> };
> };
>
> -&slpi_pil {
> - status = "okay";
> -};
> -
> &sound {
> compatible = "qcom,apq8096-sndcard";
> model = "OnePlus3";
> @@ -812,7 +799,3 @@ &usb3_dwc3 {
>
> maximum-speed = "high-speed";
> };
> -
> -&venus {
> - status = "okay";
> -};
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
> index 1bdc1b134305..dfe75119b8d2 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
> @@ -17,6 +17,7 @@ / {
>
> &adsp_pil {
> firmware-name = "qcom/msm8996/oneplus3/adsp.mbn";
> + status = "okay";
> };
>
> &battery {
> @@ -25,6 +26,8 @@ &battery {
> };
>
> &gpu {
> + status = "okay";
> +
> zap-shader {
> firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
> };
> @@ -33,12 +36,15 @@ zap-shader {
> &mss_pil {
> firmware-name = "qcom/msm8996/oneplus3/mba.mbn",
> "qcom/msm8996/oneplus3/modem.mbn";
> + status = "okay";
> };
>
> &slpi_pil {
> firmware-name = "qcom/msm8996/oneplus3/slpi.mbn";
> + status = "okay";
> };
>
> &venus {
> firmware-name = "qcom/msm8996/oneplus3/venus.mbn";
> + status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
> index 34f837dd0c12..51fce65e89f1 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
> @@ -18,6 +18,7 @@ / {
>
> &adsp_pil {
> firmware-name = "qcom/msm8996/oneplus3t/adsp.mbn";
> + status = "okay";
> };
>
> &battery {
> @@ -26,6 +27,8 @@ &battery {
> };
>
> &gpu {
> + status = "okay";
> +
> zap-shader {
> firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
> };
> @@ -34,12 +37,15 @@ zap-shader {
> &mss_pil {
> firmware-name = "qcom/msm8996/oneplus3t/mba.mbn",
> "qcom/msm8996/oneplus3t/modem.mbn";
> + status = "okay";
> };
>
> &slpi_pil {
> firmware-name = "qcom/msm8996/oneplus3t/slpi.mbn";
> + status = "okay";
> };
>
> &venus {
> firmware-name = "qcom/msm8996/oneplus3t/venus.mbn";
> + status = "okay";
> };
