On 2.07.2023 15:43, Dmitry Baryshkov wrote:
> Merge interrups and interrupt-parent properties into a single
> interrupts-extended property.
>
> Suggested-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad DYbcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm/boot/dts/qcom/pm8921.dtsi | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
> index fa00b57e28b9..360a179670c5 100644
> --- a/arch/arm/boot/dts/qcom/pm8921.dtsi
> +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
> @@ -11,9 +11,8 @@ pm8921: pmic {
> pwrkey@1c {
> compatible = "qcom,pm8921-pwrkey";
> reg = <0x1c>;
> - interrupt-parent = <&pm8921>;
> - interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> - <51 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8921 50 IRQ_TYPE_EDGE_RISING>,
> + <&pm8921 51 IRQ_TYPE_EDGE_RISING>;
> debounce = <15625>;
> pull-up;
> };
> @@ -32,17 +31,15 @@ pm8921_mpps: mpps@50 {
> rtc@11d {
> compatible = "qcom,pm8921-rtc";
> reg = <0x11d>;
> - interrupt-parent = <&pm8921>;
> - interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8921 39 IRQ_TYPE_EDGE_RISING>;
> allow-set-time;
> };
>
> pm8921_keypad: keypad@148 {
> compatible = "qcom,pm8921-keypad";
> reg = <0x148>;
> - interrupt-parent = <&pm8921>;
> - interrupts = <74 IRQ_TYPE_EDGE_RISING>,
> - <75 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8921 74 IRQ_TYPE_EDGE_RISING>,
> + <&pm8921 75 IRQ_TYPE_EDGE_RISING>;
> debounce = <15>;
> scan-delay = <32>;
> row-hold = <91500>;
