Merge tag 'sti-dt-for-v4.18-round1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 15 May 2018 20:44:07 +0000 (13:44 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 15 May 2018 20:44:07 +0000 (13:44 -0700)
STi DT update:
 _ Fix complain about IRQ_TYPE_NONE_usage

* tag 'sti-dt-for-v4.18-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: stihxxx-b2120: Fix complain about IRQ_TYPE_NONE usage
  ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage
  ARM: dts: stih407: Fix complain about IRQ_TYPE_NONE usage
  ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage
  ARM: dts: stih407-family: Fix complain about IRQ_TYPE_NONE usage

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/stih407-family.dtsi
arch/arm/boot/dts/stih407-pinctrl.dtsi
arch/arm/boot/dts/stih407.dtsi
arch/arm/boot/dts/stih410.dtsi
arch/arm/boot/dts/stihxxx-b2120.dtsi

index f7362c31de29a2ad0f75341bf69c0f8dae69261f..9e29a4499938519f8ea89f77f50ecbdc972d5e45 100644 (file)
                vtg_main: sti-vtg-main@8d02800 {
                        compatible = "st,vtg";
                        reg = <0x8d02800 0x200>;
-                       interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                vtg_aux: sti-vtg-aux@8d00200 {
                        compatible = "st,vtg";
                        reg = <0x8d00200 0x100>;
-                       interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
                };
 
                serial@9830000 {
                        compatible = "st,asc";
                        reg = <0x9830000 0x2c>;
-                       interrupts = <GIC_SPI 122 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
                        /* Pinctrl moved out to a per-board configuration */
 
                serial@9831000 {
                        compatible = "st,asc";
                        reg = <0x9831000 0x2c>;
-                       interrupts = <GIC_SPI 123 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_serial1>;
                        clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
                serial@9832000 {
                        compatible = "st,asc";
                        reg = <0x9832000 0x2c>;
-                       interrupts = <GIC_SPI 124 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_serial2>;
                        clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
                sbc_serial0: serial@9530000 {
                        compatible = "st,asc";
                        reg = <0x9530000 0x2c>;
-                       interrupts = <GIC_SPI 138 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sbc_serial0>;
                        clocks = <&clk_sysin>;
                serial@9531000 {
                        compatible = "st,asc";
                        reg = <0x9531000 0x2c>;
-                       interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sbc_serial1>;
                        clocks = <&clk_sysin>;
                        status = "disabled";
                        reg = <0x09060000 0x7ff>, <0x9061008 0x20>;
                        reg-names = "mmc", "top-mmc-delay";
-                       interrupts = <GIC_SPI 92 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_mmc0>;
                        status = "disabled";
                        reg = <0x09080000 0x7ff>;
                        reg-names = "mmc";
-                       interrupts = <GIC_SPI 90 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "mmcirq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_sd1>;
                        compatible = "st,ahci";
                        reg = <0x9b20000 0x1000>;
 
-                       interrupts = <GIC_SPI 159 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "hostc";
 
                        phys = <&phy_port0 PHY_TYPE_SATA>;
                        compatible = "st,ahci";
                        reg = <0x9b28000 0x1000>;
 
-                       interrupts = <GIC_SPI 170 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "hostc";
 
                        phys = <&phy_port1 PHY_TYPE_SATA>;
                        dwc3: dwc3@9900000 {
                                compatible      = "snps,dwc3";
                                reg             = <0x09900000 0x100000>;
-                               interrupts      = <GIC_SPI 155 IRQ_TYPE_NONE>;
+                               interrupts      = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
                                dr_mode         = "host";
                                phy-names       = "usb2-phy", "usb3-phy";
                                phys            = <&usb2_picophy0>,
                        compatible      = "st,sti-pwm";
                        #pwm-cells      = <2>;
                        reg             = <0x9810000 0x68>;
-                       interrupts      = <GIC_SPI 128 IRQ_TYPE_NONE>;
+                       interrupts      = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_pwm0_chan0_default>;
                        clock-names     = "pwm";
                        compatible      = "st,sti-pwm";
                        #pwm-cells      = <2>;
                        reg             = <0x9510000 0x68>;
-                       interrupts      = <GIC_SPI 131 IRQ_TYPE_NONE>;
+                       interrupts      = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_pwm1_chan0_default
                                        &pinctrl_pwm1_chan1_default
                        resets = <&softreset STIH407_ETH1_SOFTRESET>;
                        reset-names = "stmmaceth";
 
-                       interrupts = <GIC_SPI 98 IRQ_TYPE_NONE>,
-                                    <GIC_SPI 99 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "macirq", "eth_wake_irq";
 
                        /* DMA Bus Mode */
                mailbox0: mailbox@8f00000  {
                        compatible      = "st,stih407-mailbox";
                        reg             = <0x8f00000 0x1000>;
-                       interrupts      = <GIC_SPI 1 IRQ_TYPE_NONE>;
+                       interrupts      = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
                        #mbox-cells     = <2>;
                        mbox-name       = "a9";
                        status          = "okay";
                                 <&clk_s_c0_flexgen CLK_EXT2F_A9>,
                                 <&clk_s_c0_flexgen CLK_EXT2F_A9>,
                                 <&clk_s_c0_flexgen CLK_EXT2F_A9>;
-                       interrupts = <GIC_SPI 5 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <3>;
                };
                                <&clk_s_c0_flexgen CLK_TX_ICN_DMU>,
                                <&clk_s_c0_flexgen CLK_EXT2F_A9>;
 
-                       interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <3>;
 
                              <0x8e77000 0x1000>,
                              <0x8e78000 0x8000>;
                        reg-names = "slimcore", "dmem", "peripherals", "imem";
-                       interrupts = <GIC_SPI 9 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
                        dma-channels = <16>;
                        #dma-cells = <3>;
                        clocks = <&clk_s_c0_flexgen CLK_FDMA>,
                        assigned-clock-parents = <0>, <&clk_s_d0_quadfs 0>;
                        assigned-clock-rates = <50000000>;
                        reg = <0x8d80000 0x158>;
-                       interrupts = <GIC_SPI 84 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 2 0 1>;
                        dma-names = "tx";
 
                        assigned-clock-parents = <0>, <&clk_s_d0_quadfs 1>;
                        assigned-clock-rates = <50000000>;
                        reg = <0x8d81000 0x158>;
-                       interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 3 0 1>;
                        dma-names = "tx";
 
                        assigned-clock-parents = <0>, <&clk_s_d0_quadfs 2>;
                        assigned-clock-rates = <50000000>;
                        reg = <0x8d82000 0x158>;
-                       interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 4 0 1>;
                        dma-names = "tx";
 
                        assigned-clock-parents = <0>, <&clk_s_d0_quadfs 3>;
                        assigned-clock-rates = <50000000>;
                        reg = <0x8d85000 0x158>;
-                       interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 7 0 1>;
                        dma-names = "tx";
 
                        #sound-dai-cells = <0>;
                        st,syscfg = <&syscfg_core>;
                        reg = <0x8d83000 0x158>;
-                       interrupts = <GIC_SPI 87 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 5 0 1>;
                        dma-names = "rx";
 
                        #sound-dai-cells = <0>;
                        st,syscfg = <&syscfg_core>;
                        reg = <0x8d84000 0x158>;
-                       interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&fdma0 6 0 1>;
                        dma-names = "rx";
 
index 53c6888d1fc0ece2a063f270c097eadb9a0998af..e393519fb84cb96227d8d386c2e52dbf18a02d3e 100644 (file)
@@ -52,7 +52,7 @@
                        st,syscfg = <&syscfg_sbc>;
                        reg = <0x0961f080 0x4>;
                        reg-names = "irqmux";
-                       interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "irqmux";
                        ranges = <0 0x09610000 0x6000>;
 
                        st,syscfg = <&syscfg_front>;
                        reg = <0x0920f080 0x4>;
                        reg-names = "irqmux";
-                       interrupts = <GIC_SPI 189 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "irqmux";
                        ranges = <0 0x09200000 0x10000>;
 
                        st,syscfg = <&syscfg_front>;
                        reg = <0x0921f080 0x4>;
                        reg-names = "irqmux";
-                       interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "irqmux";
                        ranges = <0 0x09210000 0x10000>;
 
                        st,syscfg = <&syscfg_rear>;
                        reg = <0x0922f080 0x4>;
                        reg-names = "irqmux";
-                       interrupts = <GIC_SPI 191 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "irqmux";
                        ranges = <0 0x09220000 0x6000>;
 
                        st,syscfg = <&syscfg_flash>;
                        reg = <0x0923f080 0x4>;
                        reg-names = "irqmux";
-                       interrupts = <GIC_SPI 192 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "irqmux";
                        ranges = <0 0x09230000 0x3000>;
 
index 57efc87dec2b095927a2660213d751c072b70cdc..5b7951ffc350d7f42bdcef9191862d11217bc2d2 100644 (file)
                                reg = <0x8d04000 0x1000>;
                                reg-names = "hdmi-reg";
                                #sound-dai-cells = <0>;
-                               interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
+                               interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "irq";
                                clock-names = "pix",
                                              "tmds",
index 3313005ee15ce8a7e00cb7df13638205f3aef63e..888548ea9b5cc982e3025706bc98ec80f8ff7cb3 100644 (file)
@@ -43,7 +43,7 @@
                ohci0: usb@9a03c00 {
                        compatible = "st,st-ohci-300x";
                        reg = <0x9a03c00 0x100>;
-                       interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
                                 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
@@ -58,7 +58,7 @@
                ehci0: usb@9a03e00 {
                        compatible = "st,st-ehci-300x";
                        reg = <0x9a03e00 0x100>;
-                       interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
@@ -75,7 +75,7 @@
                ohci1: usb@9a83c00 {
                        compatible = "st,st-ohci-300x";
                        reg = <0x9a83c00 0x100>;
-                       interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
                                 <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>;
                        resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
@@ -90,7 +90,7 @@
                ehci1: usb@9a83e00 {
                        compatible = "st,st-ehci-300x";
                        reg = <0x9a83e00 0x100>;
-                       interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
                        clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
                                reg = <0x8d04000 0x1000>;
                                reg-names = "hdmi-reg";
                                #sound-dai-cells = <0>;
-                               interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
+                               interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
                                interrupt-names = "irq";
                                clock-names = "pix",
                                              "tmds",
                bdisp0:bdisp@9f10000 {
                        compatible = "st,stih407-bdisp";
                        reg = <0x9f10000 0x1000>;
-                       interrupts = <GIC_SPI 38 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "bdisp";
                        clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>;
                };
                        compatible = "st,st-hva";
                        reg = <0x8c85000 0x400>, <0x6000000 0x40000>;
                        reg-names = "hva_registers", "hva_esram";
-                       interrupts = <GIC_SPI 58 IRQ_TYPE_NONE>,
-                                    <GIC_SPI 59 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "clk_hva";
                        clocks = <&clk_s_c0_flexgen CLK_HVA>;
                };
                        reg = <0x94a087c 0x64>;
                        clocks = <&clk_sysin>;
                        clock-names = "cec-clk";
-                       interrupts = <GIC_SPI 140 IRQ_TYPE_NONE>;
+                       interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "cec-irq";
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_cec0_default>;
index c67edb1a812113e83ff8002bbc7b232de2480cbd..4dedfcb0fcb304c4968b82f815df31892e63f23a 100644 (file)
                        reg             = <0x08a20000 0x10000>,
                                          <0x08a00000 0x4000>;
                        reg-names       = "c8sectpfe", "c8sectpfe-ram";
-                       interrupts      = <GIC_SPI 34 IRQ_TYPE_NONE>,
-                                         <GIC_SPI 35 IRQ_TYPE_NONE>;
+                       interrupts      = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
+                                         <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "c8sectpfe-error-irq",
                                          "c8sectpfe-idle-irq";
                        pinctrl-0       = <&pinctrl_tsin0_serial>;