diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-10-29 07:47:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-10-29 07:47:38 -0700 |
| commit | b26e84e603a4a3bcbe4a132c0941ddbc375a0f54 (patch) | |
| tree | 3dbe21469926e814e96fcc51ea7ae6cd4c676376 | |
| parent | 0ba34f233443d6c622201784c3417f6efd773f73 (diff) | |
| parent | b5afb2b7df91bae72b8f3eaafe8394846c3491c5 (diff) | |
Merge "ARM: dts: msm: Add npu mailbox controller for atoll" into kernel.lnx.4.14.r8-relLA.UM.8.9.r1-05300-SM6xx.0
| -rw-r--r-- | arch/arm64/boot/dts/qcom/atoll-npu.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/atoll.dtsi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/atoll-npu.dtsi b/arch/arm64/boot/dts/qcom/atoll-npu.dtsi index d908ca8130ef..64394c347739 100644 --- a/arch/arm64/boot/dts/qcom/atoll-npu.dtsi +++ b/arch/arm64/boot/dts/qcom/atoll-npu.dtsi @@ -61,6 +61,10 @@ qcom,proxy-reg-names ="vdd", "vdd_cx"; qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>; #cooling-cells = <2>; + mboxes = <&apcs_glb2 4>, + <&apcs_glb2 6>; + mbox-names = "glink", "smp2p"; + #mbox-cells = <1>; qcom,npubw-devs = <&npu_npu_ddr_bw>; qcom,npubw-dev-names = "ddr_bw"; qcom,src-dst-ports = <MSM_BUS_MASTER_NPU MSM_BUS_SLAVE_EBI_CH0>; diff --git a/arch/arm64/boot/dts/qcom/atoll.dtsi b/arch/arm64/boot/dts/qcom/atoll.dtsi index b1a42b5f7568..96faf732c46c 100644 --- a/arch/arm64/boot/dts/qcom/atoll.dtsi +++ b/arch/arm64/boot/dts/qcom/atoll.dtsi @@ -2291,7 +2291,7 @@ glink_npu: npu { transport = "smem"; qcom,remote-pid = <10>; - mboxes = <&apcs_glb2 4>; + mboxes = <&msm_npu 4>; mbox-names = "npu_smem"; interrupts = <GIC_SPI 587 IRQ_TYPE_EDGE_RISING>; |