Revert "arm64: dts: qcom: nord: Add adreno and PCIe SMMU nodes" - #938
Merged
Shiraz Hashim (shashim-quic) merged 1 commit intoAug 12, 2026
Conversation
Bibek Kumar Patro (bibekpatro)
force-pushed
the
Qualcomm/staging/nord
branch
from
August 12, 2026 05:14
9b3d68d to
824cc13
Compare
|
Merge Check Failed: No CR Numbers Found Error: No Change Request numbers were found. Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests. |
This reverts commit e01e680 The nord-staging-qcom-next-7.2-rc3-20260807 tag includes the SMMU nodes from a previous WIP patch. Commit 860b7da ("arm64: dts: qcom: nord: Add adreno and PCIe SMMU nodes") subsequently landed the correct SMMU nodes with additional fixes, causing duplicate node creation. Revert the original addition in favour of 860b7da. Signed-off-by: Bibek Kumar Patro <bibek.patro@oss.qualcomm.com>
Bibek Kumar Patro (bibekpatro)
force-pushed
the
Qualcomm/staging/nord
branch
from
August 12, 2026 05:22
824cc13 to
959ef99
Compare
Shiraz Hashim (shashim-quic)
approved these changes
Aug 12, 2026
Shiraz Hashim (shashim-quic)
merged commit Aug 12, 2026
9564ae4
into
qualcomm-linux:staging/nord
1 of 2 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The nord-staging-qcom-next-7.2-rc3-20260807 tag includes the SMMU
nodes from WIP PR #925. PR #930 subsequently landed final SMMU fixes
that include the same nodes, causing duplicate node creation when both
are present. Revert the original addition to resolve the conflict;
the correct SMMU node definitions are now carried by PR #930.
This reverts commit e01e680. along with additional fixes related to node arrangement.