From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Bjorn Andersson <andersson@kernel.org>,
Andy Gross <agross@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] ARM: dts: qcom-msm8960: use define for interrupt constants
Date: Tue, 8 Nov 2022 19:49:07 +0100 [thread overview]
Message-ID: <41242ffc-fd61-ded1-0647-bba1efb60a1e@linaro.org> (raw)
In-Reply-To: <20221108184529.26857-2-krzysztof.kozlowski@linaro.org>
On 08/11/2022 19:45, Krzysztof Kozlowski wrote:
> Replace GIC_PPI, GIC_SPI and interrupt type numbers with appropriate
> defines.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm/boot/dts/qcom-msm8960-cdp.dts | 2 +-
> arch/arm/boot/dts/qcom-msm8960.dtsi | 22 ++++++++++++----------
> 2 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> index cb0f612e6c90..3a484ac53917 100644
> --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> @@ -42,7 +42,7 @@ ethernet@0 {
> compatible = "micrel,ks8851";
> reg = <0>;
> interrupt-parent = <&msmgpio>;
> - interrupts = <90 8>;
> + interrupts = <90 IRQ_TYPE_LEVEL_LOW>;
> spi-max-frequency = <5400000>;
> vdd-supply = <&ext_l2>;
> vdd-io-supply = <&pm8921_lvs6>;
> diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
> index 30abf53b062d..2f32e734f18d 100644
> --- a/arch/arm/boot/dts/qcom-msm8960.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
> @@ -17,7 +17,7 @@ / {
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
> - interrupts = <1 14 0x304>;
> + interrupts = <GIC_PPI 14 0x304>;
>
> cpu@0 {
> compatible = "qcom,krait";
> @@ -52,7 +52,7 @@ memory {
>
> cpu-pmu {
> compatible = "qcom,krait-pmu";
> - interrupts = <1 10 0x304>;
> + interrupts = <GIC_PPI 10 0x304>;
> qcom,no-pc-write;
> };
>
> @@ -105,9 +105,9 @@ intc: interrupt-controller@2000000 {
> timer@200a000 {
> compatible = "qcom,kpss-timer",
> "qcom,kpss-wdt-msm8960", "qcom,msm-timer";
> - interrupts = <1 1 0x301>,
> - <1 2 0x301>,
> - <1 3 0x301>;
> + interrupts = <GIC_PPI 1 0x301>,
> + <GIC_PPI 2 0x301>,
> + <GIC_PPI 3 0x301>;
> reg = <0x0200a000 0x100>;
> clock-frequency = <27000000>,
> <32768>;
> @@ -119,7 +119,7 @@ msmgpio: pinctrl@800000 {
> gpio-controller;
> gpio-ranges = <&msmgpio 0 0 152>;
> #gpio-cells = <2>;
> - interrupts = <0 16 0x4>;
> + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x800000 0x4000>;
> @@ -255,7 +255,7 @@ ssbi@500000 {
> pmicintc: pmic {
> compatible = "qcom,pm8921";
> interrupt-parent = <&msmgpio>;
> - interrupts = <104 8>;
> + interrupts = <104 IRQ_TYPE_LEVEL_LOW>;
> #interrupt-cells = <2>;
> interrupt-controller;
> #address-cells = <1>;
> @@ -265,7 +265,8 @@ pwrkey@1c {
> compatible = "qcom,pm8921-pwrkey";
> reg = <0x1c>;
> interrupt-parent = <&pmicintc>;
> - interrupts = <50 1>, <51 1>;
> + interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> + <51 IRQ_TYPE_EDGE_RISING>;
> debounce = <15625>;
> pull-up;
> };
> @@ -274,7 +275,8 @@ keypad@148 {
> compatible = "qcom,pm8921-keypad";
> reg = <0x148>;
> interrupt-parent = <&pmicintc>;
> - interrupts = <74 1>, <75 1>;
> + interrupts = <74 IRQ_TYPE_EDGE_RISING>,
> + <75 IRQ_TYPE_EDGE_RISING>;
> debounce = <15>;
> scan-delay = <32>;
> row-hold = <91500>;
> @@ -283,7 +285,7 @@ keypad@148 {
> rtc@11d {
> compatible = "qcom,pm8921-rtc";
> interrupt-parent = <&pmicintc>;
> - interrupts = <39 1>;
> + interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> reg = <0x11d>;
> allow-set-time;
> };
next prev parent reply other threads:[~2022-11-08 18:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 18:45 [PATCH 1/3] dt-bindings: pinctrl: qcom,msm8960: convert to dtschema Krzysztof Kozlowski
2022-11-08 18:45 ` [PATCH 2/3] ARM: dts: qcom-msm8960: use define for interrupt constants Krzysztof Kozlowski
2022-11-08 18:49 ` Konrad Dybcio [this message]
2022-11-08 18:45 ` [PATCH 3/3] ARM: dts: qcom-msm8960-cdp: align TLMM pin configuration with DT schema Krzysztof Kozlowski
2022-11-08 18:49 ` Konrad Dybcio
2022-11-09 10:28 ` [PATCH 1/3] dt-bindings: pinctrl: qcom,msm8960: convert to dtschema Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41242ffc-fd61-ded1-0647-bba1efb60a1e@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).