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/pm8058.dtsi | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi
> index 3683d7b60918..984b79777984 100644
> --- a/arch/arm/boot/dts/qcom/pm8058.dtsi
> +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi
> @@ -11,9 +11,8 @@ pm8058: pmic {
> pwrkey@1c {
> compatible = "qcom,pm8058-pwrkey";
> reg = <0x1c>;
> - interrupt-parent = <&pm8058>;
> - interrupts = <50 IRQ_TYPE_EDGE_RISING>,
> - <51 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8058 50 IRQ_TYPE_EDGE_RISING>,
> + <&pm8058 51 IRQ_TYPE_EDGE_RISING>;
> debounce = <15625>;
> pull-up;
> };
> @@ -61,9 +60,8 @@ pm8058_led133: led@133 {
> pm8058_keypad: keypad@148 {
> compatible = "qcom,pm8058-keypad";
> reg = <0x148>;
> - interrupt-parent = <&pm8058>;
> - interrupts = <74 IRQ_TYPE_EDGE_RISING>,
> - <75 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8058 74 IRQ_TYPE_EDGE_RISING>,
> + <&pm8058 75 IRQ_TYPE_EDGE_RISING>;
> debounce = <15>;
> scan-delay = <32>;
> row-hold = <91500>;
> @@ -136,8 +134,7 @@ ref_muxoff: adc-channel@f {
> rtc@1e8 {
> compatible = "qcom,pm8058-rtc";
> reg = <0x1e8>;
> - interrupt-parent = <&pm8058>;
> - interrupts = <39 IRQ_TYPE_EDGE_RISING>;
> + interrupts-extended = <&pm8058 39 IRQ_TYPE_EDGE_RISING>;
> allow-set-time;
> };
> };
