Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arch/arm64/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ dtb-$(CONFIG_ARCH_QCOM) += lemans-camx-el2.dtbo

dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-staging.dtbo

dtb-$(CONFIG_ARCH_QCOM) += lemans-rtss-mb.dtbo
dtb-$(CONFIG_ARCH_QCOM) += lemans-staging.dtbo

monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
Expand All @@ -539,7 +538,6 @@ dtb-$(CONFIG_ARCH_QCOM) += monaco-camx-el2.dtb
dtb-$(CONFIG_ARCH_QCOM) += monaco-camx-el2.dtbo

dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-staging.dtbo
dtb-$(CONFIG_ARCH_QCOM) += monaco-rtss-mb.dtbo

dtb-$(CONFIG_ARCH_QCOM) += monaco-staging.dtbo

Expand Down
65 changes: 0 additions & 65 deletions arch/arm64/boot/dts/qcom/lemans-rtss-mb.dtso

This file was deleted.

45 changes: 45 additions & 0 deletions arch/arm64/boot/dts/qcom/lemans-staging.dtso
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,51 @@

/dts-v1/;
/plugin/;
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/clock/qcom,sa8775p-gcc.h>
#include <dt-bindings/mailbox/qcom-ipcc.h>

&{/} {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add rtss_mailbox device node for Lemans platform, syscon-based, using
ipcc1-ipcc4 and the apss_tcsr_req/apss_tcsr_resp/apss_shared_ipc
syscon nodes.

You are not.

rtss_mailbox: rtss-ipcc-mailbox {
compatible = "qcom,sa8775p-rtss-mailbox", "qcom,rtss-mailbox";
qcom,syscon-tcsr-req = <&tcsr 0x3e02c>;
qcom,syscon-tcsr-resp = <&tcsr 0x3d018>;
qcom,syscon-ipc = <&apss_shared_ipc 0x0>;
mboxes = <&ipcc1 IPCC_CLIENT_RTSS0 0x2>,
<&ipcc1 IPCC_CLIENT_RTSS1 0x3>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x4>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x5>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x6>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x7>,
<&ipcc1 IPCC_CLIENT_RTSS2 0x8>,
<&ipcc1 IPCC_CLIENT_RTSS1 0x9>,
<&ipcc1 IPCC_CLIENT_RTSS2 0xa>,
<&ipcc1 IPCC_CLIENT_RTSS1 0xb>,
<&ipcc1 IPCC_CLIENT_RTSS0 0xc>,
<&ipcc1 IPCC_CLIENT_RTSS0 0xd>,
<&ipcc1 IPCC_CLIENT_RTSS1 0xe>,
<&ipcc1 IPCC_CLIENT_RTSS2 0xf>,
<&ipcc1 IPCC_CLIENT_RTSS3 0x10>;
interrupts-extended = <&ipcc1 IPCC_CLIENT_RTSS0 0x2 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS1 0x3 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x4 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x5 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x6 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0x7 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS2 0x8 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS1 0x9 IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS2 0xa IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS1 0xb IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0xc IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS0 0xd IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS1 0xe IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS2 0xf IRQ_TYPE_EDGE_RISING>,
<&ipcc1 IPCC_CLIENT_RTSS3 0x10 IRQ_TYPE_EDGE_RISING>;
memory-region = <&sail_mailbox_mem>,
<&sail_ota_mem>;
};
};

&soc {
tgu@4b0e000 {
Expand Down
43 changes: 42 additions & 1 deletion arch/arm64/boot/dts/qcom/lemans.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,42 @@
#mbox-cells = <2>;
};

ipcc1: mailbox@488000 {
compatible = "qcom,sa8775p-ipcc", "qcom,ipcc";
reg = <0x0 0x00488000 0x0 0x1000>;
interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <3>;
#mbox-cells = <2>;
};

ipcc2: mailbox@4a1000 {
compatible = "qcom,sa8775p-ipcc", "qcom,ipcc";
reg = <0x0 0x004a1000 0x0 0x1000>;
interrupts = <GIC_SPI 553 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <3>;
#mbox-cells = <2>;
};

ipcc3: mailbox@4a2000 {
compatible = "qcom,sa8775p-ipcc", "qcom,ipcc";
reg = <0x0 0x004a2000 0x0 0x1000>;
interrupts = <GIC_SPI 554 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <3>;
#mbox-cells = <2>;
};

ipcc4: mailbox@4a3000 {
compatible = "qcom,sa8775p-ipcc", "qcom,ipcc";
reg = <0x0 0x004a3000 0x0 0x1000>;
interrupts = <GIC_SPI 555 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <3>;
#mbox-cells = <2>;
};

qfprom: efuse@784000 {
compatible = "qcom,sa8775p-qfprom", "qcom,qfprom";
reg = <0x0 0x00784000 0x0 0x3000>;
Expand Down Expand Up @@ -4635,7 +4671,7 @@

tcsr: syscon@1fc0000 {
compatible = "qcom,sa8775p-tcsr", "syscon";
reg = <0x0 0x1fc0000 0x0 0x30000>;
reg = <0x0 0x1fc0000 0x0 0x40000>;
};

gpu: gpu@3d00000 {
Expand Down Expand Up @@ -7058,6 +7094,11 @@
redistributor-stride = <0x0 0x20000>;
};

apss_shared_ipc: syscon@17c0000c {
compatible = "qcom,sa8775p-tcsr", "syscon";

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly is behind this address? TCSR is at the other address, so it can't be TCSR.

reg = <0x0 0x17c0000c 0x0 0x4>;
};

watchdog@17c10000 {
compatible = "qcom,apss-wdt-sa8775p", "qcom,kpss-wdt";
reg = <0x0 0x17c10000 0x0 0x1000>;
Expand Down
65 changes: 0 additions & 65 deletions arch/arm64/boot/dts/qcom/monaco-rtss-mb.dtso

This file was deleted.