Skip to content

QCLINUX: dt-bindings/dmaengine/net: qcom: FIX BAM XPU violation for shikra #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akakum-qualcomm wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
Open

QCLINUX: dt-bindings/dmaengine/net: qcom: FIX BAM XPU violation for shikra #1229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 30 additions & 28 deletions arch/arm64/boot/dts/qcom/shikra.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,6 @@
#address-cells = <2>;
#size-cells = <2>;

bam_dmux: bam-dmux {
compatible = "qcom,bam-dmux";

interrupts-extended = <&modem_smsm 1 IRQ_TYPE_EDGE_BOTH>,
<&modem_smsm 11 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "pc",
"pc-ack";

qcom,smem-states = <&apps_smsm 1>, <&apps_smsm 11>;
qcom,smem-state-names = "pc",
"pc-ack";

dmas = <&bam_dmux_dma 4>, <&bam_dmux_dma 5>;
dma-names = "tx", "rx";
};

clocks {
xo_board: xo-board {
compatible = "fixed-clock";
Expand Down Expand Up @@ -2725,18 +2709,6 @@
};
};

bam_dmux_dma: dma-controller@6044000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x0 0x06044000 0x0 0x19000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_EDGE_RISING 0>;
#dma-cells = <1>;
qcom,ee = <0>;

num-channels = <6>;
qcom,num-ees = <1>;
qcom,powered-remotely;
};

remoteproc_mpss: remoteproc@6080000 {
compatible = "qcom,shikra-mpss-pas";
reg = <0x0 0x06080000 0x0 0x100>;
Expand Down Expand Up @@ -2769,6 +2741,23 @@

status = "disabled";

bam_dmux: bam-dmux {
compatible = "qcom,shikra-bam-dmux", "qcom,bam-dmux";

interrupts-extended = <&modem_smsm 1 IRQ_TYPE_EDGE_BOTH>,
<&modem_smsm 11 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "pc",
"pc-ack";

qcom,smem-states = <&apps_smsm 1>,
<&apps_smsm 11>;
qcom,smem-state-names = "pc",
"pc-ack";

dmas = <&bam_dmux_dma 4>, <&bam_dmux_dma 5>;
dma-names = "tx", "rx";
};

glink-edge {
interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING 0>;
mboxes = <&apcs_glb 12>;
Expand Down Expand Up @@ -5025,6 +5014,19 @@
label = "cti_apss_2";
};

bam_dmux_dma: dma-controller@6044000 {
compatible = "qcom,shikra-bam-dma", "qcom,bam-v1.7.0";
reg = <0x0 0x06044000 0x0 0x19000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_EDGE_RISING 0>;
#dma-cells = <1>;
qcom,ee = <0>;

num-channels = <6>;
qcom,num-ees = <1>;
qcom,powered-remotely;
qcom,vmid = <QCOM_SCM_VMID_NAV>;
};

sram@c11e000 {
compatible = "qcom,shikra-imem", "mmio-sram";
reg = <0x0 0x0c11e000 0x0 0x1000>;
Expand Down
Loading