Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44567317 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-dt-for-v4.18-round1' of... 

Merge tag 'sti-dt-for-v4.18-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

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: default avatarOlof Johansson <olof@lixom.net>
parents bd1b5f58 c5bf208a

arch/arm/boot/dts/stih407-family.dtsi

+26 −26
Original line number Diff line number Diff line
@@ -206,19 +206,19 @@ 
		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 */
@@ -228,7 +228,7 @@ 
		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>;
@@ -239,7 +239,7 @@ 
		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>;
@@ -251,7 +251,7 @@ 
		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>;
@@ -262,7 +262,7 @@ 
		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>;
@@ -574,7 +574,7 @@ 
			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>;
@@ -589,7 +589,7 @@ 
			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>;
@@ -623,7 +623,7 @@ 
			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>;
@@ -646,7 +646,7 @@ 
			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>;
@@ -687,7 +687,7 @@ 
			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>,
@@ -701,7 +701,7 @@ 
			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";
@@ -716,7 +716,7 @@ 
			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
@@ -755,8 +755,8 @@ 
			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 */
@@ -787,7 +787,7 @@ 
		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";
@@ -857,7 +857,7 @@ 
				 <&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>;

		};
@@ -875,7 +875,7 @@ 
				<&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>;
@@ -890,7 +890,7 @@ 
			      <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>,
@@ -910,7 +910,7 @@ 
			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";
@@ -926,7 +926,7 @@ 
			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";
@@ -942,7 +942,7 @@ 
			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";
@@ -958,7 +958,7 @@ 
			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";
@@ -970,7 +970,7 @@ 
			#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";
@@ -982,7 +982,7 @@ 
			#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";

arch/arm/boot/dts/stih407-pinctrl.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -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>;
@@ -376,7 +376,7 @@ 
			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>;
@@ -936,7 +936,7 @@ 
			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>;
@@ -969,7 +969,7 @@ 
			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>;
@@ -1164,7 +1164,7 @@ 
			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>;

arch/arm/boot/dts/stih407.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
				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",

arch/arm/boot/dts/stih410.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -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>,
@@ -202,7 +202,7 @@ 
				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",
@@ -254,7 +254,7 @@ 
		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>;

		};
@@ -263,8 +263,8 @@ 
			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>;

		};
@@ -292,7 +292,7 @@ 
			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>;

arch/arm/boot/dts/stihxxx-b2120.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ 
			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>;