Commit dca296dd authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'sti-dt-for-v5.8-round1' of...

Merge tag 'sti-dt-for-v5.8-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into arm/dt

STi DT fixes:
- Remove duplicated rng node in stih407-family.dtsi
- Fix complain about IRQ_TYPE_NONE usage in stih418.dtsi

* tag 'sti-dt-for-v5.8-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  dts: arm: stih407-family: remove duplicated rng nodes
  dts: arm: stih418: Fix complain about IRQ_TYPE_NONE usage

Link: https://lore.kernel.org/r/4b0c02e7-a247-50c0-d729-88d16b9dd7fd@st.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 161af8fd 7f21a850
...@@ -767,20 +767,6 @@ ethernet0: dwmac@9630000 { ...@@ -767,20 +767,6 @@ ethernet0: dwmac@9630000 {
<&clk_s_c0_flexgen CLK_ETH_PHY>; <&clk_s_c0_flexgen CLK_ETH_PHY>;
}; };
rng10: rng@8a89000 {
compatible = "st,rng";
reg = <0x08a89000 0x1000>;
clocks = <&clk_sysin>;
status = "okay";
};
rng11: rng@8a8a000 {
compatible = "st,rng";
reg = <0x08a8a000 0x1000>;
clocks = <&clk_sysin>;
status = "okay";
};
mailbox0: mailbox@8f00000 { mailbox0: mailbox@8f00000 {
compatible = "st,stih407-mailbox"; compatible = "st,stih407-mailbox";
reg = <0x8f00000 0x1000>; reg = <0x8f00000 0x1000>;
......
...@@ -50,7 +50,7 @@ usb2_picophy2: phy3@0 { ...@@ -50,7 +50,7 @@ usb2_picophy2: phy3@0 {
ohci0: usb@9a03c00 { ohci0: usb@9a03c00 {
compatible = "st,st-ohci-300x"; compatible = "st,st-ohci-300x";
reg = <0x9a03c00 0x100>; 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>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
<&softreset STIH407_USB2_PORT0_SOFTRESET>; <&softreset STIH407_USB2_PORT0_SOFTRESET>;
...@@ -62,7 +62,7 @@ ohci0: usb@9a03c00 { ...@@ -62,7 +62,7 @@ ohci0: usb@9a03c00 {
ehci0: usb@9a03e00 { ehci0: usb@9a03e00 {
compatible = "st,st-ehci-300x"; compatible = "st,st-ehci-300x";
reg = <0x9a03e00 0x100>; reg = <0x9a03e00 0x100>;
interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>; pinctrl-0 = <&pinctrl_usb0>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
...@@ -76,7 +76,7 @@ ehci0: usb@9a03e00 { ...@@ -76,7 +76,7 @@ ehci0: usb@9a03e00 {
ohci1: usb@9a83c00 { ohci1: usb@9a83c00 {
compatible = "st,st-ohci-300x"; compatible = "st,st-ohci-300x";
reg = <0x9a83c00 0x100>; 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>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
<&softreset STIH407_USB2_PORT1_SOFTRESET>; <&softreset STIH407_USB2_PORT1_SOFTRESET>;
...@@ -88,7 +88,7 @@ ohci1: usb@9a83c00 { ...@@ -88,7 +88,7 @@ ohci1: usb@9a83c00 {
ehci1: usb@9a83e00 { ehci1: usb@9a83e00 {
compatible = "st,st-ehci-300x"; compatible = "st,st-ehci-300x";
reg = <0x9a83e00 0x100>; reg = <0x9a83e00 0x100>;
interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>; interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>; pinctrl-0 = <&pinctrl_usb1>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment