| Message ID | 20201124041003.3600-1-jonathan@marek.ca |
|---|---|
| State | Accepted |
| Commit | 6acb71fd344adb08633b2b1d8261a876fbd2bb18 |
| Headers | show |
| Series | arm64: dts: qcom: sort sm8150 usb_2 node | expand |
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Mon, 23 Nov 2020 23:10:03 -0500 you wrote: > Fix an error introduced resolving conflicts with camnoc_virt node. > > Fixes: 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") > --- > arch/arm64/boot/dts/qcom/sm8150.dtsi | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Here is the summary with links: - arm64: dts: qcom: sort sm8150 usb_2 node https://git.kernel.org/qcom/c/872b41c9a255 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index bcfb06f5bebe..743228ba148f 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -976,13 +976,6 @@ usb_1_dwc3: dwc3@a600000 { }; }; - camnoc_virt: interconnect@ac00000 { - compatible = "qcom,sm8150-camnoc-virt"; - reg = <0 0x0ac00000 0 0x1000>; - #interconnect-cells = <1>; - qcom,bcm-voters = <&apps_bcm_voter>; - }; - usb_2: usb@a8f8800 { compatible = "qcom,sm8150-dwc3", "qcom,dwc3"; reg = <0 0x0a8f8800 0 0x400>; @@ -1028,6 +1021,13 @@ usb_2_dwc3: dwc3@a800000 { }; }; + camnoc_virt: interconnect@ac00000 { + compatible = "qcom,sm8150-camnoc-virt"; + reg = <0 0x0ac00000 0 0x1000>; + #interconnect-cells = <1>; + qcom,bcm-voters = <&apps_bcm_voter>; + }; + aoss_qmp: power-controller@c300000 { compatible = "qcom,sm8150-aoss-qmp"; reg = <0x0 0x0c300000 0x0 0x100000>;
Fix an error introduced resolving conflicts with camnoc_virt node. Fixes: 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)