lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 112/252] arm64: dts: qcom: sdm630: Rewrite memory map
    Date
    From: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>

    [ Upstream commit 26e02c98a9ad63eb21b9be4ac92002f555130d3b ]

    The memory map was wrong. Fix it.

    Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
    Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
    Link: https://lore.kernel.org/r/20210728222542.54269-2-konrad.dybcio@somainline.org
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/qcom/sdm630.dtsi | 41 ++++++++++++----------------
    1 file changed, 18 insertions(+), 23 deletions(-)

    diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
    index f91a928466c3..5ea3884b3ccb 100644
    --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
    @@ -343,10 +343,19 @@ wlan_msa_mem: wlan-msa-mem@85700000 {
    };

    qhee_code: qhee-code@85800000 {
    - reg = <0x0 0x85800000 0x0 0x3700000>;
    + reg = <0x0 0x85800000 0x0 0x600000>;
    no-map;
    };

    + rmtfs_mem: memory@85e00000 {
    + compatible = "qcom,rmtfs-mem";
    + reg = <0x0 0x85e00000 0x0 0x200000>;
    + no-map;
    +
    + qcom,client-id = <1>;
    + qcom,vmid = <15>;
    + };
    +
    smem_region: smem-mem@86000000 {
    reg = <0 0x86000000 0 0x200000>;
    no-map;
    @@ -357,58 +366,44 @@ tz_mem: memory@86200000 {
    no-map;
    };

    - modem_fw_mem: modem-fw-region@8ac00000 {
    + mpss_region: mpss@8ac00000 {
    reg = <0x0 0x8ac00000 0x0 0x7e00000>;
    no-map;
    };

    - adsp_fw_mem: adsp-fw-region@92a00000 {
    + adsp_region: adsp@92a00000 {
    reg = <0x0 0x92a00000 0x0 0x1e00000>;
    no-map;
    };

    - pil_mba_mem: pil-mba-region@94800000 {
    + mba_region: mba@94800000 {
    reg = <0x0 0x94800000 0x0 0x200000>;
    no-map;
    };

    - buffer_mem: buffer-region@94a00000 {
    + buffer_mem: tzbuffer@94a00000 {
    reg = <0x0 0x94a00000 0x0 0x100000>;
    no-map;
    };

    - venus_fw_mem: venus-fw-region@9f800000 {
    + venus_region: venus@9f800000 {
    reg = <0x0 0x9f800000 0x0 0x800000>;
    no-map;
    };

    - secure_region2: secure-region2@f7c00000 {
    - reg = <0x0 0xf7c00000 0x0 0x5c00000>;
    - no-map;
    - };
    -
    adsp_mem: adsp-region@f6000000 {
    reg = <0x0 0xf6000000 0x0 0x800000>;
    no-map;
    };

    - qseecom_ta_mem: qseecom-ta-region@fec00000 {
    - reg = <0x0 0xfec00000 0x0 0x1000000>;
    - no-map;
    - };
    -
    qseecom_mem: qseecom-region@f6800000 {
    reg = <0x0 0xf6800000 0x0 0x1400000>;
    no-map;
    };

    - secure_display_memory: secure-region@f5c00000 {
    - reg = <0x0 0xf5c00000 0x0 0x5c00000>;
    - no-map;
    - };
    -
    - cont_splash_mem: cont-splash-region@9d400000 {
    - reg = <0x0 0x9d400000 0x0 0x23ff000>;
    + zap_shader_region: gpu@fed00000 {
    + compatible = "shared-dma-pool";
    + reg = <0x0 0xfed00000 0x0 0xa00000>;
    no-map;
    };
    };
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 13:51    [W:2.913 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site