Skip to content

Commit

Permalink
Merge tag 'qcom-arm64-fixes-for-6.0' of https://git.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history 
…m/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM64 DTS fixes for 6.0

This corrects invalid IOMMU streams for the SM8150 CDSP FastRPC, moves
the wakeup-source of SC7280 USB nodes to the correct place, fixes the
SM8350 UFS PHY serdes size to not overlap with the other subnodes and
updates the firmware location for the Lenovo ThinkPad X13s to match the
movement in linux-firmware.

It also updates MAINTAINERS and .mailmap to reflect the changes in my
email address.

* tag 'qcom-arm64-fixes-for-6.0' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sm8350: fix UFS PHY serdes size
  arm64: dts: qcom: sc8280xp-x13s: Update firmware location
  MAINTAINERS: Update Bjorn's email address
  arm64: dts: qcom: sc7280: move USB wakeup-source property
  arm64: dts: qcom: thinkpad-x13s: Fix firmware location
  arm64: dts: qcom: sm8150: Fix fastrpc iommu values

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
  • Loading branch information
@arndb
arndb committed Sep 23, 2022
2 parents 4952aa6 + 40e9541 commit c69badd
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ Ben M Cahill <[email protected]>
Ben Widawsky <[email protected]> <[email protected]>
Ben Widawsky <[email protected]> <[email protected]>
Ben Widawsky <[email protected]> <[email protected]>
Bjorn Andersson <[email protected]> <[email protected]>
Bjorn Andersson <[email protected]> <[email protected]>
Bjorn Andersson <[email protected]> <[email protected]>
Björn Steinbrink <[email protected]>
Björn Töpel <[email protected]> <[email protected]>
Björn Töpel <[email protected]> <[email protected]>
Expand Down
12 changes: 6 additions & 6 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2579,7 +2579,7 @@ W: http://www.armlinux.org.uk/

ARM/QUALCOMM SUPPORT
M: Andy Gross <[email protected]>
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
R: Konrad Dybcio <[email protected]>
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -8943,7 +8943,7 @@ F: include/linux/hw_random.h

HARDWARE SPINLOCK CORE
M: Ohad Ben-Cohen <[email protected]>
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
R: Baolin Wang <[email protected]>
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -16125,7 +16125,7 @@ F: drivers/gpio/gpio-sama5d2-piobu.c
F: drivers/pinctrl/pinctrl-at91*

PIN CONTROLLER - QUALCOMM
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
L: [email protected]
S: Maintained
F: Documentation/devicetree/bindings/pinctrl/qcom,*.txt
Expand Down Expand Up @@ -16818,7 +16818,7 @@ F: Documentation/devicetree/bindings/media/*camss*
F: drivers/media/platform/qcom/camss/

QUALCOMM CLOCK DRIVERS
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
L: [email protected]
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
Expand Down Expand Up @@ -17307,7 +17307,7 @@ S: Supported
F: fs/reiserfs/

REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
M: Mathieu Poirier <[email protected]>
L: [email protected]
S: Maintained
Expand All @@ -17320,7 +17320,7 @@ F: include/linux/remoteproc.h
F: include/linux/remoteproc/

REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
M: Bjorn Andersson <bjorn.andersson@linaro.org>
M: Bjorn Andersson <andersson@kernel.org>
M: Mathieu Poirier <[email protected]>
L: [email protected]
S: Maintained
Expand Down
3 changes: 2 additions & 1 deletion arch/arm64/boot/dts/qcom/sc7280.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3374,6 +3374,8 @@
<&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB3_0 0>;
interconnect-names = "usb-ddr", "apps-usb";

wakeup-source;

usb_1_dwc3: usb@a600000 {
compatible = "snps,dwc3";
reg = <0 0x0a600000 0 0xe000>;
Expand All @@ -3384,7 +3386,6 @@
phys = <&usb_1_hsphy>, <&usb_1_ssphy>;
phy-names = "usb2-phy", "usb3-phy";
maximum-speed = "super-speed";
wakeup-source;
};
};

Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@
};

&remoteproc_adsp {
firmware-name = "qcom/sc8280xp/qcadsp8280.mbn";
firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";

status = "okay";
};

&remoteproc_nsp0 {
firmware-name = "qcom/sc8280xp/qccdsp8280.mbn";
firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";

status = "okay";
};
Expand Down
24 changes: 8 additions & 16 deletions arch/arm64/boot/dts/qcom/sm8150.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3394,57 +3394,49 @@
compute-cb@1 {
compatible = "qcom,fastrpc-compute-cb";
reg = <1>;
iommus = <&apps_smmu 0x1401 0x2040>,
<&apps_smmu 0x1421 0x0>,
<&apps_smmu 0x2001 0x420>,
<&apps_smmu 0x2041 0x0>;
iommus = <&apps_smmu 0x1001 0x0460>;
};

compute-cb@2 {
compatible = "qcom,fastrpc-compute-cb";
reg = <2>;
iommus = <&apps_smmu 0x2 0x3440>,
<&apps_smmu 0x22 0x3400>;
iommus = <&apps_smmu 0x1002 0x0460>;
};

compute-cb@3 {
compatible = "qcom,fastrpc-compute-cb";
reg = <3>;
iommus = <&apps_smmu 0x3 0x3440>,
<&apps_smmu 0x1423 0x0>,
<&apps_smmu 0x2023 0x0>;
iommus = <&apps_smmu 0x1003 0x0460>;
};

compute-cb@4 {
compatible = "qcom,fastrpc-compute-cb";
reg = <4>;
iommus = <&apps_smmu 0x4 0x3440>,
<&apps_smmu 0x24 0x3400>;
iommus = <&apps_smmu 0x1004 0x0460>;
};

compute-cb@5 {
compatible = "qcom,fastrpc-compute-cb";
reg = <5>;
iommus = <&apps_smmu 0x5 0x3440>,
<&apps_smmu 0x25 0x3400>;
iommus = <&apps_smmu 0x1005 0x0460>;
};

compute-cb@6 {
compatible = "qcom,fastrpc-compute-cb";
reg = <6>;
iommus = <&apps_smmu 0x6 0x3460>;
iommus = <&apps_smmu 0x1006 0x0460>;
};

compute-cb@7 {
compatible = "qcom,fastrpc-compute-cb";
reg = <7>;
iommus = <&apps_smmu 0x7 0x3460>;
iommus = <&apps_smmu 0x1007 0x0460>;
};

compute-cb@8 {
compatible = "qcom,fastrpc-compute-cb";
reg = <8>;
iommus = <&apps_smmu 0x8 0x3460>;
iommus = <&apps_smmu 0x1008 0x0460>;
};

/* note: secure cb9 in downstream */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sm8350.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2128,7 +2128,7 @@

ufs_mem_phy: phy@1d87000 {
compatible = "qcom,sm8350-qmp-ufs-phy";
reg = <0 0x01d87000 0 0xe10>;
reg = <0 0x01d87000 0 0x1c4>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
Expand Down

0 comments on commit c69badd

Please sign in to comment.