Skip to content

L
linux
Commit 61d2ca50 authored by Jonathan Marek's avatar Jonathan Marek Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: fix pm8150 gpio interrupts 

This was mistakenly copied from the downstream dts, however the upstream
driver works differently.

I only tested this with the pm8150_gpios node (used with volume button),
but the 2 others should be the same.

Fixes: e92b61c8 ("arm64: dts: qcom: pm8150l: Add base dts file")
Fixes: 229d5bca ("arm64: dts: qcom: pm8150b: Add base dts file")
Fixes: 5101f22a ("arm64: dts: qcom: pm8150: Add base dts file")
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Link: https://lore.kernel.org/r/20200420153543.14512-1-jonathan@marek.caSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 4a7b0cf2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 36 deletions
arch/arm64/boot/dts/qcom/pm8150.dtsi
View file @ 61d2ca50
...@@ -73,18 +73,8 @@ pm8150_gpios: gpio@c000 { ...@@ -73,18 +73,8 @@ pm8150_gpios: gpio@c000 {
reg = <0xc000>; reg = <0xc000>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupts = <0x0 0xc0 0x0 IRQ_TYPE_NONE>, interrupt-controller;
<0x0 0xc1 0x0 IRQ_TYPE_NONE>, #interrupt-cells = <2>;
<0x0 0xc2 0x0 IRQ_TYPE_NONE>,
<0x0 0xc3 0x0 IRQ_TYPE_NONE>,
<0x0 0xc4 0x0 IRQ_TYPE_NONE>,
<0x0 0xc5 0x0 IRQ_TYPE_NONE>,
<0x0 0xc6 0x0 IRQ_TYPE_NONE>,
<0x0 0xc7 0x0 IRQ_TYPE_NONE>,
<0x0 0xc8 0x0 IRQ_TYPE_NONE>,
<0x0 0xc9 0x0 IRQ_TYPE_NONE>,
<0x0 0xca 0x0 IRQ_TYPE_NONE>,
<0x0 0xcb 0x0 IRQ_TYPE_NONE>;
}; };
}; };
......
arch/arm64/boot/dts/qcom/pm8150b.dtsi
View file @ 61d2ca50
...@@ -62,18 +62,8 @@ pm8150b_gpios: gpio@c000 { ...@@ -62,18 +62,8 @@ pm8150b_gpios: gpio@c000 {
reg = <0xc000>; reg = <0xc000>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupts = <0x2 0xc0 0x0 IRQ_TYPE_NONE>, interrupt-controller;
<0x2 0xc1 0x0 IRQ_TYPE_NONE>, #interrupt-cells = <2>;
<0x2 0xc2 0x0 IRQ_TYPE_NONE>,
<0x2 0xc3 0x0 IRQ_TYPE_NONE>,
<0x2 0xc4 0x0 IRQ_TYPE_NONE>,
<0x2 0xc5 0x0 IRQ_TYPE_NONE>,
<0x2 0xc6 0x0 IRQ_TYPE_NONE>,
<0x2 0xc7 0x0 IRQ_TYPE_NONE>,
<0x2 0xc8 0x0 IRQ_TYPE_NONE>,
<0x2 0xc9 0x0 IRQ_TYPE_NONE>,
<0x2 0xca 0x0 IRQ_TYPE_NONE>,
<0x2 0xcb 0x0 IRQ_TYPE_NONE>;
}; };
}; };
......
arch/arm64/boot/dts/qcom/pm8150l.dtsi
View file @ 61d2ca50
...@@ -56,18 +56,8 @@ pm8150l_gpios: gpio@c000 { ...@@ -56,18 +56,8 @@ pm8150l_gpios: gpio@c000 {
reg = <0xc000>; reg = <0xc000>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupts = <0x4 0xc0 0x0 IRQ_TYPE_NONE>, interrupt-controller;
<0x4 0xc1 0x0 IRQ_TYPE_NONE>, #interrupt-cells = <2>;
<0x4 0xc2 0x0 IRQ_TYPE_NONE>,
<0x4 0xc3 0x0 IRQ_TYPE_NONE>,
<0x4 0xc4 0x0 IRQ_TYPE_NONE>,
<0x4 0xc5 0x0 IRQ_TYPE_NONE>,
<0x4 0xc6 0x0 IRQ_TYPE_NONE>,
<0x4 0xc7 0x0 IRQ_TYPE_NONE>,
<0x4 0xc8 0x0 IRQ_TYPE_NONE>,
<0x4 0xc9 0x0 IRQ_TYPE_NONE>,
<0x4 0xca 0x0 IRQ_TYPE_NONE>,
<0x4 0xcb 0x0 IRQ_TYPE_NONE>;
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7