diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2018-06-14 14:22:35 +0200 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2018-06-14 14:22:35 +0200 |
| commit | 3f9a18deb8ff111974cc84df443649d41a6afc18 (patch) | |
| tree | 0594b460eae6908f08a765f0ba758fcb4d3ea765 /arch/arm64/boot/dts/qcom | |
| parent | 4579f43d0d8868e2b4615ee3c64dc49fd54ddb79 (diff) | |
| parent | 70d7bbd9b504c1dde0dc44a469a513695d9cbdd6 (diff) | |
Merge tag 'v4.14.49' into release/qcomlt-4.14
This is the 4.14.49 stable release
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Diffstat (limited to 'arch/arm64/boot/dts/qcom')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 70009b15ffd1..5bb901fe28f1 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -790,8 +790,8 @@ blsp2_spi5: spi@075ba000{ compatible = "qcom,spi-qup-v2.2.1"; reg = <0x075ba000 0x600>; - interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&gcc GCC_BLSP2_QUP5_SPI_APPS_CLK>, + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&gcc GCC_BLSP2_QUP6_SPI_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; clock-names = "core", "iface"; pinctrl-names = "default", "sleep"; |