diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-12 19:00:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-12 19:00:50 -0800 |
| commit | 627a89f9ea63dda84e557774a0fa65e57b9940cb (patch) | |
| tree | 477edf28d7f018b9a2fe611167035e98030cff43 | |
| parent | 71de11b9adbfe0c7c857691c433d930e50434f9c (diff) | |
| parent | e6b1de7b75e92d8cad8793a99fff0b3f9e67ea65 (diff) | |
Merge "ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards"
6 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts index e59003f2d316..0ef3d4287c45 100644 --- a/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -38,7 +38,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts index d438bbe828ed..1bca588f448e 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -30,7 +30,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts index ecde7c667f9a..e69640ddd363 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts @@ -30,7 +30,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts index 8ca2b30b3779..9e630aa77717 100644 --- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8996-v3-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -43,7 +43,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts index e104be7c2742..2983513d0310 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -30,7 +30,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts index 06d040aa6bcb..d798d9e163f2 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-v1.1-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -30,7 +30,7 @@ compatible = "renesas,rh850"; reg = <0>; interrupt-parent = <&tlmm>; - interrupts = <127 0>; + interrupts = <122 0>; spi-max-frequency = <5000000>; }; }; |