On Wed, 2 Mar 2022 at 04:33, Rob Herring <robh@xxxxxxxxxx> wrote:
>
> The MDSS interrupt provider is a single cell, so specifying interrupt flags
> on the consumers is incorrect.
>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> v2:
> - Add a bunch of missed cases
> ---
> arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +++---
> arch/arm64/boot/dts/qcom/sdm630.dtsi | 5 ++---
> arch/arm64/boot/dts/qcom/sdm660.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +++---
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +++---
> 6 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 412d94736c35..3b9af5e24907 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1495,7 +1495,7 @@ mdp: mdp@fd900000 {
> reg-names = "mdp_phys";
>
> interrupt-parent = <&mdss>;
> - interrupts = <0 0>;
> + interrupts = <0>;
>
> clocks = <&mmcc MDSS_AHB_CLK>,
> <&mmcc MDSS_AXI_CLK>,
> @@ -1530,7 +1530,7 @@ dsi0: dsi@fd922800 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <4>;
>
> assigned-clocks = <&mmcc BYTE0_CLK_SRC>,
> <&mmcc PCLK0_CLK_SRC>;
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index f0f81c23c16f..0597d865a4a6 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -788,7 +788,7 @@ mdp: mdp@901000 {
> reg-names = "mdp_phys";
>
> interrupt-parent = <&mdss>;
> - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <0>;
>
> clocks = <&mmcc MDSS_AHB_CLK>,
> <&mmcc MDSS_AXI_CLK>,
> @@ -834,7 +834,7 @@ dsi0: dsi@994000 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <4>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_BYTE0_CLK>,
> @@ -904,7 +904,7 @@ hdmi: hdmi-tx@9a0000 {
> "hdcp_physical";
>
> interrupt-parent = <&mdss>;
> - interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <8>;
>
> clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_AHB_CLK>,
> diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> index 240293592ef9..f646fb80924f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -1453,7 +1453,7 @@ mdp: mdp@c901000 {
> reg-names = "mdp_phys";
>
> interrupt-parent = <&mdss>;
> - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <0>;
>
> assigned-clocks = <&mmcc MDSS_MDP_CLK>,
> <&mmcc MDSS_VSYNC_CLK>;
> @@ -1530,7 +1530,7 @@ dsi0: dsi@c994000 {
> power-domains = <&rpmpd SDM660_VDDCX>;
>
> interrupt-parent = <&mdss>;
> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <4>;
>
> assigned-clocks = <&mmcc BYTE0_CLK_SRC>,
> <&mmcc PCLK0_CLK_SRC>;
> @@ -2487,4 +2487,3 @@ timer {
> <GIC_PPI 0 0xf08>;
> };
> };
> -
> diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> index eccf6fde16b4..1d748c5305f4 100644
> --- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> @@ -163,7 +163,7 @@ dsi1: dsi@c996000 {
> power-domains = <&rpmpd SDM660_VDDCX>;
>
> interrupt-parent = <&mdss>;
> - interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <5>;
>
> assigned-clocks = <&mmcc BYTE1_CLK_SRC>,
> <&mmcc PCLK1_CLK_SRC>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index 41f4e46e1f85..95e6a97c2170 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -4281,7 +4281,7 @@ mdss_mdp: mdp@ae01000 {
> power-domains = <&rpmhpd SDM845_CX>;
>
> interrupt-parent = <&mdss>;
> - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <0>;
>
> ports {
> #address-cells = <1>;
> @@ -4333,7 +4333,7 @@ dsi0: dsi@ae94000 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <4>;
>
> clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>,
> <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>,
> @@ -4405,7 +4405,7 @@ dsi1: dsi@ae96000 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <5>;
>
> clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK>,
> <&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>,
> diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> index fdaf303ba047..956848068871 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -3200,7 +3200,7 @@ mdss_mdp: mdp@ae01000 {
> power-domains = <&rpmhpd SM8250_MMCX>;
>
> interrupt-parent = <&mdss>;
> - interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <0>;
>
> ports {
> #address-cells = <1>;
> @@ -3252,7 +3252,7 @@ dsi0: dsi@ae94000 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <4>;
>
> clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>,
> <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>,
> @@ -3325,7 +3325,7 @@ dsi1: dsi@ae96000 {
> reg-names = "dsi_ctrl";
>
> interrupt-parent = <&mdss>;
> - interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <5>;
>
> clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK>,
> <&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>,
> --
> 2.32.0
>
--
With best wishes
Dmitry
